【埃驰pc】盘点开始计划按钮状态修改+报检单检验按钮回显数据处理

fe/PC/src/components/umyTable/index.vue

@@ -812,6 +812,9 @@ export default {
       if(!item.isJson){
         return scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop]
       }else{
+        if(scope.row[item.prop] == '' || scope.row[item.prop] == 'null' || scope.row[item.prop] == '[]'){
+          return ""
+        }
         if(scope.row[item.prop]){
           let _arr = JSON.parse(scope.row[item.prop])
           return _arr.join(",")

fe/PC/src/utils/tableColumns/index.js

@@ -3620,7 +3620,7 @@ export const CountPlan = [
   { label: "开始时间", prop: "beginTime",type: "dateTime" },
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "计划时间", prop: 'planTime', type: "dateTime"},
-  { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
+  // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
   { label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" },
   { label: "盘点次数", prop: "inventoryStage" },
   { label: "盘点库位", prop: 'jsonLocationCodes',type:"showDetail",isJson:true,showProp:true },

fe/PC/src/utils/tabsDesTions/index.js

@@ -2811,7 +2811,7 @@ export const CountPlan = [
   { label: "开始时间", prop: "beginTime",type: "dateTime" },
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "计划时间", prop: 'planTime', type: "dateTime" },
-  { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
+  // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
   { label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" },
   { label: "盘点次数", prop: "inventoryStage" },
   { label: "库位JSON", prop: 'jsonLocationCodes',type:"json" },

fe/PC/src/views/inventoryManage/Count/CountPlan-ms.vue

@@ -98,7 +98,8 @@ export default {
       return function (val) {
         let data = true
         val.forEach(key => {
-          if (this.propsData.requestStatus == key && this.propsData.requestType == 2) {
+          // && this.propsData.requestType == 2
+          if (this.propsData.requestStatus == key) {
             data = false
           }
         })

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -431,8 +431,8 @@ export default {
             type: "number",
             trigger: ["blur"],
             validator: (rule, value, callback) => {
-              if(Number(value) > Number(this.rowReceiveQty)){
+              if(Number(value) > Number(this.rowReceiveQty) || Number(value) <= 0){
-                return callback(new Error(`数量不能大于收货数量${this.rowReceiveQty}`))
+                return callback(new Error(`数量必须大于0且不能大于收货数量${this.rowReceiveQty}`))
               }else{
                 callback()
               }
@@ -810,20 +810,21 @@ export default {
     inspectButtonClick(row, index, label) {
       this.inspectFormData.details.splice(row.$index, 1)
     },
-    resetInspectForm() {
+    resetInspectForm(row) {
-      this.inspectFormData.inspectQty = null
+      // this.inspectFormData.inspectQty = null
-      this.$refs.inspectForm_Ref.resetCurrenForm()
+      // this.$refs.inspectForm_Ref.resetCurrenForm()
+      console.log(816,row)
+      let _detailTable = '[]'
+      if(row.otherPropertyJson && row.otherPropertyJson != '' && row.otherPropertyJson != 'null'){
+        _detailTable = JSON.parse(JSON.stringify(row.otherPropertyJson))
+      }
+      this.inspectFormData = row
+      this.inspectFormData.details = JSON.parse(_detailTable)
     },
     // 质检详情-检验按钮 table中按钮
     inspectDetailsButtonClick(row, index, label) {
       // console.log('质检详情-检验按钮 table中按钮', row)
       this.masterID = this.propsData.id
-      this.inspectFormData.appearance = ''
-      this.inspectFormData.volume = ''
-      this.inspectFormData.weight = ''
-      this.inspectFormData.inspectQty = ''
-      this.inspectFormData.details = []
-      this.$listAssign(this.inspectFormData, row)
       // console.log('质检详情-检验按钮 label', label)
       if(label == '拆箱'){
         this.devanCurrentRow = row
@@ -865,12 +866,11 @@ export default {
             if(document.getElementById("uploadPictureCardGuideBook"))document.getElementById("uploadPictureCardGuideBook").innerHTML = ''
           }
           this.inspectShow = true
-          console.log(6666,this.$refs.inspectForm_Ref)
+          this.resetInspectForm(row)
-          this.resetInspectForm()
         }).catch(err => {
           console.log(err)
           this.inspectShow = true
-          this.resetInspectForm()
+          this.resetInspectForm(row)
         })
         this.rowId = row.id
       } else if (label == '清除检验') {
@@ -906,6 +906,12 @@ export default {
               this.propsData = res
             })
             this.paging()
+            this.inspectFormData.appearance = ''
+            this.inspectFormData.volume = ''
+            this.inspectFormData.weight = ''
+            this.inspectFormData.inspectQty = ''
+            this.inspectFormData.otherPropertyJson = '[]'
+            console.log(913,this.inspectFormData)
             this.loading = false
             this.inspectNoticeDetailsTableLoading = false
           }).catch(err => {