From 8872f5a12f0af872e3a694471b7333975ef9cb63 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 7 Apr 2025 13:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=88=86=E9=85=8D=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/reportWorkConsume.js              |   8 +-
 src/api/quality/checkType.js                  |  15 +
 src/api/quality/userbind.js                   |   9 +
 src/views/mes/reportWork/index.vue            |  16 +-
 src/views/quality/checkType/index.vue         | 264 ++++++++++--------
 src/views/quality/report/bpNookRate/index.vue |  11 +-
 .../quality/report/bpReworkRate/index.vue     |   1 +
 7 files changed, 204 insertions(+), 120 deletions(-)

diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js
index e9d3b3b..fdead41 100644
--- a/src/api/mes/reportWorkConsume.js
+++ b/src/api/mes/reportWorkConsume.js
@@ -96,4 +96,10 @@ export function getBomList(query) {
 	});
 }
 
-
+// 删除生产报工物料消耗
+export function deleteConsume(workorderCode) {
+	return request({
+		url: '/mes/reportWorkConsume/deleteConsume/' + workorderCode,
+		method: 'delete'
+	});
+}
diff --git a/src/api/quality/checkType.js b/src/api/quality/checkType.js
index d227eac..a7570ea 100644
--- a/src/api/quality/checkType.js
+++ b/src/api/quality/checkType.js
@@ -85,3 +85,18 @@ export function delFile(id) {
         method: 'delete'
     });
 }
+
+// 查询检验节点维护详细
+export function listBelongToStandars() {
+	return request({
+		url: '/quality/checkType/listBelongToStandars',
+		method: 'get'
+		});
+}
+// 查询检验节点维护详细
+export function listBelongToLines() {
+	return request({
+		url: '/quality/checkType/listBelongToLines',
+		method: 'get'
+		});
+}
\ No newline at end of file
diff --git a/src/api/quality/userbind.js b/src/api/quality/userbind.js
index 71c36a9..9900436 100644
--- a/src/api/quality/userbind.js
+++ b/src/api/quality/userbind.js
@@ -91,3 +91,12 @@ export function deleteByMaterialCode(data) {
     data: data
 	});
 }
+
+// 修改用户物料关联
+export function updateBelongTo(data) {
+	return request({
+		url: '/quality/material/updateBelongTo',
+		method: 'put',
+		data: data
+	});
+}
\ No newline at end of file
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index ccb0532..af36288 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -518,7 +518,7 @@
 			</el-tabs>
 
 			<div slot="footer" class="dialog-footer">
-
+        <el-button type="warning" @click="clearConsume" >一键清理</el-button>
 				<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
 				<el-button :disabled="loading" type="primary" @click="submitConsume" v-else>确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -704,7 +704,7 @@ import {
   submitConsumePS,
   submitReportInfo,
   getBomList,
-  getAllLevelConsumeList,
+  getAllLevelConsumeList,deleteConsume
 } from "@/api/mes/reportWorkConsume";
 import ReportWorkConsume from "./reportWorkConsume.vue";
 import ItemSelectUser from "./selectUser.vue";
@@ -1434,9 +1434,7 @@ export default {
         });
         this.mergedArray = newPConsumeRows;
         this.pConsumeRows = newPConsumeRows;
-        console.log("过滤后:", this.pConsumeRows);
       }
-      console.log(this.pConsumeRows, selection, "wwwwww");
     },
     // 多选框选中all数据(报工物料消耗专用特殊逻辑，不准改zxl)
     allConsumeSelection(selection, row) {
@@ -1490,6 +1488,16 @@ export default {
           this.loading = false; // 关闭 loading 状态
         });
     },
+    /**清理重复报工损耗**/
+    clearConsume(){
+      const workorderCode = this.selectRow[0].workorderCode;
+			this.$modal.confirm('是否确认清理工单号"' + workorderCode + '"的数据项？').then(function() {
+				return deleteConsume(workorderCode);
+			}).then(() => {
+				this.$modal.msgSuccess("清理成功");
+        this.cancel();
+			}).catch(() => {});
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 79be36b..1e4ca39 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -154,34 +154,40 @@
 
     <!-- 用户绑定 -->
     <el-dialog :title="titleUserBind" :visible.sync="openUserBind" width="800px">
-			<el-table v-loading="userloading" :data="userList" ref="userBindTable" >
-        <el-table-column label="序号" align="center" type="index" width="50" />
-        <el-table-column label="员工编号" align="center" prop="userCode" />
-        <el-table-column label="姓名" align="center" prop="userName" />
-        <el-table-column label="来料类别" align="center" prop="attr1" >
-          <template slot-scope="scope">
+		<el-table v-loading="userloading" :data="userList" ref="userBindTable" >
+			<el-table-column label="序号" align="center" type="index" width="50" />
+			<el-table-column label="员工编号" align="center" prop="userCode" />
+			<el-table-column label="姓名" align="center" prop="userName" />
+			<el-table-column label="来料类别" align="center" prop="attr1" >
+				<template slot-scope="scope">
 					<dict-tag
 						:options="dict.type.order_type_ll"
 						:value="scope.row.attr1"
 					/>
 				</template>
-        </el-table-column>
-				<el-table-column fixed="right" align="center" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button
-						 size="small"
-             type="danger"
-             plain
-             @click="deleteUser(scope.row)"
-						 >
-						移除</el-button>
-          </template>
-				</el-table-column>
-			</el-table>
-			<div class="button-container">
-				<el-button size="mini" type="primary" @click="addUser()" >新增员工</el-button>
-			</div>
-			<div slot="footer" class="dialog-footer">
+			</el-table-column>
+			<el-table-column label="所属线体/标准" align="center" prop="attr2" >
+				<template slot-scope="scope">
+					<el-select v-model="scope.row.attr2" placeholder="请选择" clearable @change="selectBelongTo(scope.row)">
+						<el-option
+						v-for="item in belongToOptions"
+						:key="item.typeCode"
+						:label="item.typeName"
+						:value="item.typeCode"
+						></el-option>
+					</el-select>
+				</template>
+			</el-table-column>
+			<el-table-column fixed="right" align="center" label="操作" width="100">
+			<template slot-scope="scope">
+				<el-button size="small" type="danger" plain @click="deleteUser(scope.row)">移除</el-button>
+			</template>
+			</el-table-column>
+		</el-table>
+		<div class="button-container">
+			<el-button size="mini" type="primary" @click="addUser()" >新增员工</el-button>
+		</div>
+		<div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleClose" >关 闭</el-button>
 			</div>
 		</el-dialog>
@@ -193,8 +199,10 @@
 </template>
 
 <script>
-import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType } from "@/api/quality/checkType";
-import{ getSelectedUsers, addUserBind, deleteByMaterialCode} from "@/api/quality/userbind";
+import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType,
+		listBelongToStandars,listBelongToLines
+ } from "@/api/quality/checkType";
+import{ getSelectedUsers, addUserBind, deleteByMaterialCode,updateBelongTo} from "@/api/quality/userbind";
 import ItemSelectUser from "./selectUser.vue";
 import ItemConfFile from "./confFile.vue";
 export default {
@@ -214,19 +222,22 @@ export default {
 			multiple: true,
 			// 显示搜索条件
 			showSearch: true,
-      openUserBind: false,
-      materialCode: "",
-      materialName: "",
-      attr1: "",
+			openUserBind: false,
+			materialCode: "",
+			materialName: "",
+			attr1: "",
 			// 总条数
 			total: 0,
 			// 检验节点维护表格数据
 			checkTypeList: [],
-      userList: [],
-      userRows: [],
+			userList: [],
+			userRows: [],
+			belongToOptions:[],
+			belongToStandars:[],
+			belongToLines:[],
 			// 弹出层标题
 			title: "",
-      titleUserBind: "",
+			titleUserBind: "",
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -240,7 +251,7 @@ export default {
 				attr1: null,
 				factoryCode: null,
 			},
-      getUserParams: {
+     		getUserParams: {
 				pageNum: 1,
 				pageSize: 10,
 				userCode: null,
@@ -261,6 +272,8 @@ export default {
 	},
 	created() {
 		this.getList();
+		this.getBelongToLinesList();
+		this.getBelongToStandars()
 	},
 	methods: {
 		/** 查询检验节点维护列表 */
@@ -272,6 +285,19 @@ export default {
 				this.loading = false;
 			});
 		},
+		/** 查询所属线体选择列表 */
+		getBelongToLinesList() {
+			listBelongToLines().then(response => {
+				this.belongToLines = response;
+			});
+		},
+		
+		/** 查询所属标准选择列表 */
+		getBelongToStandars() {
+			listBelongToStandars().then(response => {
+				this.belongToStandars = response;
+			});
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false;
@@ -363,103 +389,121 @@ export default {
 				...this.queryParams
 			}, `checkType_${new Date().getTime()}.xlsx`)
 		},
-    /** 人员绑定按钮操作页面 */
-    handleBind(row){
-      //this.reset();
-      this.userloading = true;
-      //赋值人员选择提交时使用
-      this.materialCode = row.orderCode;
-      this.materialName = row.checkName;
-      this.attr1 = row.attr1;
+		/** 人员绑定按钮操作页面 */
+		handleBind(row){
+			//this.reset();
+			this.userloading = true;
+			//赋值人员选择提交时使用
+			this.materialCode = row.orderCode;
+			this.materialName = row.checkName;
+			this.attr1 = row.attr1;
 
 			this.getUserParams.materialCode = row.orderCode;
+
+			if(row.orderCode == 'checkTypeSC'|| row.orderCode == 'checkTypeSCXJ' || 
+				row.orderCode=='checkTypeCPPC' || row.orderCode=='checkTypeCP'){
+				this.belongToOptions = this.belongToLines;
+			}else if(row.orderCode == 'checkTypeLL'){
+				this.belongToOptions = this.belongToStandars;
+			}
+			console.log("======"+this.belongToOptions)
+
 			//查询绑定记录表
 			getSelectedUsers(this.getUserParams).then(response => {
 				this.userList = response.rows;
 				this.openUserBind = true;
 				this.titleUserBind = "人员绑定详情";
-        this.userloading = false;
+				this.userloading = false;
 			});
 
-    },
-    getSelectUserList() {
-      this.userloading = true;
-      //this.getUserParams.materialCode = orderCode;
-      getSelectedUsers(this.getUserParams).then(response => {
-        this.userList = response.rows;
-        this.userloading = false;
-      });
-    },
-    userSelection(selection) {
-      const allRows = this.userRows.concat(selection)
-		   this.userRows = allRows.reduce((acc, cur) => {
-				const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode);
-				if (!hasDuplicate) {
-					acc.push(cur);
-				}
-				return acc;
-			}, []);
-    },
-    // 关闭弹窗
-    handleClose() {
-      this.openUserBind = false;
-    },
-    // 人员选择
-    addUser() {
-      this.$refs.itemSelectUser.showFlag = true;
-      this.$refs.itemSelectUser.getList();
-    },
-    //人员选择确认
+		},
+		getSelectUserList() {
+			this.userloading = true;
+			//this.getUserParams.materialCode = orderCode;
+			getSelectedUsers(this.getUserParams).then(response => {
+				this.userList = response.rows;
+				this.userloading = false;
+			});
+		},
+		userSelection(selection) {
+			const allRows = this.userRows.concat(selection)
+			this.userRows = allRows.reduce((acc, cur) => {
+					const hasDuplicate = acc.some(item => item.materialCode === cur.materialCode);
+					if (!hasDuplicate) {
+						acc.push(cur);
+					}
+					return acc;
+				}, []);
+		},
+		// 关闭弹窗
+		handleClose() {
+			this.openUserBind = false;
+		},
+		// 人员选择
+		addUser() {
+			this.$refs.itemSelectUser.showFlag = true;
+			this.$refs.itemSelectUser.getList();
+		},
+		//人员选择确认
 		onSelectUser(obj) {
 			let data = {
-				materialCode: this.materialCode,
-				materialName: this.materialName,
-				attr1List: [],
-				userCodes: [],
-				userNames: [],
+					materialCode: this.materialCode,
+					materialName: this.materialName,
+					attr1List: [],
+					userCodes: [],
+					userNames: [],
 			}
-		  obj.forEach((item, index) => {
-			data.userCodes.push(item.userCode);
-			data.userNames.push(item.userName);
-			data.attr1List.push(item.attr1);
-		});
-		addUserBind(data).then(response => {
-			if(response.code === 200) {
-			this.$modal.msgSuccess("人员绑定成功");
-			}else{
-			this.$modal.msgError(response.msg);
-			}
-			this.getSelectUserList();
-		});
-
-		},
-
-		deleteUser(row) {
-			const userCode = row.userCode;
-			const userName = row.userName;
-			const data = {
-				materialCode: this.materialCode,
-				userCode: userCode,
-				userName: userName,
-			}
-			this.$modal.confirm('是否确认删除用户名为"' + userName + '"的数据项？').then(function() {
-				return deleteByMaterialCode(data);
-			}).then(response => {
+			obj.forEach((item, index) => {
+				data.userCodes.push(item.userCode);
+				data.userNames.push(item.userName);
+				data.attr1List.push(item.attr1);
+			});
+			addUserBind(data).then(response => {
 				if(response.code === 200) {
-				this.$modal.msgSuccess("删除成功");
-				}else{
-				this.$modal.msgError(response.msg);
+					this.$modal.msgSuccess("人员绑定成功");
+					}else{
+					this.$modal.msgError(response.msg);
+					}
+					this.getSelectUserList();
+				});
+			},
+
+			deleteUser(row) {
+				const userCode = row.userCode;
+				const userName = row.userName;
+				const data = {
+					materialCode: this.materialCode,
+					userCode: userCode,
+					userName: userName,
 				}
-				this.getSelectUserList();
-			}).catch(() => {});
-		},
+				this.$modal.confirm('是否确认删除用户名为"' + userName + '"的数据项？').then(function() {
+					return deleteByMaterialCode(data);
+				}).then(response => {
+					if(response.code === 200) {
+					this.$modal.msgSuccess("删除成功");
+					}else{
+					this.$modal.msgError(response.msg);
+					}
+					this.getSelectUserList();
+				}).catch(() => {});
+			},
 		//受控文件弹窗
 		handleFile(row) {
-            this.checkType = row.orderCode;
+			this.checkType = row.orderCode;
 			this.$refs.itemConfFile.initFunc(this.checkType);
 			this.$refs.itemConfFile.showFlag = true;
 			this.$refs.itemConfFile.getList();
 		},
+		//
+		selectBelongTo(row){
+			const data = {
+				id: row.id,
+				attr2: row.attr2,
+			}
+			updateBelongTo(data).then(response => {
+              this.$modal.msgSuccess("分配成功");
+            });
+		}
 	}
 };
 </script>
diff --git a/src/views/quality/report/bpNookRate/index.vue b/src/views/quality/report/bpNookRate/index.vue
index 2c1f9b6..12a91da 100644
--- a/src/views/quality/report/bpNookRate/index.vue
+++ b/src/views/quality/report/bpNookRate/index.vue
@@ -34,11 +34,12 @@
 				<el-table v-loading="loading" :data="hourProList" :span-method="objectSpanMethod" border>
 					<el-table-column label="序号" type="index" align="center" :index="indexMethod" fixed/>
 					<el-table-column label="白坯名称" align="center" prop="materialName" min-width="100" fixed/>
-					<el-table-column label="日期" align="center" prop="dataType" min-width="100" fixed/>
-						<template v-for="(column, index) in showTitles">
-							<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
-						</template>
-					</el-table>
+					<el-table-column label="日期" align="center" prop="dataType" min-width="100" fixed/>					
+					<template v-for="(column, index) in showTitles">
+						<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
+					</template>
+					<el-table-column label="累计" align="center" prop="rowSum" min-width="100"/>
+				</el-table>	
 			</el-tab-pane>
 			<el-tab-pane label="图表" name="second">
 				<div id="echartss" style="width:1200px;height:450px;"></div>
diff --git a/src/views/quality/report/bpReworkRate/index.vue b/src/views/quality/report/bpReworkRate/index.vue
index e6df143..fcb9981 100644
--- a/src/views/quality/report/bpReworkRate/index.vue
+++ b/src/views/quality/report/bpReworkRate/index.vue
@@ -38,6 +38,7 @@
 					<template v-for="(column, index) in showTitles">
 						<el-table-column align="center" min-width="120" :prop="column.id" :key="column.id" :label="column.titleName"/>
 					</template>
+					<el-table-column label="累计" align="center" prop="rowSum" min-width="100"/>
 				</el-table>
 			</el-tab-pane>
 			<el-tab-pane label="图表" name="second">