From 59e95d5f3925067359c907c90c7c96a3e259e97e Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 10:32:25 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=85=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/materialGroup.js              |  8 ++++++++
 .../checkTypeProject/MaterialGroupAdd.vue     |  4 ++++
 .../checkTypeProject/selectProject.vue        | 19 +++++++++++--------
 src/views/quality/qcProjectType/data.vue      | 16 ++++++++--------
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/api/quality/materialGroup.js b/src/api/quality/materialGroup.js
index 0c63965..3db129e 100644
--- a/src/api/quality/materialGroup.js
+++ b/src/api/quality/materialGroup.js
@@ -50,3 +50,11 @@ export function delMaterialGroup(id) {
 		method: 'delete'
 	});
 }
+
+export function getOriginalGroupList(query) {
+	return request({
+		url: '/quality/materialGroup/getOriginalGroupList',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 7457be5..12a1375 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -58,6 +58,9 @@
         <el-form-item label="物料组名称" prop="groupName">
           <el-input v-model="form.groupName" placeholder="请输入物料组名称" />
         </el-form-item>
+        <el-form-item label="物料组编码" prop="groupCode">
+          <el-input v-model="form.groupCode" placeholder="请输入物料组编码" disabled/>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -75,6 +78,7 @@
 
 <script>
 import {
+  getGroupList,
   addMaterialGroup,
   delMaterialGroup,
   updateMaterialGroup,
diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index e04d452..d24b451 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -8,8 +8,8 @@
     <el-row :gutter="20">
 
       <el-col :span="24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
-          <el-form-item label="检测项目名称">
+        <el-form :model="queryParams" ref="queryProjectForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
+          <el-form-item label="检测项目名称" prop="ruleName">
             <el-input
               v-model="queryParams.ruleName"
               placeholder="检测项目名称"
@@ -19,11 +19,11 @@
             />
           </el-form-item>
 
-          <el-form-item label="检测方案名称">
+          <el-form-item label="检测方案名称" prop="projectType">
             <el-select v-model="queryParams.projectType" filterable clearable placeholder="请选择检测方案">
               <el-option
-              v-for="item in projectTypeOptions"
-              :key="item.projectTypeCode"
+              v-for="(item,index) in projectTypeOptions"
+              :key="index"
               :label="item.projectTypeName"
               :value="item.projectTypeCode">
               </el-option>
@@ -66,7 +66,7 @@
           </el-table-column>
           <el-table-column label="测量单位"  align="left" prop="unitCode" width="90"/>
           <el-table-column label="抽样方案"  align="left" prop="samplePlan" width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="合格判定"  align="left" prop="judge"/ width="100">
+          <el-table-column label="合格判定"  align="left" prop="judge" width="100" />
           <el-table-column label="缺陷等级"  align="left" prop="defectLevel" width="90"/>
           <el-table-column label="检验方式"  align="left" prop="checkMode" width="90" :show-overflow-tooltip="true"/>
           <el-table-column label="检验工具"  align="left" prop="checkTool" width="90"/>
@@ -107,7 +107,8 @@ export default {
       total: 0,
       // BOM产品表格数据
       itemList: null,
-
+      ruleName: null,
+      projectType:null,
       //树名称
       bomCode: undefined,
       defaultProps: {
@@ -164,7 +165,7 @@ export default {
 
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("queryProjectForm");
       this.handleQuery();
     },
 
@@ -183,6 +184,8 @@ export default {
 
       this.$emit('onSelected', this.$refs.myTable.selection);
       this.showFlag = false;
+      this.ruleName = '';
+      this.projectType = '';
     },
   }
 };
diff --git a/src/views/quality/qcProjectType/data.vue b/src/views/quality/qcProjectType/data.vue
index c23f816..00abfa8 100644
--- a/src/views/quality/qcProjectType/data.vue
+++ b/src/views/quality/qcProjectType/data.vue
@@ -10,8 +10,8 @@
 				/>
 			</el-form-item>
 			<el-form-item label="检验规则属性" prop="propertyCode">
-				<el-select 
-					v-model="queryParams.propertyCode" 
+				<el-select
+					v-model="queryParams.propertyCode"
 					placeholder="请选择检验规则属性"
 					clearable >
 						<el-option
@@ -139,7 +139,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -243,8 +243,8 @@
 							<el-input type='textarea' v-model="form.judge" placeholder="合格判定" />
 						</el-form-item>
 					</el-col>
-				</el-row>	
-				
+				</el-row>
+
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -281,7 +281,7 @@
 				<el-button @click="upload.open = false">取 消</el-button>
 			</div>
 		</el-dialog>
-		
+
 	</div>
 </template>
 
@@ -340,7 +340,7 @@ export default {
 				// 是否更新已经存在的检测项目数据
 				updateSupport: 0,
 				// 设置上传的请求头部
-				headers: { 
+				headers: {
 					Authorization: "Bearer " + getToken(),
 					poolName: localStorage.getItem('USER_POOL_NAME_CURRENT'),
 				},
@@ -483,7 +483,7 @@ export default {
 		/** 下载模板操作 */
 		importTemplate() {
 			this.download('quality/project/importTemplate', {
-			}, `user_template_${new Date().getTime()}.xlsx`)
+			}, `check_project_template_${new Date().getTime()}.xlsx`)
 		},
 		// 文件上传中处理
 		handleFileUploadProgress(event, file, fileList) {

From 86794b24a6bb46db006a391617ef3328c1a5c483 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 11:35:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/MaterialGroupAdd.vue     | 25 ++++++++++++++++---
 .../quality/qcIncome/checkProjectType.vue     |  9 +++----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 12a1375..4e4d23c 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -56,10 +56,17 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="物料组名称" prop="groupName">
-          <el-input v-model="form.groupName" placeholder="请输入物料组名称" />
+          <el-select v-model="form.groupCode" filterable clearable placeholder="请选择物料组">
+            <el-option
+              v-for="(item,index) in OriginalGroupList"
+              :key="index"
+              :label="item.groupName"
+              :value="item.groupCode">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="物料组编码" prop="groupCode">
-          <el-input v-model="form.groupCode" placeholder="请输入物料组编码" disabled/>
+        <el-form-item v-show="true" label="物料组编码" prop="groupCode">
+          <el-input v-model="form.groupName" placeholder="请输入物料组编码"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -78,7 +85,7 @@
 
 <script>
 import {
-  getGroupList,
+  getOriginalGroupList,
   addMaterialGroup,
   delMaterialGroup,
   updateMaterialGroup,
@@ -117,6 +124,8 @@ export default {
       groupName: undefined,
       // 物料组表格数据
       materialGroupList: [],
+      // 物料组原始数据
+      OriginalGroupList: [],
       //当前点击的节点数据
       nodeData: {},
       // 弹出层标题
@@ -150,6 +159,7 @@ export default {
   },
   created() {
     this.getMaterialTree();
+    this.getOriginalGroup();
   },
   methods: {
     // 取消按钮
@@ -175,6 +185,13 @@ export default {
       };
       this.resetForm("form");
     },
+    /** 获取初始物料组 */
+    getOriginalGroup() {
+      getOriginalGroupList(this.queryParams).then((response) => {
+        this.OriginalGroupList = response.rows;
+        //this.loading = false;
+      });
+    },
     /** 查询部门下拉树结构 */
     getMaterialTree() {
       materialTreeSelect().then((response) => {
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index ab4ff31..fe9960c 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -48,11 +48,6 @@
                 v-hasPermi="['quality:qcIncome:edit']"
               >不良数量</el-button>
             </template>
-          </el-table-column>
-          <el-table-column label="不良数量"  align="left"  prop="defectQuality"  width="120">
-            <template slot-scope="scope">
-              <el-input type="number" v-model="scope.row.defectQuality" placeholder="请输入不良数量"/>
-            </template>
           </el-table-column>
            <el-table-column label="检测值" align="center" class-name="small-padding fixed-width" v-if="this.viewStatus != '1' ">
             <template slot-scope="scope">
@@ -210,7 +205,6 @@ export default {
     this.getDefect();
   },
   methods: {
-
     getDefect(){
       getDefectList(this.typeCode).then(response => {
           this.defectList = response;
@@ -331,6 +325,7 @@ export default {
       this.defectForm.defectItems.forEach(item => {
         item.belongToDetail = row.recordId;
         item.belongTo = row.belongTo;
+        item.noOkQuality = 0;
       });
       getDefectValue(row.recordId).then(response => {
         let values = response.rows;
@@ -343,6 +338,8 @@ export default {
             noOkQuality: item.noOkQuality,
           }));
           this.updateFlag = true;
+        }else{
+          this.updateFlag = false;
         }
         this.defectOpen = true;
       });

From 94dc5948d95fecce2f3570ac4f962520ea2effa3 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 1 Apr 2024 13:42:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BB=84=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/MaterialGroupAdd.vue     | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 4e4d23c..13fcdf7 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -55,19 +55,27 @@
     <!-- 新增物料组窗口 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="物料组名称" prop="groupName">
-          <el-select v-model="form.groupCode" filterable clearable placeholder="请选择物料组">
-            <el-option
-              v-for="(item,index) in OriginalGroupList"
-              :key="index"
-              :label="item.groupName"
-              :value="item.groupCode">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item v-show="true" label="物料组编码" prop="groupCode">
-          <el-input v-model="form.groupName" placeholder="请输入物料组编码"/>
-        </el-form-item>
+        <el-row >
+          <el-col :span="16">
+            <el-form-item label="物料组名称" prop="groupCode">
+              <el-input v-model="form.groupName" placeholder="请输入物料组名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row >
+          <el-col :span="16">
+            <el-form-item label="物料组" prop="groupName">
+              <el-select v-model="form.groupCode" filterable clearable placeholder="请选择物料组">
+                <el-option
+                  v-for="(item,index) in OriginalGroupList"
+                  :key="index"
+                  :label="item.groupName"
+                  :value="item.groupCode">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -172,6 +180,7 @@ export default {
       this.form = {
         id: null,
         groupName: null,
+        groupCode: null,
         attr1: null,
         createBy: null,
         createTime: null,

From a2dbedf3916116ecfa7bba20a34f73a86978cda5 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 15:56:02 +0800
Subject: [PATCH 4/6] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=BB=B4=E6=8A=A4-?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=A0=A1=E9=AA=8C=E5=85=B3=E8=81=94=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/item/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index b01ec06..0a2d3de 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -661,7 +661,7 @@ export default {
       // 数据校验
       if (this.form.itemName == null) {
         this.$message({
-          message: "请输入检查项！",
+          message: "请输入检查项名称！",
           type: "warning"
         })
         return
@@ -673,13 +673,20 @@ export default {
         })
         return
       }
-      if (this.selectEquipmentList.length == 0) {
+      if (this.form.itemMethod == null) {
         this.$message({
-          message: "请关联设备！",
+          message: "请输入检查方法！",
           type: "warning"
         })
         return
       }
+      // if (this.selectEquipmentList.length == 0) {
+      //   this.$message({
+      //     message: "请关联设备！",
+      //     type: "warning"
+      //   })
+      //   return
+      // }
       for (let i = 0; i < this.formStandard.length; i++) {
         // 如果为定性
         if (this.formStandard[i].standardType == 'qualitative') {

From 9acac169943739298b5d90320ef15a9c835e26f7 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 1 Apr 2024 16:33:20 +0800
Subject: [PATCH 5/6] =?UTF-8?q?2024-4-1=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E5=B7=A1=E6=A3=80-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E9=80=89=E6=8B=A9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/inspectionPlan/index.vue | 11 +++++++----
 src/views/device/spotCheckPlan/index.vue  |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue
index 11886dc..8271e28 100644
--- a/src/views/device/inspectionPlan/index.vue
+++ b/src/views/device/inspectionPlan/index.vue
@@ -926,10 +926,13 @@ export default {
       // 获取设备组线信息
       getGroupLine().then(response => {
         this.groupLineList = response.data;
-        this.equipmentQuery.groupLine = response.data[0].equipmentCode;
-        this.getEquList();
+        // this.equipmentQuery.groupLine = response.data[0].equipmentCode;
+      })
+      //获取设备
+      getEquList().then(response => {
+        this.equTotal = response.total;
+        this.queryEquipment = response.rows;
       })
-
       this.selectEqu = true;
     },
     // 编辑标准确认按钮
@@ -1058,7 +1061,7 @@ export default {
         equipmentCode: null,
         equipmentName: null,
         workshopCode: null,
-        groupLine:this.groupLineList[0].equipmentCode,
+        groupLine:null,
         pageNum: 1,
         pageSize: 10,
       };
diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue
index 882dc8b..47b5d03 100644
--- a/src/views/device/spotCheckPlan/index.vue
+++ b/src/views/device/spotCheckPlan/index.vue
@@ -971,10 +971,13 @@ export default {
       // 获取设备组线信息
       getGroupLine().then(response => {
         this.groupLineList = response.data;
-        this.equipmentQuery.groupLine = response.data[0].equipmentCode;
-        this.getEquList();
       })
 
+     //获取设备
+     getEquList().then(response => {
+        this.equTotal = response.total;
+        this.queryEquipment = response.rows;
+      })
       this.selectEqu = true;
     },
     // 编辑标准确认按钮
@@ -1103,7 +1106,7 @@ export default {
         equipmentCode: null,
         equipmentName: null,
         workshopCode: null,
-        groupLine:this.groupLineList[0].equipmentCode,
+        groupLine : null,
         pageNum: 1,
         pageSize: 10,
       };

From 8345bfbe0441353f89a6643e90460bc812acc828 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 1 Apr 2024 17:22:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/produceReport.js          |   5 +-
 src/views/plan/workorderBP/index.vue      |   4 +-
 src/views/quality/produceReport/index.vue | 198 ++++++++++++++++++++--
 src/views/quality/qcIncome/index.vue      |   9 +-
 src/views/quality/qcProduce/index.vue     |   4 +-
 5 files changed, 202 insertions(+), 18 deletions(-)

diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index 9b81f2b..3458906 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -43,9 +43,10 @@ export function delProduce(recordId) {
 	});
 }
 
-export function getProduceReportXJ(orderNo) {
+export function getProduceReportXJ(orderNo,shiftId) {
 	const data = {
-		orderNo
+		orderNo,
+		shiftId
 	}
 	return request({
 		url: '/quality/qcProduceReport/getProduceReportXJ',
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index 36b9efc..e46ac9a 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -1322,8 +1322,8 @@ export default {
 
       var statusesArray = this.statuses;
       for (var i = 0; i < statusesArray.length; i++) {
-        if (statusesArray[i] != 'w0') {//已经下达的不允许操作
-          this.$modal.msgError("已经派发的订单不允许操作");
+        if (statusesArray[i] == 'w2') {
+          this.$modal.msgError("已经活动的订单不允许操作");
           return
         }
       }
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 6a747e0..522f234 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -183,7 +183,7 @@
 							</el-radio-group>
 						</el-col>
 					</el-row>
-					<!-- 主数据 -->
+					<!-- 主数据 （白班）-->
 					<el-table
 						v-if="refreshNewWorkerTable"
 						v-loading="newWorkerLoading"
@@ -360,6 +360,165 @@
 						</el-table-column>
 					</el-table>
 
+					<el-table
+						v-if="refreshNewWorkerTableNight"
+						v-loading="newWorkerLoading"
+						class="my-print-table"
+						:data="form.checkInfos"
+						border
+						style="width: 100%">
+						<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
+						<el-table-column label="序号" type="index" align="center" :index="indexMethod"/>
+						<el-table-column label="项目名称" width="155" align="left" prop="ruleName" />
+						<el-table-column label="时间" align="center" >
+							<el-table-column prop="column080090" label="20:30-21:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column080090.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>	
+							
+							<el-table-column prop="column090100" label="21:30-22:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column090100.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>	
+
+							<el-table-column prop="column100110" label="22:30-23:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column100110.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column110120" label="23:30-1:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column110120.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column133143" label="1:30-2:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column133143.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column143153" label="2:30-3:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column143153.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column153163" label="3:30-4:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column153163.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column163173" label="4:30-5:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column163173.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column123133" label="5:30-6:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column123133.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column180190" label="6:30-7:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column180190.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+							<el-table-column prop="column190200" label="7:30-8:30" width="95" align="center">
+								<template slot-scope="scope" >
+								    <div v-for="(item,index) in scope.row.column190200.split(',')">
+									    <el-image
+										:src="item" 
+										style="width: 60px; height: 60px" 
+										:fit="fit" 
+										:preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)"
+										v-if="index>0"/>
+										<span v-else>{{item}}</span>
+									</div>
+								</template>
+							</el-table-column>
+						</el-table-column>
+					</el-table>
+
 					<br/>
 					<!-- 底部 -->
 					<el-row class="my-print-foot">
@@ -543,6 +702,7 @@ export default {
 			formRef: 'form',
 			newWorkerLoading: false,
 			refreshNewWorkerTable:true,
+			refreshNewWorkerTableNight:true,
 			validateRules: [],
 			checkList: [],
 			standardNo: null,
@@ -760,18 +920,32 @@ export default {
 				this.queryParams.recordId = recordId;
 				this.getCheckedProjectList();
 			}else {
-
 				const orderNo = row.orderNo;
-				getProduceReportXJ(orderNo).then(response => {
-					this.form = response;
-					//巡检报告
-					this.form.printable = 'printForm'; //打印时需要
-					this.form.ignore = ['no-print'];//打印时需要
-					this.open = true;
-					this.title = "巡检检验报告";
-					this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
-					this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
-				})
+				if(row.shiftId == '5'){
+					getProduceReportXJ(orderNo,row.shiftId).then(response => {
+						this.form = response;
+						//巡检报告
+						this.form.printable = 'printForm'; //打印时需要
+						this.form.ignore = ['no-print'];//打印时需要
+						this.open = true;
+						this.title = "巡检检验报告";
+						this.refreshNewWorkerTable = true ;// 立即将refreshProTable设置为true，显示表格
+						this.refreshNewWorkerTableNight = false ;
+						this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成
+					})
+				}else if(row.shiftId == '2'){
+					getProduceReportXJ(orderNo,row.shiftId).then(response => {
+						this.form = response;
+						//巡检报告
+						this.form.printable = 'printForm'; //打印时需要
+						this.form.ignore = ['no-print'];//打印时需要
+						this.open = true;
+						this.title = "巡检检验报告";
+						this.refreshNewWorkerTableNight = true ;// 立即将refreshProTable设置为true，显示表格
+						this.refreshNewWorkerTable = false ;
+						this.newWorkerLoading = false ;// 设置加载状态为false，表示加载完成
+					})
+				}
 			}
 
 		},
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index f430bbe..162ddb9 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -141,7 +141,9 @@
 			</el-table-column>
 			<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
-			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
+			<el-table-column label="物料号" align="center" prop="materialCode" width="170"
+			:formatter="productCodeFormate"
+			/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
@@ -470,6 +472,11 @@ export default {
 		this.handleDefectType();
 	},
 	methods: {
+		productCodeFormate(row, column, cellValue){
+			if(cellValue != null){
+				return cellValue.slice(7,18);  //返回值
+			}
+		},
 		/****/
 		getCheckTypes() {
            	getCheckTypes('material').then(response => {
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index fe49f59..c08e1de 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -563,7 +563,9 @@ export default {
 	methods: {
 		//产品编码格式化
 		productCodeFormate(row, column, cellValue){
-			return cellValue.slice(7,18);  //返回值
+			if(cellValue != null){
+				return cellValue.slice(7,18);  //返回值
+			}
 		},
         /****/
 		//获取检验节点