From e1203b738cbacf1c0d079da2db8417340ee92d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 13 Aug 2024 16:10:06 +0800
Subject: [PATCH] zxl

---
 src/views/kanban/quality/kanban1.vue          |  2 +-
 src/views/kanban/quality/kanban3.vue          | 62 ++++++++++---------
 src/views/mes/dailyReportNew/index.vue        | 33 ++++++----
 src/views/mes/prepare/index.vue               |  6 +-
 src/views/mes/reportWork/index.vue            | 41 +++++++-----
 src/views/quality/qcProjectType/index.vue     |  4 +-
 .../quality/qcProjectType/projectTypeTree.vue |  2 +-
 7 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index 53f9ee28..5173f5cd 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -299,7 +299,7 @@ export default {
             const _this = this;
             getProduceStaticInfo({
                 ymdType: moment().format(_this.selectxtclasses),
-                typeCode: 'material',
+                typeCode: 'produce',
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
                 if (response) {
diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue
index 1c899479..9417b167 100644
--- a/src/views/kanban/quality/kanban3.vue
+++ b/src/views/kanban/quality/kanban3.vue
@@ -38,14 +38,15 @@
                         <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
                             <thead>
                                 <tr style="height: 44px;">
-                                    <td style="width: 8%;">序号</td>
-                                    <td style="width: 8%;">检验编号</td>
-                                    <td style="width: 8%;">检验阶段</td>
-                                    <td style="width: 8%;">检验时间</td>
+                                    <td style="width: 2%;">序号</td>
+                                    <td style="width: 6%;">检验编号</td>
+                                    <td style="width: 4%;">检验阶段</td>
+                                    <td style="width: 8%;">任务时间</td>
                                     <td style="width: 8%;">物料来源</td>
-                                    <td style="width: 8%;">物料名称</td>
-                                    <td style="width: 8%;">检验人</td>
-                                    <td style="width: 8%;">检验状态</td>
+                                    <td style="width: 10%;">物料名称</td>
+                                    <td style="width: 4%;">检验人</td>
+                                    <td style="width: 8%;">检验时间</td>
+                                    <td style="width: 4%;">检验状态</td>
                                 </tr>
                             </thead>
                         </table>
@@ -55,14 +56,15 @@
                                 <tbody>
                                     <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
                                         v-for="(n, index) in Inspectiondetails">
-                                        <td style="width: 8%;">{{ index + 1 }}</td>
-                                        <td style="width: 8%;">{{ n.checkNo }}</td>
-                                        <td style="width: 8%;">{{ n.checkName }}</td>
+                                        <td style="width: 2%;">{{ index + 1 }}</td>
+                                        <td style="width: 6%;">{{ n.checkNo }}</td>
+                                        <td style="width: 4%;">{{ n.checkName }}</td>
                                         <td style="width: 8%;">{{ n.incomeTime }}</td>
                                         <td style="width: 8%;">{{ n.supplierName }}</td>
-                                        <td style="width: 8%;">{{ n.materialName }}</td>
-                                        <td style="width: 8%;">{{ n.checkManName }}</td>
-                                        <td style="width: 8%;" :class="[n.checkStatus == 1 ? 'color1' : 'color2']">{{
+                                        <td style="width: 10%;">{{ n.materialName }}</td>
+                                        <td style="width: 4%;">{{ n.checkManName }}</td>
+                                        <td style="width: 8%;">{{ n.checkTime }}</td>
+                                        <td style="width: 4%;" :class="[n.checkStatus == 1 ? 'color1' : 'color2']">{{
                                             n.checkStatus }}</td>
                                     </tr>
                                 </tbody>
@@ -77,14 +79,15 @@
                         <table class="table-thead" border="0" cellpadding="0" cellspacing="0">
                             <thead>
                                 <tr style="height: 44px;">
-                                    <td style="width: 8%;">序号</td>
-                                    <td style="width: 8%;">检验编号</td>
-                                    <td style="width: 8%;">检验阶段</td>
-                                    <td style="width: 8%;">检验时间</td>
+                                    <td style="width: 2%;">序号</td>
+                                    <td style="width: 6%;">检验编号</td>
+                                    <td style="width: 4%;">检验阶段</td>
+                                    <td style="width: 8%;">任务时间</td>
                                     <td style="width: 8%;">物料来源</td>
-                                    <td style="width: 8%;">物料名称</td>
-                                    <td style="width: 8%;">检验人</td>
-                                    <td style="width: 8%;">检验状态</td>
+                                    <td style="width: 10%;">物料名称</td>
+                                    <td style="width: 4%;">检验人</td>
+                                    <td style="width: 8%;">检验时间</td>
+                                    <td style="width: 4%;">检验状态</td>
                                 </tr>
                             </thead>
                         </table>
@@ -94,14 +97,15 @@
                                 <tbody>
                                     <tr :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px" :key="index"
                                         v-for="(n, index) in Inspectiondetails1">
-                                        <td style="width: 8%;">{{ index + 1 }}</td>
-                                        <td style="width: 8%;">{{ n.checkNo }}</td>
-                                        <td style="width: 8%;">{{ n.checkName }}</td>
+                                        <td style="width: 2%;">{{ index + 1 }}</td>
+                                        <td style="width: 6%;">{{ n.checkNo }}</td>
+                                        <td style="width: 4%;">{{ n.checkName }}</td>
                                         <td style="width: 8%;">{{ n.incomeTime }}</td>
                                         <td style="width: 8%;">{{ n.supplierName }}</td>
-                                        <td style="width: 8%;">{{ n.materialName }}</td>
-                                        <td style="width: 8%;">{{ n.checkManName }}</td>
-                                        <td style="width: 8%;" :class="[n.checkStatus == 1 ? 'color1' : 'color2']">{{
+                                        <td style="width: 10%;">{{ n.materialName }}</td>
+                                        <td style="width: 4%;">{{ n.checkManName }}</td>
+                                        <td style="width: 8%;">{{ n.checkTime }}</td>
+                                        <td style="width: 4%;" :class="[n.checkStatus == 1 ? 'color1' : 'color2']">{{
                                             n.checkStatus }}</td>
                                     </tr>
                                 </tbody>
@@ -218,7 +222,7 @@ export default {
                 if (response) {
                     console.log(response)
                     this.dictDatatype = response
-                    _this.selectxtclasses = _this.dictDatatype[0].ymdType;
+                    _this.selectxtclasses = this.dictDatatype[2].ymdType;
                     _this.getSupplierTaskList(_this.selectxt)
                     _this.getDeviceRefreshTime()
                 }
@@ -240,7 +244,7 @@ export default {
             const _this = this;
             this.Inspectiondetails = []
             getSupplierTaskList({
-                ymdType: moment().format(_this.selectxtclasses),
+                ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses),
                 typeCode: 'material',
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
@@ -252,7 +256,7 @@ export default {
                 }
             });
             getSupplierTaskList({
-                ymdType: moment().format(_this.selectxtclasses),
+                ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses),
                 typeCode: 'produce',
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index 8c350f0b..ab3559dd 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -22,19 +22,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-			<el-form-item label="工作中心">
-				 <el-select v-model="queryParams.workCenter" filterable placeholder="请选择工作中心" clearable>
-					<el-option
-					v-for="item in options"
-					:key="item.factoryCode"
-					:label="item.factoryName"
-					:value="item.factoryCode"
-          @keyup.enter.native="handleQuery"
-          >
-					</el-option>
-				</el-select>
-			</el-form-item>
-
+		<el-form-item label="工作中心">
+			<el-select v-model="queryParams.workCenter" filterable placeholder="请选择工作中心" clearable>
+				<el-option
+				v-for="item in options"
+				:key="item.factoryCode"
+				:label="item.factoryName"
+				:value="item.factoryCode"
+				@keyup.enter.native="handleQuery"
+				>
+				</el-option>
+			</el-select>
+		</el-form-item>
+		<el-form-item label="物料号" prop="productCode">
+				<el-input
+				v-model="queryParams.productCode"
+				placeholder="请输入物料号"
+				clearable
+				@keyup.enter.native="handleQuery"
+				/>
+		</el-form-item>
 
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 50611e87..3efd4b11 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -254,10 +254,10 @@
             <el-table-column prop="materialName" label="物料描述" width="320"></el-table-column>
             <el-table-column prop="unit" width="50" label="单位"></el-table-column>
             <el-table-column v-if="showWorkorderCode" prop="workorderCode" width="100" label="生产订单" :formatter="orderCodeFormate"></el-table-column>
-            <el-table-column prop="quantity" label="请领数量"></el-table-column>
+            <el-table-column prop="quantity" label="请领数量  width="100""></el-table-column>
 <!--            <el-table-column prop="fundQuanlity" label="欠领数量"></el-table-column>-->
-            <el-table-column prop="routeCode" width="80" label="实发数量"></el-table-column>
-            <el-table-column prop="routeCode" width="90" label="实发数量2"></el-table-column>
+            <el-table-column prop="routeCode" width="100" label="实发数量"></el-table-column>
+            <el-table-column prop="routeCode" width="100" label="实发数量2"></el-table-column>
 <!--		      	<el-table-column prop="recoil" label="反冲物料"></el-table-column>-->
           </el-table>
           <br/>
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index e6590f32..8753497d 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -349,12 +349,9 @@
 						@select-all="allReportSelection" :summary-method="getSummaries" show-summary>
 						<el-table-column width="60" align="center" type="selection" />
 						<el-table-column label="id" align="center" prop="id" v-if="false" />
-						<el-table-column label="工单编码" width="130" align="left" prop="workorderCode"
-							:show-overflow-tooltip="true" />
+
 						<el-table-column label="订单编码" width="105" align="left" prop="workorderCodeSap"
 							:show-overflow-tooltip="true" :formatter="orderCodeFormate" />
-						<el-table-column label="报工单号" width="115" align="left" prop="reportCode"
-							:show-overflow-tooltip="true" />
 						<el-table-column label="批次" width="250" align="left" prop="batch">
 						  <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.batch"
@@ -380,7 +377,7 @@
                   ></el-input>
 							</template>
 						</el-table-column>
-						<el-table-column label="用人数" align="center" prop="useMan">
+						<el-table-column label="用人数" align="center" prop="useMan" width="100">
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.useMan"
 									@change="handleEdit(scope.$index, scope.row)"
@@ -388,7 +385,10 @@
                   ></el-input>
 							</template>
 						</el-table-column>
-            <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
+            <el-table-column label="工单编码" width="80" align="left" prop="workorderCode"
+							:show-overflow-tooltip="true"/>
+						<el-table-column label="报工单号" width="80" align="left" prop="reportCode" 
+							:show-overflow-tooltip="true" />
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
             <!---->
             <el-table-column fixed="right" label="操作" width="160">
@@ -421,25 +421,25 @@
 		</el-dialog>
 		<!-- 报工损耗 -->
 		<el-dialog :title="titleConsume" :visible.sync="openConsume" width="1200px">
+      <div class="div1"><el-link type="success">实际报工母订单数量：{{actProduct}}</el-link></div>
 			<el-tabs v-model="activeNameC">
 				<el-tab-pane v-for="(item, index) in libConsumeTabs" :key="index" :label="item.title"
 					:name="item.libId">
-
+          
 					<el-table v-loading="loading" highlight-current-row :ref="tableIndex + index" :data="item.libList"
 						@select="pConsumeSelection" @select-all="allConsumeSelection">
 						<el-table-column width="50" align="center" type="selection" />
 						<el-table-column label="recordId" align="center" prop="recordId" v-if="false" />
 						<el-table-column label="parentOrder" align="center" prop="parentOrder" v-if="false" />
-						<el-table-column label="工单编码" width="140" align="left" prop="workorderCode"
-							:show-overflow-tooltip="true" />
-						<el-table-column label="订单编码" width="130" align="left" prop="workorderCodeSap"
+						
+						<el-table-column label="订单编码" width="100" align="left" prop="workorderCodeSap"
 							:show-overflow-tooltip="true" :formatter="orderCodeFormate" />
-						<el-table-column label="物料编码" width="130" align="left" prop="materialCode"
+						<el-table-column label="物料编码" width="110" align="left" prop="materialCode"
 							:show-overflow-tooltip="true" :formatter="productCodeFormate" />
 						<el-table-column label="物料名称" width="280" align="left" prop="materialName"
 							:show-overflow-tooltip="true" />
-						<el-table-column label="BOM组件用量" width="150" align="left" prop="planQuantity" />
-            <el-table-column label="单位数量" align="center" prop="erfmg" />
+						<el-table-column label="BOM组件用量" width="110" align="left" prop="planQuantity" />
+            <el-table-column label="单位数量" align="center" prop="erfmg" :show-overflow-tooltip="true"/>
             <el-table-column label="条目单位" align="center" prop="erfme" />
 						<el-table-column label="实际用量" width="150" align="left" prop="quantity"
 							:show-overflow-tooltip="true">
@@ -461,8 +461,10 @@
 								</el-select>
 							</template>
 						</el-table-column>
-            <el-table-column label="报工单编号" align="center" prop="reportCode" width="120" />
-						<el-table-column label="创建时间" align="center" prop="createTime" width="150" />
+            <el-table-column label="报工单编号" align="center" prop="reportCode" width="90" :show-overflow-tooltip="true"/>
+						<el-table-column label="创建时间" align="center" prop="createTime" width="130" :show-overflow-tooltip="true"/>
+            <el-table-column label="工单编码" width="80" align="left" prop="workorderCode"
+							:show-overflow-tooltip="true" />
 						<el-table-column fixed="right" label="操作" width="90">
 							<template slot-scope="scope">
 								<el-button @click.native.prevent="deleteBomRow(scope.$index, item.libList)" size="small"
@@ -499,6 +501,7 @@
 				</el-tab-pane>
 				-->
 			</el-tabs>
+      
 			<div slot="footer" class="dialog-footer">
 
 				<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
@@ -697,6 +700,7 @@ export default {
   },
   data() {
     return {
+      actProduct:0,
       optType: undefined,
       // 遮罩层
       loading: true,
@@ -1029,6 +1033,7 @@ export default {
         updateBy: null,
         endReport: "0"
       };
+      this.actProduct = 0;
       this.queryParams.workorderCode = "";
       this.queryParams.machineCode = "";
       this.resetForm("form");
@@ -1362,6 +1367,7 @@ export default {
       //查询母工单报工记录列表
       getAllLevelConsumeList(this.queryParams).then((response) => {
         this.libConsumeTabs = response;
+        this.actProduct = this.libConsumeTabs[0].libList[0].quantityFeedback;
         this.openConsume = true;
         this.titleConsume = "工单报工物料损耗详情";
         this.queryParams.workorderCode = "";
@@ -1788,4 +1794,9 @@ export default {
 .my-print-foot {
   font-size: 19px;
 }
+.div1{
+  margin-top: -35px;
+  margin-right: 70px;
+  text-align: right;
+}
 </style>
diff --git a/src/views/quality/qcProjectType/index.vue b/src/views/quality/qcProjectType/index.vue
index 652428dd..54d32aae 100644
--- a/src/views/quality/qcProjectType/index.vue
+++ b/src/views/quality/qcProjectType/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="6" :xs="24">
+      <el-col :span="8" :xs="24">
         <ProjectTypeTree ref="ProjectTypeTree" @onNodeClick="onNodeClick" ></ProjectTypeTree>
       </el-col>
-      <el-col :span="18" :xs="24">
+      <el-col :span="16" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
           <el-form-item label="检验规则名称" prop="ruleName">
             <el-input
diff --git a/src/views/quality/qcProjectType/projectTypeTree.vue b/src/views/quality/qcProjectType/projectTypeTree.vue
index 59d76130..54fe0e8e 100644
--- a/src/views/quality/qcProjectType/projectTypeTree.vue
+++ b/src/views/quality/qcProjectType/projectTypeTree.vue
@@ -27,7 +27,7 @@
           class="tree-style"
         >
         <span class="custom-tree-node" slot-scope="{ node, data }">
-          <span style="width:220px; display:block; word-break:keep-all; white-space:nowrap; overflow:hidden; text-overflow:ellipsis"
+          <span style="width:300px; display:block; word-break:keep-all; white-space:nowrap; overflow:hidden; text-overflow:ellipsis"
             :title="node.label + '(' + data.id + ')'"
           >{{node.label}}</span>
           <span>