【nev-pc】0919修改暂存

fe/PC/src/filters/status.js

@@ -733,18 +733,18 @@ export function checkType(index, prop) {
  */
 export function CountPanCompleteType(index, prop){
   let type={
-    1:{
-      label:"未盘点到的明细直接作废",
-      value:1
-    },
+    // 1:{
+    //   label:"未盘点到的明细直接作废",
+    //   value:1
+    // },
     2:{
       label:"未盘点到的按照盘点数量为0处理",
       value:2
     },
-    3:{
-      label:"未盘点到的按照盘平计算",
-      value:3
-    },
+    // 3:{
+    //   label:"未盘点到的按照盘平计算",
+    //   value:3
+    // },
   }
   return Enum(type, index, prop)
 }

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

@@ -209,7 +209,7 @@ export default {
       ],
       //完成
       completeData:{
-        type:1
+        type:2
       },
       completeForm:[
         { type: "select", label: "类型", prop: "type", options: "CountPanCompleteType", colSpan: 24 },

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

@@ -553,7 +553,8 @@ export default {
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
         { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 8  },
-        { type: "input", label: _Names.itemName, prop: "itemName", disabled: true, colSpan: 8  },
+        // { type: "input", label: _Names.itemName, prop: "itemName", disabled: true, colSpan: 8  },
+        { type: "input", label: _Names.itemDesc2, prop: "itemDesc2", disabled: true, colSpan: 8  },
         { type: "input", label: "单位", prop: "stdPackUom", disabled: true,  colSpan: 8  },
         // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true,  colSpan: 8  },
         { type: "input", label: "生产批次", prop: "lot", disabled: true, colSpan: 8 },
@@ -583,7 +584,8 @@ export default {
       inspectNoticeDetailsTableColumns: [
         { label: "箱码", prop: "packingCode", width:'100%' },
         { label: _Names.itemCode, prop: "itemCode", width:'100%'  },
-        { label: _Names.itemName, prop: "itemName", width:'100%' },
+        // { label: _Names.itemName, prop: "itemName", width:'100%' },
+        { label: _Names.itemDesc2, prop: "itemDesc2", width:'100%' },
         { label: _Names.itemDesc1, prop: "itemDesc1", width:'100%' },
         // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
@@ -1246,6 +1248,16 @@ export default {
         // if(!this.fileBase64List || this.fileBase64List.length <= 0){
         //   return this.$errorMsg("请提供供应商自检报告")
         // }
+        // todo:
+        // this.$confirm('您确定完成质检吗, 是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // }).then(() => {
+        //   this.screenData.filters.splice(val, 1)
+        // }).catch(() => {
+
+        // });
         let that = this
         that.masterID = that.propsData.id
         // 取消质检报告上传必填项

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

@@ -11,7 +11,6 @@
       :multipleSelection="multipleSelection"
       :tableSelection="true"
       :MaxResultCount="PageListParams.MaxResultCount"
-      :isShowIndex="true"
       @topbutton="topbutton"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
@@ -26,6 +25,7 @@
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
     >
+    <!-- :isShowIndex="true" -->
     </tablePagination>
     <!-- 抽屉 -->
     <curren-Drawer

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

@@ -9,7 +9,6 @@
       :totalCount="totalCount"
       :multipleSelection="multipleSelection"
       :MaxResultCount="PageListParams.MaxResultCount"
-      :isShowIndex="true"
       @topbutton="topbutton"
       @inlineDialog="inlineDialog"
       @sortChange="sortChange"
@@ -24,6 +23,7 @@
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
     >
+    <!-- :isShowIndex="true" -->
     </tablePagination>
     <!-- 抽屉 -->
     <curren-Drawer