Merge remote-tracking branch 'origin/dev' into dev

src/api/mes/prd/item.js

@@ -93,6 +93,14 @@ export function getItemCustomFieldsList(query) {
   })
 }
 
+export function getDowngradeAfterItemCustomFieldsList(query) {
+  return request({
+    url: iep(`/item/getDowngradeAfterItemCustomFieldsList`),
+    method: 'get',
+    params: query
+  })
+}
+
 export function getNewItemList(query) {
   return request({
     url: iep(`/item/getNewItemList`),

src/views/mes/qms/inspec/content/inspec-job.vue

@@ -181,6 +181,10 @@ export default {
 			type: String,
 			default: 'add',
 		},
+    subcategoryModInvStatus: {
+      type: String,
+      default: '',
+    },
 	},
 	data() {
 		return {
@@ -270,6 +274,7 @@ export default {
 						qcPlan: f.qcPlan,
 						resrce: f.resrce,
             qcSubCategories: f.qcSubCategories,
+            subcategoryModInvStatus: this.subcategoryModInvStatus
 					}
 					if (this.state == 'add') {
 						this.doAdd(req)

src/views/mes/qms/inspec/content/inspec-process.vue

@@ -550,8 +550,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="大批次号:" prop="orgLotNo">
-                {{processForm.orgLotNo}}
+              <el-form-item label="大批次:" prop="bigBatchNo">
+                {{processForm.bigBatchNo}}
               </el-form-item>
             </el-col>
             <el-col :span="6">

src/views/mes/qms/inspec/index.vue

@@ -5,6 +5,7 @@
 			:visible.sync="visibleJob"
 			:show-title="showTitle"
 			:state="state"
+      :subcategoryModInvStatus="subcategoryModInvStatus"
 			:model="jobModel"
 			@close="afterCloseJob"
 		/>
@@ -141,18 +142,26 @@
 						:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
 					>
 					</el-table-column>
-          <el-table-column width="200" prop="rollType" label="膜卷类型">
+          <!-- 判定结果 -->
+          <el-table-column
+              :label="$t('mes.judgeResult')"
+              width="80"
+          >
+            <template slot-scope="scope">
+              {{resultListFind(scope.row.result)}}
+            </template>
+          </el-table-column>
+          <el-table-column width="80" prop="rollType" label="膜卷类型">
             <template slot-scope="scope">
               {{findRollType(scope.row.rollType)}}
             </template>
           </el-table-column>
-          <el-table-column width="200" prop="orgLotNo" label="大批次">
-
+          <el-table-column width="200" prop="bigBatchNo" label="大批次">
           </el-table-column>
 					<el-table-column
 						prop="newStatus"
 						:label="$t('crud.column.label.status1')"
-						width="120"
+						width="80"
 						:render-header="
 							(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, statusOptions)
 						"
@@ -166,14 +175,7 @@
 						:label="$t(item.label)"
 						:render-header="(h, { column, $index }) => renderSpecNameHeader(h, { column, $index }, options)"
 					></el-table-column>
-					<el-table-column
-						:label="$t('mes.judgeResult')"
-						width="140"
-					>
-            <template slot-scope="scope">
-              {{resultListFind(scope.row.result)}}
-            </template>
-          </el-table-column>
+
 					<el-table-column prop="move" :label="$t('crud.menu')" fixed="right" min-width="100">
 						<template slot-scope="scope">
 							<el-dropdown @command="handleCommand($event, scope.row, scope.$index)" trigger="click">
@@ -427,6 +429,8 @@ export default {
       isClickSearch:true,
       changeSearch:true,
       targetType:null,
+      // 作业规则 SUBCATEG_INV_PENDIN
+      subcategoryModInvStatus: '',
 		}
 	},
 	computed: {
@@ -546,6 +550,12 @@ export default {
           if (optionList[i].optionName === 'TARGET_TYPE') {
             me.targetType = optionList[i].optionValue
           }
+
+          // SUBCATEG_INV_PENDIN  用于控制涂布完工检按批次修改库存表库存状态逻辑
+          if (optionList[i].optionName === 'SUBCATEG_INV_PENDIN') {
+            me.subcategoryModInvStatus = optionList[i].optionValue
+            this.init.subcategoryModInvStatus = optionList[i].optionValue
+          }
         }
         me.$set(me, 'searchForm',
           {

src/views/mes/qms/inspec/init.js

@@ -12,15 +12,15 @@ export const searchRules = {}
 
 export const tableObj = [
 	{ prop: 'qcPlan', label: 'mes.qcPlan', width: '200' },
-	{ prop: 'item', label: 'mes.product_number', width: '200' },
+	{ prop: 'item', label: 'mes.product_number', width: '120' },
   { prop: 'itemDesc', label: 'mes.itemDesc', width: '200'},
-	{ prop: 'shopOrder', label: 'mes.work_order', width: '200' },
+	{ prop: 'shopOrder', label: 'mes.work_order', width: '160' },
+	{ prop: 'operation', label: 'mes.process', width: '100' },
 	{ prop: 'lotNo', label: '生产批/条码号', width: '200' },
-	{ prop: 'operation', label: 'mes.process', width: '120' },
 	{ prop: 'resrce', label: 'mes.equipment', width: '120' },
-	{ prop: 'dateCreate', label: 'mes.qms.issuanceTime', width: '180' },
-	{ prop: 'completeDateTime', label: 'mes.pms.compDate', width: '180' },
-	{ prop: 'judgeDateTime', label: 'mes.judgeDateTime', width: '180' },
+	{ prop: 'dateCreate', label: 'mes.qms.issuanceTime', width: '160' },
+	{ prop: 'completeDateTime', label: 'mes.pms.compDate', width: '160' },
+	{ prop: 'judgeDateTime', label: 'mes.judgeDateTime', width: '160' },
 	{ prop: 'newResult', label: 'mes.judgeResult', width: '130' },
 ]
 export const qcTableObj = [