解决冲突

This commit is contained in:
2023-05-15 09:23:47 +08:00
parent 577c8ee65d
commit a097053f14
2 changed files with 5 additions and 5 deletions

View File

@@ -147,7 +147,7 @@
type="warning" type="warning"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
:disabled= dis_flag :disabled="dis_flag"
@click="confirm" @click="confirm"
> >
强制确认 强制确认
@@ -220,7 +220,7 @@ import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/Vie
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'semiproductIn', name: 'SemiproductIn',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination }, components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination },
cruds() { cruds() {
return CRUD({ return CRUD({