检验分配升级

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'
+	});
+}

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'
+		});
+}

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
+	});
+}

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(

src/views/quality/checkType/index.vue

@@ -166,15 +166,21 @@
 					/>
 				</template>
 			</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
+				<el-button size="small" type="danger" plain @click="deleteUser(scope.row)">移除</el-button>
-						 size="small"
-             type="danger"
-             plain
-             @click="deleteUser(scope.row)"
-						 >
-						移除</el-button>
 			</template>
 			</el-table-column>
 		</el-table>
@@ -193,8 +199,10 @@
 </template>
 
 <script>
-import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType } from "@/api/quality/checkType";
+import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType,
-import{ getSelectedUsers, addUserBind, deleteByMaterialCode} from "@/api/quality/userbind";
+		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 {
@@ -224,6 +232,9 @@ export default {
 			checkTypeList: [],
 			userList: [],
 			userRows: [],
+			belongToOptions:[],
+			belongToStandars:[],
+			belongToLines:[],
 			// 弹出层标题
 			title: "",
 			titleUserBind: "",
@@ -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;
@@ -373,6 +399,15 @@ export default {
 			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;
@@ -431,7 +466,6 @@ export default {
 					}
 					this.getSelectUserList();
 				});
-
 			},
 
 			deleteUser(row) {
@@ -460,6 +494,16 @@ export default {
 			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>

src/views/quality/report/bpNookRate/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">

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">