diff --git a/fe/PC/src/components/currenTableFlex/index.vue b/fe/PC/src/components/currenTableFlex/index.vue index 7a41a9ca5..7ec409f8e 100644 --- a/fe/PC/src/components/currenTableFlex/index.vue +++ b/fe/PC/src/components/currenTableFlex/index.vue @@ -37,6 +37,7 @@ class="childTable" @click="flexRowRemove($event, scope)" > + 删除 @@ -89,6 +90,13 @@ export default { // } }, props: { + // 是否必须存在一条数据 + mustHaveOneRow:{ + type: Boolean, + default: () => { + return false + } + }, // table key 字段设置顺序后需更新该值 isUpdate: { type: Boolean, @@ -294,12 +302,15 @@ export default { }, //删除行 flexRowRemove(e, val) { + if(this.mustHaveOneRow && this.flexTableData.length <= 1){ + return this.$warningMsg("必须存在一条数据!") + } this.$confirm('您确定删除吗, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.flexTableData.splice(val.$index, 1) + this.flexTableData.splice(val.$index, 1) }).catch(() => { }); diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index f585edcac..1f7e4551a 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1366,8 +1366,8 @@ export const unqualifiedInfo = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty",isNumber:true }, { label: "物品单位", prop: "uom" }, - { label: "原箱箱码", prop: "fromPackingCode" }, - { label: "拆箱箱码", prop: "packingCode" }, + { label: "原箱码", prop: "fromPackingCode" }, + // { label: "拆箱箱码", prop: "packingCode" }, { label: "ERP储位", prop: "locationErpCode" }, { label: "不合格原因代码", prop: 'failedReason' }, { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index 8be354435..a43dfa1a8 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue @@ -68,6 +68,7 @@ :flexTableColumns="addPopColumns_FS" @detailsDataPush="pushFS" @clearHandle="clearHandle_FS" + :mustHaveOneRow="true" >
@@ -78,6 +79,7 @@ :flexTableColumns="addPopColumns_YL" @detailsDataPush="pushYL" @clearHandle="clearHandle_YL" + :mustHaveOneRow="true" >
@@ -608,7 +610,6 @@ export default { }, // 提交 addPopSureHandle(){ - // 验证【粉碎料】信息是否填全 let _err_FS=0 this.addPopData_FS.forEach(item=>{ @@ -616,7 +617,7 @@ export default { _err_FS++ } }) - if(_err_FS > 0){ + if(!this.addPopData_FS || this.addPopData_FS.length <=0 || _err_FS > 0){ return this.$warningMsg("【粉碎料】信息未填全,请填写") } @@ -627,7 +628,7 @@ export default { _err_YL++ } }) - if(_err_YL > 0){ + if(!this.addPopData_YL || this.addPopData_YL.length <=0 || _err_YL > 0){ return this.$warningMsg("【原料】信息未填全,请填写") } @@ -649,7 +650,7 @@ export default { _err_HB++ } }) - if(_err_HB > 0){ + if(!this.addPopData_HB || this.addPopData_HB.length <=0 || _err_HB > 0){ return this.$warningMsg("【混拌料】信息未填全,请填写") }