From abbdf130577513b5ea4c03ad1bc3026d35ff85d0 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 13 Aug 2024 12:13:03 +0800
Subject: [PATCH 01/19] =?UTF-8?q?2024-08-13=20=E8=AE=BE=E5=A4=87-=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/repairOrder.js          |   4 +-
 src/views/device/faultReport/index.vue | 174 ++++++++++++++++++-------
 src/views/device/repairOrder/index.vue |  85 +++++++++---
 3 files changed, 192 insertions(+), 71 deletions(-)

diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js
index 71f2c80..fdabd15 100644
--- a/src/api/device/repairOrder.js
+++ b/src/api/device/repairOrder.js
@@ -80,9 +80,9 @@ export function queryEquFaultTypeTree(query) {
 }
 
 // 维修工单检验
-export function subInspect(data) {
+export function checkRepairWorkOrder(data) {
 	return request({
-	  url: '/device/repairOrder/subInspect',
+	  url: '/device/repairOrder/checkRepairWorkOrder',
 	  method: 'post',
 	  data: data
 	});
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 2479eeb..3daf01b 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="88px"
+      label-width="100px"
     >
       <el-form-item label="报修单号" prop="orderCode">
         <el-input
@@ -17,6 +17,48 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="审核状态" prop="orderStatus">
+        <el-select
+          v-model="queryParams.orderStatus"
+          style="width: 200px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报修来源" prop="orderSource">
+        <el-select
+          v-model="queryParams.orderSource"
+          style="width: 200px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_order_source"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报修去向" prop="repairDestination">
+        <el-select
+          v-model="queryParams.repairDestination"
+          style="width: 200px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_repair_destination"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="设备编码" prop="equipmentCode">
         <el-input
           v-model="queryParams.equipmentCode"
@@ -29,6 +71,7 @@
       <el-form-item label="故障时间" prop="orderBreakdownTime">
         <el-date-picker
           v-model="queryParams.orderBreakdownTimeArray"
+          style="width: 510px"
           type="daterange"
           align="right"
           unlink-panels
@@ -40,24 +83,20 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="报修来源" prop="orderSource">
-        <el-select
-          v-model="queryParams.orderSource"
-          style="width: 150px"
+
+      <el-form-item label="报修人工号" prop="orderRepairmanCode">
+        <el-input
+          v-model="queryParams.orderRepairmanCode"
+          placeholder="请输入报修人工号"
+          style="width: 200px"
           clearable
-        >
-          <el-option
-            v-for="dict in dict.type.device_order_source"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
-        </el-select>
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="报修人编号" prop="orderRepairmanCode">
+      <el-form-item label="报修人名称" prop="orderRepairmanName">
         <el-input
-          v-model="queryParams.orderRepairmanCode"
-          placeholder="请输入报修人编号"
+          v-model="queryParams.orderRepairmanName"
+          placeholder="请输入报修人名称"
           style="width: 200px"
           clearable
           @keyup.enter.native="handleQuery"
@@ -184,7 +223,8 @@
         label="报修单号"
         align="center"
         prop="orderCode"
-        width="200"
+        width="220"
+        :show-overflow-tooltip="true"
         fixed
       >
         <template slot-scope="scope">
@@ -196,11 +236,19 @@
           >
         </template>
       </el-table-column>
+
       <el-table-column
-        label="处理状态"
+        label="审核状态"
         align="center"
-        prop="orderStatus" />
-        <el-table-column
+        prop="orderStatus">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_audit_status"
+            :value="scope.row.orderStatus"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
         label="报修来源"
         align="center"
         prop="orderSource" />
@@ -214,7 +262,8 @@
         label="设备编码"
         align="center"
         prop="equipmentCode"
-        width="100"
+        :show-overflow-tooltip="true"
+        width="120"
       />
       <el-table-column
         label="故障描述"
@@ -330,7 +379,7 @@
       append-to-body
       v-if="openCheck"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-tabs type="border-card">
           <el-tab-pane label="基本信息">
             <el-descriptions
@@ -443,16 +492,15 @@
               <el-col :span="24">
                 <el-form-item label="报修去向" prop="repairDestination">
                   <el-radio-group v-model="form.repairDestination">
-                    <el-radio label="计划性维修">计划性维修</el-radio>
+                    <el-radio label="计划性维修" @click.native="timeBackFillingReset">计划性维修</el-radio>
+                    <el-radio label="立即维修" @click.native="timeBackFilling">立即维修</el-radio>
                     <el-radio label="不维修">不维修</el-radio>
                     <el-radio label="委外维修">委外维修</el-radio>
-                    <el-radio label="立即维修" @click.native="timeBackFilling"
-                      >立即维修</el-radio
-                    >
                   </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
+            
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
                 <el-form-item prop="workTeam" label="维修组">
@@ -486,12 +534,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
                 <el-form-item label="是否停机维修" prop="workDownMachine">
                   <el-radio-group v-model="form.workDownMachine">
                     <el-radio label="1">是</el-radio>
-                    <el-radio label="0">否</el-radio>
+                    <el-radio label="0" @click.native="monitorRadio">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -569,17 +618,11 @@
                 <el-form-item label="是否停机维修" prop="workDownMachine">
                   <el-radio-group v-model="form.workDownMachine">
                     <el-radio label="1">是</el-radio>
-                    <el-radio label="0">否</el-radio>
+                    <el-radio label="0" @click.native="monitorRadio">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col
-                :span="8"
-                v-if="
-                  form.repairDestination == '立即维修' &&
-                  form.workDownMachine == '1'
-                "
-              >
+              <el-col :span="8" v-if=" form.repairDestination == '立即维修' && form.workDownMachine == '1'">
                 <el-form-item prop="workPlanDownTime" label="计划停机时间">
                   <el-date-picker
                     clearable
@@ -591,13 +634,7 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col
-                :span="8"
-                v-if="
-                  form.repairDestination == '立即维修' &&
-                  form.workDownMachine == '0'
-                "
-              >
+              <el-col :span="8" v-if="form.repairDestination == '立即维修' && form.workDownMachine == '0'">
                 <el-form-item prop="workPlanDownTime" label="计划停机时间">
                   <el-date-picker
                     clearable
@@ -609,6 +646,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '委外维修'">
                 <el-form-item prop="workOutsourcingUnit" label="委外单位">
@@ -634,8 +672,6 @@
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="24" v-if="form.repairDestination == '委外维修'">
                 <el-form-item prop="outSourceReason" label="委外原因">
                   <el-input
@@ -647,6 +683,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <el-row>
+              <el-col :span="8" v-if="form.repairDestination == '不维修'">
+                <el-form-item prop="auditOpinion" label="审核意见">
+                  <el-input
+                    v-model="form.auditOpinion"
+                    placeholder="请填写审核意见"
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 4}"
+                    style="width: 420px"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-tab-pane>
         </el-tabs>
       </el-form>
@@ -1174,7 +1224,7 @@ import { listFaultDescription } from "@/api/device/faultDescription";
 export default {
   name: "FaultReport",
   components: { ItemSelect, ItemSelectPerson },
-  dicts: ["device_order_source", "device_reach_standard"],
+  dicts: ["device_order_source", "device_reach_standard", "device_audit_status", "device_repair_destination", "device_audit_status"],
   data() {
     return {
       CS: {
@@ -1337,6 +1387,16 @@ export default {
         orderRepairmanCode: [
           { required: true, message: "报修人工号不能为空", trigger: "blur" },
         ],
+        //审核中 需要限制的字段   计划停机时间？？？？
+        workPlanTime: [
+          { required: true, message: "计划维修时间", trigger: "blur" },
+        ],
+        // workPlanDownTime: [
+        //   { required: true, message: "计划停机时间", trigger: "blur" },
+        // ],
+        workDownMachine: [
+          { required: true, message: "是否停机维修", trigger: "blur" },
+        ],
       },
     };
   },
@@ -1349,6 +1409,14 @@ export default {
     indexMethod(index) {
       return index + 1;
     },
+
+    //监控radio
+    monitorRadio(){
+      if(this.form.workDownMachine == '0'){
+        this.form.workPlanDownTime = null;
+      }
+    },
+
     timeBackFilling() {
       var getTime = new Date().getTime(); //获取到当前时间戳
       var time = new Date(getTime); //创建一个日期对象
@@ -1373,8 +1441,18 @@ export default {
           second
         );
       }
-      this.form.workPlanTime = nowDate(time);
+      this.form.workPlanTime = nowDate(time);      //当选择为立即维修时候，都是默认值
+      this.form.workPlanDownTime = nowDate(time);
+      this.form.workDownMachine = '1';
     },
+
+    //计划维修 时间回填重置
+    timeBackFillingReset() {
+      this.form.workPlanTime = null;      //当选择为立即维修时候，都是默认值
+      this.form.workPlanDownTime = null;
+      this.form.workDownMachine = null;
+    },
+
     /** 查询维修措施列表 */
     getOrderDesc() {
       this.loading = true;
@@ -1655,8 +1733,8 @@ export default {
         }
 
         if (
-          response.data.orderStatus == "审核通过" ||
-          response.data.orderStatus == "驳回"
+          response.data.orderStatus == "1" ||
+          response.data.orderStatus == "2"
         ) {
           Message.warning("该报修记录已审核！");
           this.form = response.data;
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 3182bce..3c21300 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -17,6 +17,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="审核状态" prop="resultInspect">
+        <el-select
+          v-model="queryParams.resultInspect"
+          style="width: 200px"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_audit_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="报修单号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
@@ -35,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否停机维修" prop="workDownMachine">
+      <!-- <el-form-item label="是否停机维修" prop="workDownMachine">
         <el-select
           v-model="queryParams.workDownMachine"
           placeholder="请选择是否停机"
@@ -51,7 +65,7 @@
             :value="item.workDownMachine"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="维修人员姓名" prop="workPersonName">
         <el-input
           v-model="queryParams.workPersonName"
@@ -232,7 +246,7 @@
           size="mini"
           @click="clickInspect"
           v-hasPermi="['device:repairOrder:inspect']"
-          >结果检验
+          >维修结果审核
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -289,13 +303,15 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="检验结果"
+        label="审核状态"
         align="center"
         prop="resultInspect"
-        width="100"
-      >
-      <template slot-scope="scope">
-          {{ scope.row.resultInspect == '1' ? "通过" :scope.row.resultInspect == '0' ? "不通过" :"待检验" }}
+        width="100">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_audit_status"
+            :value="scope.row.resultInspect"
+          />
         </template>
       </el-table-column>
       <el-table-column
@@ -1248,7 +1264,20 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="故障图片" prop="afterRepairFile" label-width="120px">
+                <el-form-item prop="remark" label="备注" label-width="120px">
+                  <el-input
+                    v-model="form.remark"
+                    placeholder="请填写备注"
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 4}"
+                    style="width: 725px"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="维修后图片" prop="afterRepairFile" label-width="120px">
                   <FileUpload v-model="form.afterRepairFile" />
                 </el-form-item>
               </el-col>
@@ -1273,14 +1302,22 @@
       </div>
     </el-dialog>
 
-    <!-- 结果检验 -->
-    <el-dialog title="维修结果检验" :visible.sync="inspectDialog" width="30%">
-      <el-radio v-model="inspect" label="2">待检验</el-radio>
-      <el-radio v-model="inspect" label="0">未通过</el-radio>
-      <el-radio v-model="inspect" label="1">通过</el-radio>
+    <!-- 维修结果审核 -->
+    <el-dialog title="维修结果审核" :visible.sync="inspectDialog" width="30%">
+      <el-radio v-model="inspect" label="2">待审核</el-radio>
+      <el-radio v-model="inspect" label="1">审核通过</el-radio>
+      <el-radio v-model="inspect" label="0">驳回</el-radio>
+      <row></row>
+      <el-input
+        v-model="auditOpinion"
+        placeholder="请填写审核意见"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        style="width: 350px"
+      />   
       <span slot="footer" class="dialog-footer">
         <el-button @click="inspectDialog = false">取 消</el-button>
-        <el-button type="primary" @click="subInspect">确 定</el-button>
+        <el-button type="primary" @click="checkRepairWorkOrder">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -1693,7 +1730,7 @@ import {
   applyOutsource,
   writeRepairOrder,
   queryEquFaultTypeTree,
-  subInspect,
+  checkRepairWorkOrder,
 } from "@/api/device/repairOrder";
 import { listFaultReason } from "@/api/device/faultReason";
 import { listFaultMeasures } from "@/api/device/faultMeasures";
@@ -1704,11 +1741,10 @@ import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
 import ItemSelectSpareParts from "./selectSpareParts.vue";
 import moment from "moment";
-
 export default {
   name: " RepairOrder",
   components: { ItemSelect, ItemSelectPerson, ItemSelectSpareParts },
-  dicts: ["device_repair_status"],
+  dicts: ["device_repair_status","device_audit_status"],
   data() {
     return {
       //委外表格格式
@@ -1795,6 +1831,8 @@ export default {
       inspectDialog: false,
       // 检验结果
       inspect: null,
+      // 审核意见
+      auditOpinion: null,
       // 多个维修单号
       orderCodes: [],
       // 查询参数
@@ -1827,6 +1865,7 @@ export default {
         //计划维修时间组、计划停机时间组
         workPlanTimeArray: [],
         workPlanDownTimeArray: [],
+        resultInspect: null,
       },
       auxiliaryQueryParams: {
         pageNum: 1,
@@ -2140,6 +2179,7 @@ export default {
         updateBy: null,
         delFlag: null,
         factoryCode: null,
+        auditOpinion: null,
       };
       this.resetForm("form");
     },
@@ -2395,7 +2435,9 @@ export default {
 
               writeRepairOrder(this.form).then((response) => {
                 this.openWrite = false;
-                this.$modal.msgSuccess("填写维修记录成功！");
+                if(response.code == 200){
+                  this.$modal.msgSuccess(response.msg);
+                }
                 this.queryParams.workStatus = null;
                 this.getList();
               });
@@ -2419,14 +2461,15 @@ export default {
     },
 
     // 提交检验信息
-    subInspect() {
+    checkRepairWorkOrder() {
       const data = {
         ids: this.ids,
         inspect: this.inspect,
         orderCodes: this.orderCodes,
+        auditOpinion: this.auditOpinion,
       };
 
-      subInspect(data).then((response) => {
+      checkRepairWorkOrder(data).then((response) => {
         this.getList();
         this.inspectDialog = false;
         this.$message({

From 373471a83654bc328c6b1ba122a594f9ec9eb0a9 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 13 Aug 2024 13:20:42 +0800
Subject: [PATCH 02/19] =?UTF-8?q?2024-08-13=20=E8=AE=BE=E5=A4=87-=E4=BF=9D?=
 =?UTF-8?q?=E4=BF=AE=E5=AE=A1=E6=A0=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/faultReport/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 3daf01b..f32e59a 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -1734,7 +1734,7 @@ export default {
 
         if (
           response.data.orderStatus == "1" ||
-          response.data.orderStatus == "2"
+          response.data.orderStatus == "0"
         ) {
           Message.warning("该报修记录已审核！");
           this.form = response.data;

From 90803780a5a6c1526b43cd8be6eb8d2c5b4dff9e Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 13 Aug 2024 14:52:03 +0800
Subject: [PATCH 03/19] =?UTF-8?q?2024-08-13=20=E8=AE=BE=E5=A4=87-=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=AE-=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 3c21300..11db790 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -286,7 +286,7 @@
         label="维修单号"
         align="center"
         prop="workCode"
-        width="220"
+        width="250"
         fixed
       />
       <el-table-column
@@ -314,6 +314,12 @@
           />
         </template>
       </el-table-column>
+      <!-- <el-table-column
+        label="审核意见"
+        align="center"
+        prop="auditOpinion"
+        width="100"
+      /> -->
       <el-table-column
         label="报修单号"
         align="center"
@@ -368,8 +374,8 @@
           <span>{{ parseTime(scope.row.workPlanDownTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="维修人员工号" align="center" prop="workPerson" width="100"/>
-      <el-table-column label="维修人员姓名" align="center" prop="workPersonName" width="100"/>
+      <el-table-column label="维修人员工号" align="center" prop="workPerson" width="120"/>
+      <el-table-column label="维修人员姓名" align="center" prop="workPersonName" width="150"/>
       <el-table-column
         label="维修组编码"
         align="center"
@@ -2455,6 +2461,7 @@ export default {
         });
         return;
       }
+      // 如果审核通过 那么就只是展示？
       //需要加一个结果检验
       this.inspectDialog = true;
       this.inspect = "1";

From e1203b738cbacf1c0d079da2db8417340ee92d1a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 13 Aug 2024 16:10:06 +0800
Subject: [PATCH 04/19] 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 53f9ee2..5173f5c 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 1c89947..9417b16 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 8c350f0..ab3559d 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 50611e8..3efd4b1 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 e6590f3..8753497 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 652428d..54d32aa 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 59d7613..54fe0e8 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>

From db92fd0c41b4d004ab6eb24c8d06ebd6d8c4611f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 14 Aug 2024 17:46:22 +0800
Subject: [PATCH 05/19] =?UTF-8?q?2024-08-14=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96+=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/outsourceWorkOrder/index.vue |  5 ++--
 src/views/device/repairOrder/index.vue        |  4 +--
 src/views/device/upkeepOrder/index.vue        | 29 +++++++++++++------
 src/views/device/upkeepPlan/index.vue         | 20 ++++++-------
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index 83c90e1..2962c92 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -191,12 +191,13 @@
           {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
         </template>
       </el-table-column>
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
-      <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName" width="150"/>
       <el-table-column
         label="设备类型"
         align="center"
         prop="equipmentTypeName"
+        width="150"
       />
       <el-table-column
         label="委外维修人员"
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 11db790..50a3835 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -245,7 +245,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="clickInspect"
-          v-hasPermi="['device:repairOrder:inspect']"
+          v-hasPermi="['device:repairOrder:check']"
           >维修结果审核
         </el-button>
       </el-col>
@@ -324,7 +324,7 @@
         label="报修单号"
         align="center"
         prop="orderCode"
-        width="200"
+        width="230"
       />
       <el-table-column
         label="设备名称"
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 02eced7..d26c313 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -394,10 +394,21 @@
           icon="el-icon-edit"
           size="mini"
           @click="clickInspect"
-          v-hasPermi="['device:upkeepOrder:edit']"
+          v-hasPermi="['device:upkeepOrder:check']"
           >结果检验
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleUpdate"
+          v-hasPermi="['device:upkeepOrder:edit']"
+          >填写记录
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -453,6 +464,14 @@
           }}</el-button>
         </template>
       </el-table-column>
+      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_upkeep_type"
+            :value="scope.row.upkeep"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <dict-tag
@@ -581,14 +600,6 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.device_upkeep_type"
-            :value="scope.row.upkeep"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="工单费用" align="center" prop="orderCost" />
       <el-table-column label="保养人工号" align="center" prop="planPerson" width="100"/>
       <el-table-column label="保养人姓名" align="center" prop="planPersonName" width="100"/>
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index dc9b40f..1f13e43 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -305,7 +305,12 @@
       <el-table-column width="60" align="center" label="序号" type="index" fixed></el-table-column>
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
-      <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column label="保养类型" align="center" prop="upkeep">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+        </template>
+      </el-table-column>
       <el-table-column width="150" label="生成规则" align="center" prop="calculationRule">
       <template slot-scope="scope">
           {{ scope.row.calculationRule == "0" ? "按照固定周期" : scope.row.one == "1" ? "按照上次保养时间" : "单次" }}
@@ -340,15 +345,10 @@
       </el-table-column>
       <el-table-column v-if="false" label="是否可生产-限制" align="center" prop="planRestrict"/>
       <el-table-column v-if="false" label="维护类型" align="center" prop="planType"/>
-      <el-table-column label="保养类型" align="center" prop="upkeep">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="委外人员" align="center" prop="workPerson"/>
-      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit"/>
-      <el-table-column label="联系方式" align="center" prop="workConnection"/>
-      <el-table-column label="原因" align="center" prop="workReason"/>
+      <el-table-column label="委外人员" align="center" prop="workPerson" width="100"/>
+      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit" width="150"/>
+      <el-table-column label="联系方式" align="center" prop="workConnection" width="150"/>
+      <el-table-column label="原因" align="center" prop="workReason" width="150"/>
       <el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode"/>
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
       <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>

From b385755e0346c894049130b55178a4a853ca8c9c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 15 Aug 2024 09:49:17 +0800
Subject: [PATCH 06/19] zxl

---
 src/api/quality/qcTable.js                    |  10 +-
 src/views/kanban/quality/kanban1.vue          |  14 +-
 .../quality/qcTableCheckDevelop/index.vue     | 358 ++++++++++++++++++
 src/views/quality/qcTableCheckHz/index.vue    | 291 ++++++++++++++
 src/views/quality/qcTableCheckOrder/index.vue | 358 ++++++++++++++++++
 5 files changed, 1023 insertions(+), 8 deletions(-)
 create mode 100644 src/views/quality/qcTableCheckDevelop/index.vue
 create mode 100644 src/views/quality/qcTableCheckHz/index.vue
 create mode 100644 src/views/quality/qcTableCheckOrder/index.vue

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index da998cb..a4bdc78 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -100,4 +100,12 @@ export function getDLTableCPKInfo(query) {
 		method: 'get',
 		params: query
 	});
-}
\ No newline at end of file
+}
+
+export function getTableHzTitle(query) {
+	return request({
+		url: '/quality/staticTable/getTableHzTitle',
+		method: 'get',
+		params: query
+	});
+}
diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index 5173f5c..e989444 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -50,7 +50,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    今日生产数量
+                                    今日产量(PC)
                                 </div>
                             </div>
                             <div class="box">
@@ -60,7 +60,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    今日已抽检数量
+                                    今日抽检数量(PC)
                                 </div>
                             </div>
                             <div class="box">
@@ -70,7 +70,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    今日不良数量
+                                    今日不良数(PC)
                                 </div>
                             </div>
                         </div>
@@ -82,7 +82,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    本月生产数量
+                                    本月产量(PC)
                                 </div>
                             </div>
                             <div class="box">
@@ -92,7 +92,7 @@
                                     </span>
                                 </div>
                                 <div class="name2">
-                                    本月不良数量
+                                    本月不良数(PC)
                                 </div>
                             </div>
                         </div>
@@ -298,7 +298,7 @@ export default {
         getdatalist() {
             const _this = this;
             getProduceStaticInfo({
-                ymdType: moment().format(_this.selectxtclasses),
+                ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses),
                 typeCode: 'produce',
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
@@ -318,7 +318,7 @@ export default {
             });
             getCheckProjectsPie({
                 typeCode: 'produce',
-                ymdType: moment().format(_this.selectxtclasses),
+                ymdType: _this.selectxtclasses,//moment().format(_this.selectxtclasses),
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
                 if (response) {
diff --git a/src/views/quality/qcTableCheckDevelop/index.vue b/src/views/quality/qcTableCheckDevelop/index.vue
new file mode 100644
index 0000000..8e2cb80
--- /dev/null
+++ b/src/views/quality/qcTableCheckDevelop/index.vue
@@ -0,0 +1,358 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom: -34px;">
+			<el-form-item label="来料月份" prop="incomeTimeYM">
+				<el-date-picker
+				v-model="queryParams.incomeTimeYM"
+				format="yyyy-MM"
+				type="month"
+				placeholder="选择月">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="供应商" prop="supplierCodeArray">
+				<div class="tagbox">
+					<div class="tag" style="" placeholder="请选择供应商">
+						<el-tag
+						:key="index"
+						class="tagitem"
+						v-for="(tag, index) in selectMaterielListtag"
+						closable
+						:disable-transitions="false"
+						@close="handleClose(tag)"
+						>
+						{{ tag.supplierName }}
+						</el-tag>
+					</div>
+					<el-button
+						slot="append"
+						class="button1"
+						@click="handleSelectSupplier"
+						icon="el-icon-search"
+					></el-button>
+					<el-row style="display: none;">
+						<el-input type="input" clearable v-model="queryParams.supplierCode" placeholder="点击选择物料"/>
+						<el-input type="input"clearable v-model="queryParams.supplierName" placeholder="点击选择物料"/>
+					</el-row>
+				</div>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:rfidProcess:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+			<el-table-column label="供应商编号" align="center" prop="supplierCode" width="120" fixed/>
+			<el-table-column label="供应商名称" align="left" prop="supplierName" width="390" fixed/>
+			<el-table-column label="总批数" align="center" prop="batchs" width="90"/>
+			<el-table-column label="合格批次" align="center" prop="okBatchs" width="100"/>
+			<el-table-column label="不合格批次" align="center" prop="noOkBatchs" width="100"/>
+			<el-table-column label="批次不良率" align="center" prop="noOkBatchRate" width="100"/>
+			<el-table-column label="总数量" align="center" prop="nums" width="90"/>
+			<el-table-column label="合格数量" align="center" prop="okNums" width="100"/>
+			<el-table-column label="不合格数量" align="center" prop="noOkNums" width="100"/>
+			<el-table-column label="数量不良率" align="center" prop="noOkNumRate" width="100"/>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+	</div>
+</template>
+
+<script>
+import { getIncomeTableList} from "@/api/quality/qcTable";
+import moment from 'moment';
+export default {
+	name: "qcTableCheckDevelop",
+	components: {},
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 生产rfid流程表格数据
+			incomeList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			 // 新增-物料选中listtag
+            selectMaterielListtag:[],
+			// 查询参数
+			queryParams: {
+				incomeTimeYM:null,
+				incomeTimeArray: [],
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				shiftId: null,
+				productCode: null,
+				supplierName: '',
+				supplierCode: ''
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				workorderId: [
+					{ required: true, message: "工单ID不能为空", trigger: "blur" }
+				],
+				rfid: [
+					{ required: true, message: "rfid号不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	mounted(){
+		this.getDate();
+		this.getList();
+	},
+	created() {
+		
+	},
+	methods: {
+
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			this.queryParams.incomeTimeYM=start
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m;
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+            if(this.queryParams.incomeTimeYM!=null){
+				this.queryParams.yearMonth = moment(this.queryParams.incomeTimeYM).format('YYYY-MM');
+			}
+			getIncomeTableList(this.queryParams).then(response => {
+				this.incomeList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加生产rfid流程";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getRfidProcess(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改生产rfid流程";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
+				return delRfidProcess(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		},
+		/**供应商选择弹出框**/
+		handleSelectSupplier() {
+		  this.$refs.itemSelectSupplier.showFlag = true;
+		},
+		//供应商选择确认
+		onSelectSupplier(objs) {
+			var code = '';
+			var desc = '';
+			for (let i = 0; i < objs.length; i++) {
+				if(this.queryParams.supplierCode.indexOf(objs[i].supplierCode)<0){
+					code = code + objs[i].supplierCode + ',';
+					this.selectMaterielListtag.push(objs[i])
+				}else{
+					this.$message({
+						message: objs[i].supplierName+'已经选择',
+						type: 'warning'
+					})
+				}
+
+				if(this.queryParams.supplierName.indexOf(objs[i].supplierName)<0){
+				  desc = desc + objs[i].supplierName + ',';
+				}
+			}
+			this.queryParams.supplierCode += code;
+			this.queryParams.supplierName += desc;
+		},
+		// 新增—删除标签
+		handleClose(tag) {
+			this.selectMaterielListtag.splice(this.selectMaterielListtag.indexOf(tag.supplierName), 1);
+
+			var code = "";
+			var desc = "";
+			for (let i = 0; i < this.selectMaterielListtag.length; i++) {
+				code = code + this.selectMaterielListtag[i].supplierCode + ",";
+				desc = desc + this.selectMaterielListtag[i].supplierName + ",";
+			}
+			this.queryParams.supplierCode += code;
+			this.queryParams.supplierName += desc;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tagbox {
+  display: flex;
+  /* overflow: scroll; */
+  position: relative;
+  width: 80%;
+  padding-left: 26px;
+  margin-bottom: 15px;
+  .tagboxlabel{
+    width: 100px;
+    text-align: right;
+    vertical-align: middle;
+    font-size: 14px;
+    color: black;
+    line-height: 40px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-right: 12px;
+  }
+  .tag {
+    width: 720px;
+    border: 1px #DCDFE6 solid;
+    height: 60px;
+    padding: 5px 15px;
+    overflow-y: scroll;
+    .tagitem{
+      margin-left: 5px;
+    }
+  }
+  .button1{
+    width: 37px;
+    height: 37px;
+    position: absolute;
+        right: -39px;
+    top: 2px;
+
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/quality/qcTableCheckHz/index.vue b/src/views/quality/qcTableCheckHz/index.vue
new file mode 100644
index 0000000..a89738c
--- /dev/null
+++ b/src/views/quality/qcTableCheckHz/index.vue
@@ -0,0 +1,291 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+			<el-form-item label="检验类型" prop="typeCode">
+				<el-select v-model="queryParams.typeCode" clearable placeholder="请选择类型" @change="getCheckTypeList">
+					<el-option
+						v-for="dict in dict.type.check_type"
+						:key="dict.value"
+						:label="dict.label"
+						:value="dict.value"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="检验节点" prop="checkType">
+				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
+					<el-option
+						v-for="dict in checkTypeList"
+						:key="dict.checkType"
+						:label="dict.checkName"
+						:value="dict.checkType"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			
+			<el-form-item label="来料月份" prop="incomeTimeYM">
+				<el-date-picker
+				v-model="queryParams.incomeTimeYM"
+				format="yyyy-MM"
+				type="month"
+				placeholder="选择月">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['quality:project:export']"
+				>导出</el-button>
+				</el-col>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
+			<el-table-column label="日期" align="center" prop="ymdms" width="150" />
+            <template v-for="(column, index) in showTitles1">
+                <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="quantity" min-width="100" />
+			<template v-for="(column, index) in showTitles2">
+                <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="quantity" min-width="100" />
+			<el-table-column label="不良率" align="center" prop="quantity" min-width="100" />
+			<el-table-column label="抽检批数" align="center" prop="quantity" min-width="100" />
+			<el-table-column label="不合格批数" align="center" prop="quantity" min-width="100" />
+			<el-table-column label="不合格批次率" align="center" prop="quantity" min-width="100" />
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+	</div>
+</template>
+
+<script>
+import { getTableHzTitle,
+		getCheckTypeList,
+} from "@/api/quality/qcTable";
+import moment from 'moment';
+export default {
+	name: "qcTableCheckHz",
+	dicts: ["check_type"],
+	components: {},
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+		    tableList: [],
+			showTitles1: [],
+			showTitles2: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			checkTypeList: [],
+			// 查询参数
+			queryParams: {
+				incomeTimeYM:null,
+				incomeTimeArray: [],
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				shiftId: null,
+				productCode: null,
+				supplierName: '',
+				supplierCode: ''
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+
+			}
+		};
+	},
+	mounted(){
+		this.getDate();
+		this.getList();
+	},
+	created() {
+		
+	},
+	methods: {
+
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			this.queryParams.incomeTimeYM=start
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m;
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+            if(this.queryParams.incomeTimeYM!=null){
+				this.queryParams.yearMonth = moment(this.queryParams.incomeTimeYM).format('YYYY-MM');
+			}
+			//获取Table表头
+			getTableHzTitle(this.queryParams).then(response => {
+				this.showTitles1 = [];
+				for(let i=0;i<response.columns1.length;i++){
+					var pobj={};
+					pobj.id="colone"+i;
+					pobj.titleName = response[i];
+					this.showTitles1.push(pobj)
+				}
+
+				this.showTitles2 = [];
+				for(let i=0;i<response.columns2.length;i++){
+					var pobj={};
+					pobj.id="coltwo"+i;
+					pobj.titleName = response[i];
+					this.showTitles2.push(pobj)
+				}
+			});
+            //获取Table数据
+			getTableData(this.queryParams).then(response => {
+				this.hourProList = response;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+
+		getCheckTypeList(val) {
+			//获取检验节点
+			getCheckTypeList(val).then((response) => {
+				this.checkTypeList = response;
+			});
+		},
+
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		},
+
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tagbox {
+  display: flex;
+  /* overflow: scroll; */
+  position: relative;
+  width: 80%;
+  padding-left: 26px;
+  margin-bottom: 15px;
+  .tagboxlabel{
+    width: 100px;
+    text-align: right;
+    vertical-align: middle;
+    font-size: 14px;
+    color: black;
+    line-height: 40px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-right: 12px;
+  }
+  .tag {
+    width: 720px;
+    border: 1px #DCDFE6 solid;
+    height: 60px;
+    padding: 5px 15px;
+    overflow-y: scroll;
+    .tagitem{
+      margin-left: 5px;
+    }
+  }
+  .button1{
+    width: 37px;
+    height: 37px;
+    position: absolute;
+        right: -39px;
+    top: 2px;
+
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/quality/qcTableCheckOrder/index.vue b/src/views/quality/qcTableCheckOrder/index.vue
new file mode 100644
index 0000000..e2ec88d
--- /dev/null
+++ b/src/views/quality/qcTableCheckOrder/index.vue
@@ -0,0 +1,358 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom: -34px;">
+			<el-form-item label="来料月份" prop="incomeTimeYM">
+				<el-date-picker
+				v-model="queryParams.incomeTimeYM"
+				format="yyyy-MM"
+				type="month"
+				placeholder="选择月">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item label="供应商" prop="supplierCodeArray">
+				<div class="tagbox">
+					<div class="tag" style="" placeholder="请选择供应商">
+						<el-tag
+						:key="index"
+						class="tagitem"
+						v-for="(tag, index) in selectMaterielListtag"
+						closable
+						:disable-transitions="false"
+						@close="handleClose(tag)"
+						>
+						{{ tag.supplierName }}
+						</el-tag>
+					</div>
+					<el-button
+						slot="append"
+						class="button1"
+						@click="handleSelectSupplier"
+						icon="el-icon-search"
+					></el-button>
+					<el-row style="display: none;">
+						<el-input type="input" clearable v-model="queryParams.supplierCode" placeholder="点击选择物料"/>
+						<el-input type="input"clearable v-model="queryParams.supplierName" placeholder="点击选择物料"/>
+					</el-row>
+				</div>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['mes:rfidProcess:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+			<el-table-column label="供应商编号" align="center" prop="supplierCode" width="120" fixed/>
+			<el-table-column label="供应商名称" align="left" prop="supplierName" width="390" fixed/>
+			<el-table-column label="总批数" align="center" prop="batchs" width="90"/>
+			<el-table-column label="合格批次" align="center" prop="okBatchs" width="100"/>
+			<el-table-column label="不合格批次" align="center" prop="noOkBatchs" width="100"/>
+			<el-table-column label="批次不良率" align="center" prop="noOkBatchRate" width="100"/>
+			<el-table-column label="总数量" align="center" prop="nums" width="90"/>
+			<el-table-column label="合格数量" align="center" prop="okNums" width="100"/>
+			<el-table-column label="不合格数量" align="center" prop="noOkNums" width="100"/>
+			<el-table-column label="数量不良率" align="center" prop="noOkNumRate" width="100"/>
+		</el-table>
+
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+	</div>
+</template>
+
+<script>
+import { getIncomeTableList} from "@/api/quality/qcTable";
+import moment from 'moment';
+export default {
+	name: "qcTableCheckOrder",
+	components: {},
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 生产rfid流程表格数据
+			incomeList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			 // 新增-物料选中listtag
+            selectMaterielListtag:[],
+			// 查询参数
+			queryParams: {
+				incomeTimeYM:null,
+				incomeTimeArray: [],
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				shiftId: null,
+				productCode: null,
+				supplierName: '',
+				supplierCode: ''
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+				workorderId: [
+					{ required: true, message: "工单ID不能为空", trigger: "blur" }
+				],
+				rfid: [
+					{ required: true, message: "rfid号不能为空", trigger: "blur" }
+				],
+			}
+		};
+	},
+	mounted(){
+		this.getDate();
+		this.getList();
+	},
+	created() {
+		
+	},
+	methods: {
+
+        /**获取默认查询时间段**/
+		getDate() {
+			let start = this.Fungetdate (0)
+			this.queryParams.incomeTimeYM=start
+		},
+		Fungetdate (num) {
+			var dd = new Date();
+			dd.setDate(dd.getDate() + num);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m;
+		},
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+            if(this.queryParams.incomeTimeYM!=null){
+				this.queryParams.yearMonth = moment(this.queryParams.incomeTimeYM).format('YYYY-MM');
+			}
+			getIncomeTableList(this.queryParams).then(response => {
+				this.incomeList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				workorderId: null,
+				rfid: null,
+				factoryCode: null,
+				machineCode: null,
+				nowProcessId: null,
+				nextProcessId: null,
+				orderNum: null,
+				inTime: null,
+				outTime: null,
+				status: null,
+				remark: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+        shiftId: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加生产rfid流程";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			getRfidProcess(recordId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改生产rfid流程";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addRfidProcess(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
+				return delRfidProcess(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('mes/rfidProcess/export', {
+				...this.queryParams
+			}, `rfidProcess_${new Date().getTime()}.xlsx`)
+		},
+		/**供应商选择弹出框**/
+		handleSelectSupplier() {
+		  this.$refs.itemSelectSupplier.showFlag = true;
+		},
+		//供应商选择确认
+		onSelectSupplier(objs) {
+			var code = '';
+			var desc = '';
+			for (let i = 0; i < objs.length; i++) {
+				if(this.queryParams.supplierCode.indexOf(objs[i].supplierCode)<0){
+					code = code + objs[i].supplierCode + ',';
+					this.selectMaterielListtag.push(objs[i])
+				}else{
+					this.$message({
+						message: objs[i].supplierName+'已经选择',
+						type: 'warning'
+					})
+				}
+
+				if(this.queryParams.supplierName.indexOf(objs[i].supplierName)<0){
+				  desc = desc + objs[i].supplierName + ',';
+				}
+			}
+			this.queryParams.supplierCode += code;
+			this.queryParams.supplierName += desc;
+		},
+		// 新增—删除标签
+		handleClose(tag) {
+			this.selectMaterielListtag.splice(this.selectMaterielListtag.indexOf(tag.supplierName), 1);
+
+			var code = "";
+			var desc = "";
+			for (let i = 0; i < this.selectMaterielListtag.length; i++) {
+				code = code + this.selectMaterielListtag[i].supplierCode + ",";
+				desc = desc + this.selectMaterielListtag[i].supplierName + ",";
+			}
+			this.queryParams.supplierCode += code;
+			this.queryParams.supplierName += desc;
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.tagbox {
+  display: flex;
+  /* overflow: scroll; */
+  position: relative;
+  width: 80%;
+  padding-left: 26px;
+  margin-bottom: 15px;
+  .tagboxlabel{
+    width: 100px;
+    text-align: right;
+    vertical-align: middle;
+    font-size: 14px;
+    color: black;
+    line-height: 40px;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-right: 12px;
+  }
+  .tag {
+    width: 720px;
+    border: 1px #DCDFE6 solid;
+    height: 60px;
+    padding: 5px 15px;
+    overflow-y: scroll;
+    .tagitem{
+      margin-left: 5px;
+    }
+  }
+  .button1{
+    width: 37px;
+    height: 37px;
+    position: absolute;
+        right: -39px;
+    top: 2px;
+
+  }
+}
+</style>
\ No newline at end of file

From c7f81efe6157b4954c10721471a48f966395fdeb Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 15 Aug 2024 09:54:11 +0800
Subject: [PATCH 07/19] zxl2

---
 src/views/kanban/quality/kanban1.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index e989444..d70d125 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -310,6 +310,7 @@ export default {
             });
             getProduceNoOkList({
                 typeCode: 'produce',
+                ymdType: _this.selectxtclasses,
                 factoryCode: 'ds_' + _this.selectxt,
             }).then((response) => {
                 if (response) {

From 042ae8e73eeec20d2c42a90381e461e536e3c02f Mon Sep 17 00:00:00 2001
From: mengjiao <3338049200@qq,com>
Date: Thu, 15 Aug 2024 11:09:44 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/order/index.vue                     |  8 ++++----
 src/views/wms/outorderfc/index.vue                | 15 +++------------
 .../wms/wmsProductProductionRecords/index.vue     |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/order/index.vue b/src/views/wms/order/index.vue
index ad15f04..fb6bb3a 100644
--- a/src/views/wms/order/index.vue
+++ b/src/views/wms/order/index.vue
@@ -120,12 +120,12 @@
 			</el-table-column>
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="已入库数量" align="center" prop="realityNumber" v-if="false" />
+			<el-table-column label="已入库数量" align="center" prop="realityNumber" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.orderStatus === '0'">未进行</span>
-          <span v-else-if="scope.row.orderStatus === '1'">进行中</span>
-          <span v-else-if="scope.row.orderStatus === '2'">完成</span>
+          <span v-if="scope.row.orderStatus === '0'">未收货</span>
+          <span v-else-if="scope.row.orderStatus === '1'">收货中</span>
+          <span v-else-if="scope.row.orderStatus === '2'">收货完成</span>
         </template>
       </el-table-column>
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" />
diff --git a/src/views/wms/outorderfc/index.vue b/src/views/wms/outorderfc/index.vue
index 85b7140..ff0f5d9 100644
--- a/src/views/wms/outorderfc/index.vue
+++ b/src/views/wms/outorderfc/index.vue
@@ -59,7 +59,6 @@
 			<el-table-column label="单位" align="center" prop="unit" v-if="false" />
 			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
-			<!-- <el-table-column label="托盘号" align="center" prop="userDefined2" /> -->
       <el-table-column label="需求时间" align="center" prop="userDefined5" />
 			<el-table-column label="仓库编号" align="center" prop="locCode" />
 			<el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />
@@ -83,24 +82,16 @@
 				</template>
 			</el-table-column>
       <el-table-column label="过账凭证" align="center" prop="userDefined9" />
-<!--			<el-table-column label="sap过账信息" align="center" prop="userDefined11" />-->
+
       <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
-<!--      <el-table-column label="sap反冲过账信息" align="center" prop="sapXMag" />-->
+
 			<el-table-column label="操作人" align="center" prop="createBy" />
 			<el-table-column label="操作时间" align="center" prop="createDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
-			<!--
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:outorder:edit']">修改</el-button>
-					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-						v-hasPermi="['wms:outorder:remove']">删除</el-button>
-				</template>
-			</el-table-column> -->
+
 		</el-table>
 
 		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
diff --git a/src/views/wms/wmsProductProductionRecords/index.vue b/src/views/wms/wmsProductProductionRecords/index.vue
index 1d2d350..2a8a88a 100644
--- a/src/views/wms/wmsProductProductionRecords/index.vue
+++ b/src/views/wms/wmsProductProductionRecords/index.vue
@@ -111,7 +111,7 @@
       <el-table-column label="产线名称" align="center" prop="lineName" width="200px" />
       <el-table-column label="数量" align="center" prop="quantity" />
       <el-table-column label="托盘号" align="center" prop="sn" width="200px"/>
-
+      <el-table-column label="标识卡" align="center" prop="userDefined1" width="200px"/>
       <el-table-column label="记录日期" align="center" prop="productDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>

From 2f97b2570c124711e3fb67943407b75f8f074c02 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 15 Aug 2024 11:33:29 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/data.js                   |  9 +++++
 .../quality/qcIncome/checkProjectType.vue     | 36 +++++++++++++++----
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index 6c9eb79..cc5fa8c 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -9,6 +9,15 @@ export function listData(query) {
   })
 }
 
+// 查询字典数据列表无分页，可筛选
+export function getDictData(query) {
+  return request({
+    url: '/system/dict/data/getDictData',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询字典数据详细
 export function getData(dictCode) {
   return request({
diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 8540428..4880428 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -51,7 +51,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-           
+
             <el-col :span="14">
               <el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
                 <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
@@ -60,7 +60,15 @@
              -->
               <el-col :span="14">
               <el-form-item label="不合格描述" prop="remark">
-                <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
+                <!-- <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" /> -->
+                <el-select v-model="form.remark" placeholder="请选择不合格描述" clearable>
+                  <el-option
+                    v-for="dict in remarkList"
+                    :key="dict.dictLabel"
+                    :label="dict.dictLabel"
+                    :value="dict.dictLabel"
+                  ></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -162,7 +170,7 @@
                 />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item label="接受质量限" prop="sampleAql" v-if="this.typeCode == 'material' || this.typeCode == 'product'">
             <el-select placeholder="请选择接受质量限制" clearable
             @change="setSampleAql" v-model="dynamicValidateForm.sampleAql"
@@ -225,6 +233,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,
   commitCheckResult,getDefectList,getWeightValue,getnoOkVals,getAutoJudge
 } from "@/api/quality/income";
 import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
+import { getDictData,} from "@/api/system/dict/data";
 export default {
   name: "itemSelectUser",
   dicts: ["qc_rule_prop","material_type_oa","material_from_oa","sample_level","sample_aql"],
@@ -246,6 +255,7 @@ export default {
       // BOM产品表格数据
       itemList: null,
       qcCheckTaskDetails: [],
+      remarkList: [],
       //树名称
       bomCode: undefined,
       defaultProps: {
@@ -306,6 +316,7 @@ export default {
   },
   created() {
     this.getDefect();
+    this.handleGetDictData();
   },
   methods: {
     getDefect(){
@@ -343,7 +354,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.getList();
-       this.getDefect();
+      this.getDefect();
     },
 
     /** 查询表格列表*/
@@ -357,6 +368,17 @@ export default {
       );
     },
 
+    handleGetDictData() {
+     const query = {
+        dictType: 'unqualified_remark',
+      }
+      getDictData(query).then(response => {
+        if (response.code === 200) {
+          this.remarkList = response.data;
+        }
+      });
+    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -506,7 +528,7 @@ export default {
           if(this.typeCode=='material' || this.typeCode =='product'){//只有来料和成品有自动判定
           debugger
             //自动判定开始(仅使用范围形)
-            getAutoJudge(this.quality, 
+            getAutoJudge(this.quality,
               this.dynamicValidateForm.checkLevel,
               this.dynamicValidateForm.sampleAql,
               actualValues,
@@ -522,7 +544,7 @@ export default {
               );
 						});
 
-            //结束 
+            //结束
           }else{//不需要自动判定的情况
             this.commitActualValueFun(this.recordId, actualValues,autoStatus,null,null,null,null);
           }
@@ -542,7 +564,7 @@ export default {
         this.getList();
       });
     },
-    
+
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },

From 9f54af69a1d6d069db29331243a2830067796920 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 15 Aug 2024 12:19:13 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue      | 102 ++++++++++++++++++++-------
 src/views/plan/workorder/printID.vue |   2 +-
 2 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 3efd4b1..8246ba8 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -226,7 +226,7 @@
     <el-dialog
       title="备料信息"
       :visible.sync="printDialogVisible"
-      width="1000px"
+      :width="shengchan?'821px':'721px'"
     >
       <div id="printFrom" class="my-print-box">
 
@@ -234,31 +234,33 @@
 
           <!-- 表头-工单信息 -->
           <el-row class="my-print-head">
-            <el-col :offset="10" :span="5">生产订单备料单({{printData.printTitle}})</el-col>
+            <el-col>生产订单备料单({{printData.printTitle}})</el-col>
           </el-row>
           <!-- 导航栏 -->
           <el-row class="my-print-nav">
-            <el-col :span="4">工厂:{{printData.factory}}</el-col>
-            <el-col :span="4">工作中心:{{printData.workCenter}}</el-col>
-			<el-col :span="4" v-if="printData.prodLineCode!=null">线体:{{printData.prodLineCode}}</el-col>
-            <el-col :span="4">生产日期:{{printData.productDate}}</el-col>
-            <el-col :span="4">打印日期:{{printData.printDate}}</el-col>
-            <el-col :span="4">页次:  1/  1</el-col>
+            <el-col :span="8">工厂:{{printData.factory}}</el-col>
+            <el-col :span="8">工作中心:{{printData.workCenter}}</el-col>
+			<el-col :span="8" v-if="printData.prodLineCode!=null">线体:{{printData.prodLineCode}}</el-col>
+          </el-row>
+		  <el-row class="my-print-nav">
+            <el-col :span="8">生产日期:{{printData.productDate}}</el-col>
+            <el-col :span="8">打印日期:{{printData.printDate}}</el-col>
+            <el-col :span="8">页次:  1/  1</el-col>
           </el-row>
           <!-- 主数据 -->
           <el-table
-            v-if="refreshNewWorkerTable" v-loading="newWorkerLoading"class="my-print-table":data="printData.workTable"
+            v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="printData.workTable"
             border style="width: 100%">
-            <el-table-column type="index" label="序号" width="50"></el-table-column>
+            <el-table-column type="index" label="序号" width="40"></el-table-column>
             <el-table-column prop="materialCode" label="料号" width="120" :formatter="productCodeFormate"></el-table-column>
-            <el-table-column prop="materialName" label="物料描述" width="320"></el-table-column>
+            <el-table-column prop="materialName" label="物料描述" width="250"></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="请领数量  width="100""></el-table-column>
-<!--            <el-table-column prop="fundQuanlity" label="欠领数量"></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-column prop="quantity" label="请领数量"  width="100"></el-table-column>
+
+            <el-table-column prop="routeCode" width="60" label="实发数量"></el-table-column>
+            <el-table-column prop="routeCode" width="60" label="实发数量2"></el-table-column>
+		      
           </el-table>
           <br/>
           <!-- 底部 -->
@@ -293,6 +295,7 @@ export default {
 	// components: {Detail},
 	data() {
 		return {
+	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,
 	  showWorkorderCode:true,
@@ -403,17 +406,38 @@ export default {
       printJS({
         printable: params.printable, // 'printFrom', // 标签元素id
         type: params.type || 'html',
-        maxWidth: 1500, // 最大宽度
-        font_size: "",// 设置字体大小
+		dpi: 300, // 清晰度
+        //font_size: "",// 设置字体大小
         header: params.header, // '表单',
         targetStyles: ['*'],
-        style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
+        style: `
+      
+      body {margin: 5mm;padding: 0;}
+      .my-print-table {
+        width: 100%;
+      }
+      .my-print-table tr {
+        page-break-inside: avoid;
+        page-break-after: auto;
+      }
+      .my-print-table thead {
+        display: table-header-group; /* 确保表头在每一页显示 */
+      }
+      .my-print-table tbody {
+        display: table-row-group;
+      }
+      .my-print-table th, .my-print-table td {
+        word-wrap: break-word;
+        white-space: normal;
+      }
+    `,
         ignoreElements: params.ignore || [], // ['no-print']
         properties: params.properties || null
       })
     },
     // 打印预览(生产物料)
     showPrint() {
+		this.shengchan = true;
       // 清楚缓存
       this.printData.workCenter = "暂无数据";
       this.printData.printDate = null;
@@ -444,7 +468,7 @@ export default {
 		   this.$modal.msgError("请选择工单生产日期");
 		   return;
 	  }
-
+	  this.shengchan = false;
       // 清楚缓存
       this.printData.workCenter = "暂无数据";
       this.printData.printDate = null;
@@ -593,22 +617,52 @@ export default {
 .my-print-head {
   margin-top: 20px;
   font-weight: bold;
+  text-align: center;
 }
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-.my-print-table {
 
-}
 .my-print-foot {
   margin-top: 20px;
 }
 @media print {
+  body {
+    font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
+    font-size: 14px; /* 设置字体大小 */
+  }
+  table, th, td {
+    border: 1px solid black;
+    border-collapse: collapse;
+    font-size: 14px; /* 确保表格内字体大小一致 */
+  }
+}
+/* @media print {
 	#printFrom{
     font-family: "SimSun", "宋体" !important;
     color: #000 !important;
-    font-size: 14pt !important; /* 调整字体大小 */
+    font-size: 14pt !important; 
+	-webkit-print-color-adjust: exact;
 	}
-}
+	
+       .my-print-table {
+           width: 100%;
+           page-break-inside: auto;
+       }
+       .my-print-table tr {
+           page-break-inside: avoid;
+       }
+       .my-print-table thead {
+           display: table-header-group;
+       }
+       .my-print-table th, .my-print-table td {
+           word-wrap: break-word;
+           white-space: normal;
+       }
+       @page {
+           size: A5 portrait;
+           margin: 5mm;
+       }
+} */
 </style>
diff --git a/src/views/plan/workorder/printID.vue b/src/views/plan/workorder/printID.vue
index bc25d1f..f20abb0 100644
--- a/src/views/plan/workorder/printID.vue
+++ b/src/views/plan/workorder/printID.vue
@@ -119,7 +119,7 @@ export default {
       header: params.header, // '表单',
       targetStyles: ['*'],
       style: `
-      @page { size: A5 landscape; } body { margin: 10mm; padding: 0; }
+       body { margin: 10mm; padding: 0; }
         .print-page { page-break-after: always; }
       `,
       ignoreElements: params.ignore || [],

From 244ea2bd5bdd57a93c783a1dc7a14c0936abf5e0 Mon Sep 17 00:00:00 2001
From: lucungang <lucungang@kehaida.com>
Date: Thu, 15 Aug 2024 13:20:11 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=A6=84=E8=8F=8A=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A1=A8=E6=A0=BC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  2 ++
 src/main.js                          |  3 ++
 src/views/kanban/quality/kanban1.vue | 52 +++++++++++++++++-----------
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 39ec700..a94d3b7 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "print-js": "^1.6.0",
+    "qrcode": "^1.5.4",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
@@ -62,6 +63,7 @@
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
+    "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
     "xlsx": "^0.17.0"
diff --git a/src/main.js b/src/main.js
index 4aa6ff5..c0f7ab3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,6 +46,8 @@ import dataV from '@jiaminghi/data-view'
 // 打印插件
 import Print from 'print-js'
 import VScaleScreen from 'v-scale-screen'
+// 滚动
+import VueSeamlessScroll from 'vue-seamless-scroll'
 
 
 // 全局方法挂载
@@ -71,6 +73,7 @@ Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 
 Vue.use(VScaleScreen)
+Vue.use(VueSeamlessScroll)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue
index d70d125..15e44df 100644
--- a/src/views/kanban/quality/kanban1.vue
+++ b/src/views/kanban/quality/kanban1.vue
@@ -117,21 +117,23 @@
                         <div class="titlebox" style="margin-bottom: 14px;">
                             <div class="titlename">质量异常信息</div>
                         </div>
-                        <div class="table-tbody">
-                            <div class="item" :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px"
-                                :key="index" v-for="(n, index) in Qualitylist">
-                                <div class="icon">
-
-                                </div>
-                                <div class="itemname1" style="max-width: 210px;">
-                                    {{ n.projectName }}
-
-                                </div>
-                                <div class="itemname2">
-                                    {{ n.checkManName }} {{ n.checkTime }}
+                        <vue-seamless-scroll :data="Qualitylist" class="wrapscroll" :class-option="classOption" style="height:400px">
+                            <div class="table-tbody">
+                                <div class="item" :class="[index % 2 == 1 ? 'active1' : 'active2']" style="height:48px"
+                                    :key="index" v-for="(n, index) in Qualitylist">
+                                    <div class="icon">
+
+                                    </div>
+                                    <div class="itemname1" style="max-width: 210px;">
+                                        {{ n.projectName }}
+
+                                    </div>
+                                    <div class="itemname2">
+                                        {{ n.checkManName }} {{ n.checkTime }}
+                                    </div>
                                 </div>
                             </div>
-                        </div>
+                        </vue-seamless-scroll>
                     </div>
                     <div class="item-table item-table1">
                         <div class="titlebox" style="margin-bottom: 14px;">
@@ -191,6 +193,12 @@ export default {
     },
     data() {
         return {
+            classOption:{
+                direction: 1,
+                hoverstop:true, step: 0.5,
+                openNatch: true,
+                limitMoveNum:7
+            },
             gettimedata: "",
             selectxt: null,
             selectxtclasses: null,
@@ -269,7 +277,7 @@ export default {
             const _this = this;
             getDeviceRefreshTime().then((response) => {
                 if (response.data) {
-                    console.log(response.data)
+                    // console.log(response.data)
                     this.RefreshTime = response.data
                     this.time1 = setInterval(() => {
                         _this.getdatalist(_this.selectxt)
@@ -286,7 +294,7 @@ export default {
                 }
             ).then((response) => {
                 if (response) {
-                    console.log(response)
+                    // console.log(response)
                     this.dictDatatype = response
                     _this.selectxtclasses = _this.dictDatatype[0].ymdType;
                     this.getDeviceRefreshTime()
@@ -439,7 +447,7 @@ export default {
                 ],
             };
             myChart3.setOption(option3);
-            console.log(_this.selectxt)
+            // console.log(_this.selectxt)
             getProMonthNoOk({
                 typeCode: 'produce',
                 factoryCode: 'ds_' + _this.selectxt,
@@ -449,7 +457,7 @@ export default {
                     let dataoption = [];
                     let totalArr = [];
                     _this.optionDatalist3 = [];
-                    console.log(response)
+                    // console.log(response)
                     for (let index = 0; index < response.month.length; index++) {
                         let a = {};
                         response.month[index] = moment(response.month[index]).format('MM')
@@ -468,7 +476,7 @@ export default {
                     dataoption.forEach((item) => {
                         totalArr.push(max);
                     });
-                    console.log(dataoption, numberlist)
+                    // console.log(dataoption, numberlist)
                     // response = [{ name: "1月", code: "100", value: '100', }]
                     // if (response.length > 0) {
                     option3 = {
@@ -629,7 +637,7 @@ export default {
                     let yAxismaxall = 0
                     dataoption.forEach((n) => {
                         if (n.data) {
-                            console.log(Math.max(...n.data), n.data)
+                            // console.log(Math.max(...n.data), n.data)
                             yAxismax.push(Math.max(...n.data))
                         }
                         var item = {
@@ -661,7 +669,7 @@ export default {
                         ],
                         series: seriesmyChart5
                     };
-                    console.log(seriesmyChart5,'111111111111111')
+                    // console.log(seriesmyChart5,'111111111111111')
                     myChart5.setOption(option5);
                 }
             });
@@ -1826,7 +1834,9 @@ export default {
 .app-container {
     padding: 0px 24px;
 }
-
+.wrapscroll{
+    overflow: hidden;
+}
 .home {
     width: 100%;
     height: 100vh;

From 5f2b0662fa159240d6b984feaded9bf96d236aaf Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 15 Aug 2024 15:53:44 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue | 89 +++++++++++++++------------------
 1 file changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 8246ba8..1e1727a 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -248,10 +248,16 @@
             <el-col :span="8">页次:  1/  1</el-col>
           </el-row>
           <!-- 主数据 -->
-          <el-table
-            v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="printData.workTable"
+		  <div v-for="(item,index) in printData.workTable" :key="index">
+			<el-table
+            v-if="refreshNewWorkerTable" v-loading="newWorkerLoading" class="my-print-table" :data="item"
             border style="width: 100%">
-            <el-table-column type="index" label="序号" width="40"></el-table-column>
+            <el-table-column  label="序号" width="40">
+				<template slot-scope="scope">
+        <!-- scope.$index 是当前行的索引（从 0 开始），加 1 后乘以 2 -->
+                 {{ (scope.$index + 1) + fenyeNumber* index}}
+               </template>
+			</el-table-column>
             <el-table-column prop="materialCode" label="料号" width="120" :formatter="productCodeFormate"></el-table-column>
             <el-table-column prop="materialName" label="物料描述" width="250"></el-table-column>
             <el-table-column prop="unit" width="50" label="单位"></el-table-column>
@@ -262,7 +268,10 @@
             <el-table-column prop="routeCode" width="60" label="实发数量2"></el-table-column>
 		      
           </el-table>
-          <br/>
+		  <div class="fy" v-if="index!=printData.workTable.length-1"></div>
+		  </div>
+          
+          
           <!-- 底部 -->
           <el-row class="my-print-foot">
             <el-col :offset="1" :span="3">发料人:</el-col>
@@ -295,6 +304,7 @@ export default {
 	// components: {Detail},
 	data() {
 		return {
+		fenyeNumber:14,
 	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,
@@ -413,23 +423,7 @@ export default {
         style: `
       
       body {margin: 5mm;padding: 0;}
-      .my-print-table {
-        width: 100%;
-      }
-      .my-print-table tr {
-        page-break-inside: avoid;
-        page-break-after: auto;
-      }
-      .my-print-table thead {
-        display: table-header-group; /* 确保表头在每一页显示 */
-      }
-      .my-print-table tbody {
-        display: table-row-group;
-      }
-      .my-print-table th, .my-print-table td {
-        word-wrap: break-word;
-        white-space: normal;
-      }
+      .fy{page-break-after: always;}
     `,
         ignoreElements: params.ignore || [], // ['no-print']
         properties: params.properties || null
@@ -455,7 +449,17 @@ export default {
         this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
         this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
         this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
-        this.printData.workTable = response.data.mesPrepareDetailList
+        this.printData.workTable = response.data.mesPrepareDetailList;
+		let chunkedArray = [];
+
+// 遍历this.printData.workTable
+     for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) {
+    // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
+    let chunk = this.printData.workTable.slice(i, i + this.fenyeNumber);
+    // 将切割后的数组添加到chunkedArray中
+    chunkedArray.push(chunk);
+    }
+	this.printData.workTable = chunkedArray;
 		this.printData.prodLineCode = response.data.mesPrepare.prodLineCode
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
@@ -487,6 +491,16 @@ export default {
         this.printData.productDate = moment(this.queryParams.productDate).format('YYYY-MM-DD')
         this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
         this.printData.workTable = response.data.mesPrepareDetailList
+		let chunkedArray = [];
+
+// 遍历this.printData.workTable
+     for (let i = 0; i < this.printData.workTable.length; i += this.fenyeNumber) {
+    // 使用slice方法从当前索引i开始切割，切割长度为10（如果剩余元素少于10，则切割剩余所有元素）
+    let chunk = this.printData.workTable.slice(i, i + this.fenyeNumber);
+    // 将切割后的数组添加到chunkedArray中
+    chunkedArray.push(chunk);
+    }
+	this.printData.workTable = chunkedArray;
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
       })
@@ -631,6 +645,7 @@ export default {
   body {
     font-family: 'Arial', sans-serif; /* 设置字体为'Arial'或其他清晰的无衬线字体 */
     font-size: 14px; /* 设置字体大小 */
+	-webkit-print-color-adjust: exact;
   }
   table, th, td {
     border: 1px solid black;
@@ -638,31 +653,7 @@ export default {
     font-size: 14px; /* 确保表格内字体大小一致 */
   }
 }
-/* @media print {
-	#printFrom{
-    font-family: "SimSun", "宋体" !important;
-    color: #000 !important;
-    font-size: 14pt !important; 
-	-webkit-print-color-adjust: exact;
-	}
-	
-       .my-print-table {
-           width: 100%;
-           page-break-inside: auto;
-       }
-       .my-print-table tr {
-           page-break-inside: avoid;
-       }
-       .my-print-table thead {
-           display: table-header-group;
-       }
-       .my-print-table th, .my-print-table td {
-           word-wrap: break-word;
-           white-space: normal;
-       }
-       @page {
-           size: A5 portrait;
-           margin: 5mm;
-       }
-} */
+.fy{
+	page-break-after: always;
+}
 </style>

From c85d77eb29401e0958b28c0e66c8f86faf441806 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 15 Aug 2024 16:32:26 +0800
Subject: [PATCH 13/19] =?UTF-8?q?2024-08-15=20mes-=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E5=8D=95-=E6=89=93=E5=8D=B0=E7=94=9F=E4=BA=A7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99+=E6=89=93=E5=8D=B0=E5=8F=8D=E5=86=B2=20=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81+=E8=AE=BE=E5=A4=87=E5=AE=A1=E6=A0=B8=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                           |  1 +
 src/views/device/faultReport/index.vue |  3 ++
 src/views/device/repairOrder/index.vue | 60 ++++++++++++++++++++++----
 src/views/mes/prepare/index.vue        | 38 ++++++++++++++--
 4 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index a94d3b7..60d05e1 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
+    "jsbarcode": "^3.11.6",
     "jsencrypt": "3.0.0-rc.1",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index f32e59a..cac3d4d 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -897,6 +897,9 @@
               <el-descriptions-item label="报修去向">{{
                 form.repairDestination
               }}</el-descriptions-item>
+              <el-descriptions-item label="审核意见">{{
+                form.auditOpinion
+              }}</el-descriptions-item>
             </el-descriptions>
 
             <el-descriptions
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 50a3835..44122e1 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -314,12 +314,12 @@
           />
         </template>
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
         label="审核意见"
         align="center"
         prop="auditOpinion"
-        width="100"
-      /> -->
+        width="150"
+      />
       <el-table-column
         label="报修单号"
         align="center"
@@ -1310,7 +1310,7 @@
 
     <!-- 维修结果审核 -->
     <el-dialog title="维修结果审核" :visible.sync="inspectDialog" width="30%">
-      <el-radio v-model="inspect" label="2">待审核</el-radio>
+      <!-- <el-radio v-model="inspect" label="2">待审核</el-radio> -->
       <el-radio v-model="inspect" label="1">审核通过</el-radio>
       <el-radio v-model="inspect" label="0">驳回</el-radio>
       <row></row>
@@ -1841,6 +1841,10 @@ export default {
       auditOpinion: null,
       // 多个维修单号
       orderCodes: [],
+      //多个维修状态
+      workStatus: [],
+      //多个审核状态
+      resultInspect: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -2212,6 +2216,8 @@ export default {
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.workId);
       this.orderCodes = selection.map((item) => item.workCode);
+      this.workStatus = selection.map((item) => item.workStatus);
+      this.resultInspect = selection.map((item) => item.resultInspect);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -2452,6 +2458,7 @@ export default {
         }
       });
     },
+
     // 点击结果检验按钮
     clickInspect() {
       if (this.ids.length == 0 || this.ids == null) {
@@ -2461,10 +2468,38 @@ export default {
         });
         return;
       }
-      // 如果审核通过 那么就只是展示？
-      //需要加一个结果检验
-      this.inspectDialog = true;
-      this.inspect = "1";
+
+      let workStatusMsg = true;
+      this.workStatus.forEach((item) => {
+        if(item == '0'){
+          workStatusMsg = false;
+        }
+      });
+
+      let resultInspectMsg = true;
+      this.resultInspect.forEach((item) => {
+        if(item == '1'){
+          resultInspectMsg = false;
+        }
+      });
+
+      if (workStatusMsg && resultInspectMsg) {
+        this.inspectDialog = true;
+        this.inspect = "1";//默认审核通过
+        this.auditOpinion = null;//默认为空
+      }else if(workStatusMsg == false){
+        this.$message({
+          message: "您选择的维修工单存在未完成的工单！",
+          type: "warning",
+        });
+        return;
+      }else if(resultInspectMsg == false){
+        this.$message({
+          message: "您选择的维修工单存在已经审核过的工单，不能再次审核！",
+          type: "warning",
+        });
+        return;
+      }
     },
 
     // 提交检验信息
@@ -2479,10 +2514,17 @@ export default {
       checkRepairWorkOrder(data).then((response) => {
         this.getList();
         this.inspectDialog = false;
-        this.$message({
+        if(response.code = 500 ){
+          this.$message({
+          message: response.msg,
+          type: "warning",
+        });
+        }else{
+          this.$message({
           message: "提交成功！",
           type: "success",
         });
+        }
       });
     },
     //设备选择
diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 1e1727a..20c2247 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -233,8 +233,13 @@
         <el-form :model="form">
 
           <!-- 表头-工单信息 -->
-          <el-row class="my-print-head">
-            <el-col>生产订单备料单({{printData.printTitle}})</el-col>
+		  <div class="my-print-barcode" :width="shengchan?'821px':'721px'">
+			<svg id="barcode"></svg>
+		  </div>
+		  <el-row>
+			<div class="my-print-head">
+            	<el-col>生产订单备料单({{printData.printTitle}})</el-col>
+          	</div>
           </el-row>
           <!-- 导航栏 -->
           <el-row class="my-print-nav">
@@ -297,6 +302,8 @@
 import { listPrepare, getPrepare, delPrepare, addPrepare, updatePrepare } from "@/api/mes/prepare";
 import {printPrepareByCode,printPrepareXByCode} from "@/api/mes/prepareDetail";
 import moment from "moment/moment";
+import JsBarcode from 'jsbarcode';
+
 // import { listPrepareDetail, getPrepareDetail, delPrepareDetail, addPrepareDetail, updatePrepareDetail } from "@/api/mes/prepareDetail";
 // import Detail  from "./prepareDetail.vue";
 export default {
@@ -323,6 +330,7 @@ export default {
         factory: null,
         productDate: null,
         workTable: [],
+		barcode:null,//打印生产物料和反冲物料的条码
       },
       printDialogVisible: false,
 			// 遮罩层
@@ -400,6 +408,9 @@ export default {
 	created() {
 		this.getList();
 	},
+	mounted() {  
+    	this.generateBarcode();  
+  	},  
 	methods: {
 		//产品编码格式化
 		productCodeFormate(row, column, cellValue){
@@ -463,6 +474,8 @@ export default {
 		this.printData.prodLineCode = response.data.mesPrepare.prodLineCode
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
+
+		this.generateBarcode(this.selectPrepare[0].workorderCode); //条码 根据工单号生成
       })
     },
     // 打印预览(反冲物料)
@@ -503,8 +516,21 @@ export default {
 	this.printData.workTable = chunkedArray;
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
         this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
+
+		this.generateBarcode(this.printData.printDate); //条码 根据打印日期生成
       })
     },
+
+	//打印条码
+	generateBarcode(barcode){
+		JsBarcode("#barcode", barcode, {  
+        	format: "CODE128",  
+			height:75,
+			width:2,
+        	displayValue: true,
+      });
+	},
+
 	// 生成表头序号
     indexMethod(index){
       return index+1 ;
@@ -629,10 +655,16 @@ export default {
 </script>
 <style>
 .my-print-head {
-  margin-top: 20px;
   font-weight: bold;
   text-align: center;
 }
+
+.my-print-barcode {
+  margin-top: 0px;
+  margin-right: 40px;
+  text-align: right;
+}
+
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;

From 4ae54a2f1278ed025c231200f685d630711d17bb Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 15 Aug 2024 16:43:54 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/prepare/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue
index 20c2247..44e3715 100644
--- a/src/views/mes/prepare/index.vue
+++ b/src/views/mes/prepare/index.vue
@@ -311,7 +311,7 @@ export default {
 	// components: {Detail},
 	data() {
 		return {
-		fenyeNumber:14,
+		fenyeNumber:13,
 	  shengchan:true,
       newWorkerLoading: false,
       refreshNewWorkerTable:true,

From ee54740385bb27f992d6d8cdfbfccde99bea35d3 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Thu, 15 Aug 2024 17:51:20 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcIncome/checkProjectType.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 4880428..70f4359 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -64,9 +64,9 @@
                 <el-select v-model="form.remark" placeholder="请选择不合格描述" clearable>
                   <el-option
                     v-for="dict in remarkList"
-                    :key="dict.dictLabel"
+                    :key="dict.dictValue"
                     :label="dict.dictLabel"
-                    :value="dict.dictLabel"
+                    :value="dict.dictValue"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -229,7 +229,7 @@
 </template>
 <script>
 
-import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,
+import { getCkeckProjectList,changeCheckDetailStatus,getIncome,commitActualValue,
   commitCheckResult,getDefectList,getWeightValue,getnoOkVals,getAutoJudge
 } from "@/api/quality/income";
 import { getDefectValue, commitDefectValue, updateDefectValue} from "@/api/quality/checkTaskDefect";
@@ -340,6 +340,7 @@ export default {
       this.viewStatus = this.data.checkStatus;
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
+      this.getCheckInfo();
       this.getList();
       this.getDefect();
     },
@@ -353,6 +354,7 @@ export default {
       this.viewStatus = "1";
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
+      this.getCheckInfo();
       this.getList();
       this.getDefect();
     },
@@ -422,6 +424,13 @@ export default {
       });
     },
 
+    getCheckInfo() {
+      getIncome(this.data.recordId).then(response => {
+        this.form = response.data;
+
+      });
+    },
+
     //提交整体检测结果
     submitBomForm() {
       //获取待检验信息列表--点处理后获取检测项--提交
@@ -449,6 +458,7 @@ export default {
           this.$modal.msgSuccess("检测完成");
           this.$emit('saveCheck');
           this.showFlag = false;
+          this.reset();
       });
     },
 

From bcc5f920895e7d97d9ab13c8a2d8ab49b86904c4 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 16 Aug 2024 18:04:38 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E4=B8=8D=E8=89=AFcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcIncome/checkProjectType.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue
index 70f4359..7d14c46 100644
--- a/src/views/quality/qcIncome/checkProjectType.vue
+++ b/src/views/quality/qcIncome/checkProjectType.vue
@@ -59,9 +59,9 @@
             </el-col>
              -->
               <el-col :span="14">
-              <el-form-item label="不合格描述" prop="remark">
+              <el-form-item label="不合格描述" prop="remarkCode">
                 <!-- <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" /> -->
-                <el-select v-model="form.remark" placeholder="请选择不合格描述" clearable>
+                <el-select v-model="form.remarkCode" placeholder="请选择不合格描述" clearable>
                   <el-option
                     v-for="dict in remarkList"
                     :key="dict.dictValue"
@@ -392,7 +392,7 @@ export default {
         startOA: null,
         materialType: null,
         materialFrom: null,
-        remark: null,
+        remarkCode: null,
 				createBy: null,
 				createTime: null,
 				updateBy: null,

From 240e16a84a1f3e9bcb5889ac610a51796dff721e Mon Sep 17 00:00:00 2001
From: lucungang <lucungang@kehaida.com>
Date: Mon, 19 Aug 2024 11:52:03 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcTable.js                    |  32 +
 .../quality/qcTableCheckDevelop/index.vue     | 700 +++++++++++++-----
 2 files changed, 535 insertions(+), 197 deletions(-)

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index a4bdc78..b5c6628 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -109,3 +109,35 @@ export function getTableHzTitle(query) {
 		params: query
 	});
 }
+//巡检缺陷不良率表头
+export function getTableHzTitleTh(query) {
+	return request({
+		url: '/quality/staticTable/getTableHzTitle',
+		method: 'post',
+		data: query
+	});
+}
+//巡检缺陷不良率表体
+export function getTableHzData(query) {
+	return request({
+		url: '/quality/staticTable/getTableHzData',
+		method: 'post',
+		data: query
+	});
+}
+//巡检不良占比分析报表
+export function getTableHzNoOkData(query) {
+	return request({
+		url: '/quality/staticTable/getTableHzNoOkData',
+		method: 'post',
+		data: query
+	});
+}
+// 获取头部统计维度年月日
+export function getDictData(data) {
+	return request({
+		url: '/quality/qcInterface/getDictData',
+		method: 'get',
+		params: data
+	});
+}
\ No newline at end of file
diff --git a/src/views/quality/qcTableCheckDevelop/index.vue b/src/views/quality/qcTableCheckDevelop/index.vue
index 8e2cb80..24ce30e 100644
--- a/src/views/quality/qcTableCheckDevelop/index.vue
+++ b/src/views/quality/qcTableCheckDevelop/index.vue
@@ -1,61 +1,122 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom: -34px;">
-			<el-form-item label="来料月份" prop="incomeTimeYM">
-				<el-date-picker
-				v-model="queryParams.incomeTimeYM"
-				format="yyyy-MM"
-				type="month"
-				placeholder="选择月">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" style="margin-bottom:-15px" >
+			<!-- <el-form-item label="检验类型">
+				 <el-select v-model="queryParams.checkType" filterable placeholder="请选择检验类型">
+					<el-option
+					v-for="item in jianyanType"
+					:key="item.factoryCode"
+					:label="item.factoryName"
+					:value="item.factoryCode">
+					</el-option>
+				</el-select>
+			</el-form-item> -->
+			<el-form-item label="统计维度">
+				 <el-select v-model="queryParams.ymdms" filterable placeholder="请选择检验节点" @change="change(queryParams.ymdms)">
+					<el-option
+					v-for="item in jianyanNode"
+					:key="item.ymdType"
+					:label="item.ymdTypeName"
+					:value="item.ymdType">
+					</el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item v-show="queryParams.ymdms=='yyyy'" label="检验时间">
+				<el-date-picker				
+				v-model="queryParams.incomeTimeStr"
+				style="width: 230px"
+				type="year"
+				value-format="yyyy"
+				placeholder="选择检验时间">
 				</el-date-picker>
 			</el-form-item>
-			<el-form-item label="供应商" prop="supplierCodeArray">
-				<div class="tagbox">
-					<div class="tag" style="" placeholder="请选择供应商">
-						<el-tag
-						:key="index"
-						class="tagitem"
-						v-for="(tag, index) in selectMaterielListtag"
-						closable
-						:disable-transitions="false"
-						@close="handleClose(tag)"
-						>
-						{{ tag.supplierName }}
-						</el-tag>
-					</div>
-					<el-button
-						slot="append"
-						class="button1"
-						@click="handleSelectSupplier"
-						icon="el-icon-search"
-					></el-button>
-					<el-row style="display: none;">
-						<el-input type="input" clearable v-model="queryParams.supplierCode" placeholder="点击选择物料"/>
-						<el-input type="input"clearable v-model="queryParams.supplierName" placeholder="点击选择物料"/>
-					</el-row>
-				</div>
+			<el-form-item v-show="queryParams.ymdms=='mm'" label="检验时间">
+				<el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" value-format="yyyy-MM"
+				type="month" placeholder="选择检验时间" />
+			</el-form-item>
+			<el-form-item v-show="queryParams.ymdms=='dd'" label="检验时间">
+				<el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" type="date" value-format="yyyy-MM-dd" placeholder="选择检验时间"
+				/>
 			</el-form-item>
+			
+			
 			<el-form-item>
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 			</el-form-item>
 		</el-form>
 
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['mes:rfidProcess:export']"
-				>导出</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
-
-		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+		<div class="top-table">
+			<div class="top-left-table">
+				<div class="title">巡检数据统计</div>
+				<table class="tableStyle" cellpadding="0" cellspacing="0" style="width:100%;table-layout : fixed">
+					<thead>
+						<tr>
+							<th rowspan="2">时间</th>
+							<th rowspan="2" style="border-right:1px solid #dfe6ec;">抽样数</th>
+							<th :colspan="tableThead.length?tableThead.length:''">缺陷不良</th>
+							<th rowspan="2" style="border-left:1px solid #dfe6ec;">不良率</th>
+						</tr>
+						<tr>
+							<th v-for="(item,index) in tableThead" :key="index">{{item}}</th>
+						</tr>
+					</thead>
+				</table>	
+				<div style="width:100%;height:300px;overflow-y: auto">
+				<table class="tableStyle" cellpadding="0" cellspacing="0" style="table-layout : fixed">
+					<tbody>
+						
+							<tr v-for="(item,index) in tableTbody" :key="index">
+								<td>{{item.timeCol}}</td>
+								<td>{{item.sampleQuality}}</td>
+								<td v-for="(items,indexs) in item.ddTab" :key="indexs">{{items}}</td>
+								<td>{{item.noOkRate}}%</td>
+							</tr>
+					
+				</tbody>
+						
+				</table>
+				</div>
+			</div>
+			<div class="top-right-table">
+				<div class="title">巡检</div>
+				<table class="tableStyle" cellpadding="0" cellspacing="0" style="width:100%;table-layout : fixed">
+					<thead>
+						<tr>
+							<th>缺陷类别</th>
+							<th>不良数</th>
+							<th>占比</th>
+						</tr>
+					</thead>
+				</table>
+					<div style="width:100%;height:300px;overflow-y: auto">
+						<table class="tableStyle" cellpadding="0" cellspacing="0" style="table-layout : fixed">
+							<tbody>
+								
+									<tr v-for="(items,indexs) in tableBlfx" :key="indexs">
+										<td>{{items.dataType}}</td>
+										<td>{{items.noOkQuality}}</td>
+										<td>{{items.noOkNumRate}}%</td>
+									</tr>
+							
+							</tbody>						
+						</table>
+					</div>
+			</div>
+			
+		</div>
+		<div class="bottom-echart">
+			<div class="left-echart">
+				<div class="title">巡检不良率</div>
+				<div id="echartss" style="width:680px;height:200px;"></div>
+			</div>
+			<div class="right-echart">
+				<div class="title">不良排列图</div>
+				<div id="echartTs" style="width:650px;height:200px;"></div>
+			</div>
+		  
+		</div>
+		<!-- <el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
 			<el-table-column label="供应商编号" align="center" prop="supplierCode" width="120" fixed/>
 			<el-table-column label="供应商名称" align="left" prop="supplierName" width="390" fixed/>
 			<el-table-column label="总批数" align="center" prop="batchs" width="90"/>
@@ -66,21 +127,16 @@
 			<el-table-column label="合格数量" align="center" prop="okNums" width="100"/>
 			<el-table-column label="不合格数量" align="center" prop="noOkNums" width="100"/>
 			<el-table-column label="数量不良率" align="center" prop="noOkNumRate" width="100"/>
-		</el-table>
+		</el-table> -->
 
-		<pagination
-			v-show="total>0"
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
 	</div>
 </template>
 
 <script>
-import { getIncomeTableList} from "@/api/quality/qcTable";
+import { getIncomeTableList,getTableHzTitleTh,getTableHzData,getTableHzNoOkData,getDictData} from "@/api/quality/qcTable";
 import moment from 'moment';
+import * as echarts from "echarts";
+
 export default {
 	name: "qcTableCheckDevelop",
 	components: {},
@@ -106,27 +162,13 @@ export default {
 			open: false,
 			 // 新增-物料选中listtag
             selectMaterielListtag:[],
+			dateRange:[],
 			// 查询参数
 			queryParams: {
-				incomeTimeYM:null,
-				incomeTimeArray: [],
-				checkTimeArray: [],
-				pageNum: 1,
-				pageSize: 10,
-				workorderId: null,
-				rfid: null,
-				factoryCode: null,
-				machineCode: null,
-				nowProcessId: null,
-				nextProcessId: null,
-				orderNum: null,
-				inTime: null,
-				outTime: null,
-				status: null,
-				shiftId: null,
-				productCode: null,
-				supplierName: '',
-				supplierCode: ''
+				checkType:'checkTypeSCXJ',
+				ymdms: 'dd',
+				incomeTimeStr: moment().format('YYYY-MM-DD'),
+				
 			},
 			// 表单参数
 			form: {},
@@ -138,47 +180,290 @@ export default {
 				rfid: [
 					{ required: true, message: "rfid号不能为空", trigger: "blur" }
 				],
-			}
+			},
+			jianyanType:[
+				{
+					factoryCode:'checkTypeSCXJ',
+					factoryName:''
+				}
+			],
+			jianyanNode:[
+				// {
+				// 	dictNo:'yyyy',
+				// 	dictValue:'年'
+				// },
+				// {
+				// 	dictNo:'mm',
+				// 	dictValue:'月'
+				// },
+				// {
+				// 	dictNo:'dd',
+				// 	dictValue:'日'
+				// },
+			],
+			tableThead:[],
+			tableTbody:[],
+			tableBlfx:[],
+			echartsData:[],
+			dateNode:'dd',
 		};
 	},
 	mounted(){
-		this.getDate();
-		this.getList();
+		this.getDictData()
+		this.getThead()
+		this.getTbody()
+		this.getBlfx()
+	
+
 	},
 	created() {
 		
 	},
 	methods: {
 
-        /**获取默认查询时间段**/
-		getDate() {
-			let start = this.Fungetdate (0)
-			this.queryParams.incomeTimeYM=start
+
+		async getThead(){
+			let res=await getTableHzTitleTh({checkType:'checkTypeSCXJ'})
+			console.log('resTh',res)
+			this.tableThead=res.columns1
+		},
+		async getTbody(){
+			let res=await getTableHzData(this.queryParams)
+			console.log('resData',res)
+			let xData=[]
+			let yData=[]
+			res.map((item,index)=>{
+				let ddTab=[]
+				xData.push(item.timeCol),
+				yData.push(item.noOkRate)
+				Object.keys(item).map((itemT,indexT)=>{
+					if((itemT!='timeCol')&&(itemT!='sampleQuality')&&(itemT!='noOkRate')){
+						ddTab.push(item[itemT])
+					}
+				})
+				item.ddTab=ddTab
+			})
+			console.log('resData处理后',res)
+			this.tableTbody=res
+			
+			this.getEcharts(xData,yData)
 		},
-		Fungetdate (num) {
-			var dd = new Date();
-			dd.setDate(dd.getDate() + num);
-			var y = dd.getFullYear();
-			var m = dd.getMonth() + 1;//获取当前月份的日期
-			var d = dd.getDate();
-			return y + "-" + m;
+		async getBlfx(){
+			let xdata=[]
+			let ydata=[]
+			let res=await getTableHzNoOkData(this.queryParams)
+			console.log('res不良分析',res)
+			res.map((item,index)=>{
+				xdata.push(item.dataType)
+				ydata.push(item.noOkQuality)
+			})
+			this.tableBlfx=res
+			console.log('table',this.tableBlfx)
+			this.getEchartsT(xdata,ydata)
+
 		},
-		/** 查询列表 */
-		getList() {
-			this.loading = true;
-            if(this.queryParams.incomeTimeYM!=null){
-				this.queryParams.yearMonth = moment(this.queryParams.incomeTimeYM).format('YYYY-MM');
-			}
-			getIncomeTableList(this.queryParams).then(response => {
-				this.incomeList = response.rows;
-				this.total = response.total;
-				this.loading = false;
-			});
+		change(e){
+			console.log('e',e)
+			this.dateNode=e,
+			this.queryParams.incomeTimeStr=null
 		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
+		 getDictData() {
+            const _this = this;
+            getDictData(
+                {
+                    dictType: 'static_dims',
+                }
+            ).then((response) => {
+                if (response) {
+                    console.log('response',response)
+                    _this.jianyanNode = response
+					_this.queryParams.ymdms=_this.jianyanNode[2].ymdType
+                }
+            });
+        },
+		getEcharts(xData,yData){
+			var _this=this
+			var chartDom = document.getElementById('echartss');
+			var myChart = echarts.init(chartDom);
+			var option;
+			option = {
+				// title:{
+				// 	text:'不\n良\n率\n%',
+				// 	left:'1%',
+				// 	top:'30%'
+				// },
+				grid: {
+                    y: '10%',
+					x:'1%',
+                    y2: '6%',
+                    x2: '1%',
+					width:'95%',
+                    containLabel: true
+                },
+				// legend:   {
+				// 	top:0,
+                //     right:120,
+                //     icon: "roundRect",
+                //     data:["成品包装不良率%"],
+				// 	textStyle:{
+				// 		color:'#000',
+				// 		fontSize:12
+				// 	}
+                // },
+				xAxis: {
+					type: 'category',
+					name:_this.dateNode=='dd'?'时':_this.dateNode=='mm'?'日':'月',
+					splitLine: {
+						show: true  //分隔线，默认数值轴显示，类目轴不显示
+					},
+					axisTick:{
+						show:false,
+						inside:true,
+					},
+					axisLabel:{
+						rotate: _this.queryParams.ymdms=='dd'?0:50,
+						fontSize:11
+					},
+					
+					data: xData
+				},
+				yAxis: {
+					type: 'value',
+					show:true,
+					// boundaryGap:true,
+					axisLine:{
+						// show:true,
+					},
+					axisLabel:{
+						formatter:'{value}%'
+					}
+					// splitLine: {
+					// 	show: true
+					// },
+					// axisTick:{
+					// 	show:true,
+					// 	inside:true,
+					// 	alignWithLabel:true,
+					// },
+				},
+				series: [
+					{   
+						name:'成品包装不良率%',
+						data: yData,
+						type: 'line',
+						symbol: "circle",
+						symbolSize: 5,
+						label:{
+							show:true,
+							fontSize:11
+						},
+						lineStyle: {
+							color: "rgba(12, 115, 242, 1)"
+						},
+						areaStyle:{
+							normal: {
+                                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                                    offset: 0,
+                                    color: "#fff" // 0% 处的颜色
+                                }, {
+                                    offset: 1,
+                                    color: "rgba(12, 115, 242, 1)" // 100% 处的颜色
+                                }], false)
+                        	},
+						}
+					}
+				]
+				};
+
+				option && myChart.setOption(option);	
+		},
+		getEchartsT(xdata,ydata){
+			var chartDom = document.getElementById('echartTs');
+			var myChart2 = echarts.init(chartDom);
+			var option2;
+			option2 = {
+				// title:{
+				// 	text:'不\n良\n率\n%',
+				// 	left:'1%',
+				// 	top:'30%'
+				// },
+				grid: {
+                    y: '10%',
+					x:'1%',
+                    y2: '6%',
+                    x2: '2%',
+					width:'95%',
+                    containLabel: true
+                },
+				// legend:   {
+				// 	top:0,
+                //     right:120,
+                //     icon: "roundRect",
+                //     data:["成品包装不良率%"],
+				// 	textStyle:{
+				// 		color:'#000',
+				// 		fontSize:12
+				// 	}
+                // },
+				xAxis: {
+					type: 'category',
+					// splitLine: {
+					// 	show: true  //分隔线，默认数值轴显示，类目轴不显示
+					// },
+					axisTick:{
+						show:false,
+						inside:true,
+					},
+					
+					data: xdata
+				},
+				yAxis: {
+					type: 'value',
+					show:true,
+					// boundaryGap:true,
+					axisLine:{
+						// show:true,
+					},
+					// splitLine: {
+					// 	show: true
+					// },
+					// axisTick:{
+					// 	show:true,
+					// 	inside:true,
+					// 	alignWithLabel:true,
+					// },
+				},
+				series: [
+					{   
+						name:'成品包装不良率%',
+						data: ydata,
+						type: 'bar',
+						// symbol: "circle",
+						// symbolSize: 5,
+						label:{
+							show:true,
+							position: "top",
+						},
+						lineStyle: {
+							color: "rgba(12, 115, 242, 1)"
+						},
+						barWidth: 30,
+						itemStyle:{
+							normal: {
+                                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                                    offset: 0,
+                                    color: "#fff" // 0% 处的颜色
+                                }, {
+                                    offset: 1,
+                                    color: "rgba(12, 115, 242, 1)" // 100% 处的颜色
+                                }], false)
+                        	},
+						}
+					}
+				]
+				};
+
+				option2 && myChart2.setOption(option2);	
 		},
 		// 表单重置
 		reset() {
@@ -209,13 +494,16 @@ export default {
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
+			console.log('queryForm',this.queryParams)
+			this.getThead()
+			this.getTbody()
+			this.getBlfx()
+			
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
-			this.resetForm("queryForm");
-			this.handleQuery();
+			this.queryParams.ymdms=null
+			this.queryParams.incomeTimeStr=null
 		},
 		// 多选框选中数据
 		handleSelectionChange(selection) {
@@ -223,101 +511,119 @@ export default {
 			this.single = selection.length!==1
 			this.multiple = !selection.length
 		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = "添加生产rfid流程";
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			const recordId = row.recordId || this.ids
-			getRfidProcess(recordId).then(response => {
-				this.form = response.data;
-				this.open = true;
-				this.title = "修改生产rfid流程";
-			});
-		},
-		/** 提交按钮 */
-		submitForm() {
-			this.$refs["form"].validate(valid => {
-				if (valid) {
-					if (this.form.recordId != null) {
-						updateRfidProcess(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addRfidProcess(this.form).then(response => {
-							this.$modal.msgSuccess("新增成功");
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const recordIds = row.recordId || this.ids;
-			this.$modal.confirm('是否确认删除生产rfid流程编号为"' + recordIds + '"的数据项？').then(function() {
-				return delRfidProcess(recordIds);
-			}).then(() => {
-				this.getList();
-				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download('mes/rfidProcess/export', {
-				...this.queryParams
-			}, `rfidProcess_${new Date().getTime()}.xlsx`)
-		},
-		/**供应商选择弹出框**/
-		handleSelectSupplier() {
-		  this.$refs.itemSelectSupplier.showFlag = true;
-		},
-		//供应商选择确认
-		onSelectSupplier(objs) {
-			var code = '';
-			var desc = '';
-			for (let i = 0; i < objs.length; i++) {
-				if(this.queryParams.supplierCode.indexOf(objs[i].supplierCode)<0){
-					code = code + objs[i].supplierCode + ',';
-					this.selectMaterielListtag.push(objs[i])
-				}else{
-					this.$message({
-						message: objs[i].supplierName+'已经选择',
-						type: 'warning'
-					})
+	}
+};
+</script>
+<style lang="scss" scoped>
+.top-table{
+	display: flex;
+	justify-content: space-between;
+	width: 1450px;
+	height: 380px;
+	.top-left-table{
+		width: 48%;
+		height: 100%;
+		.title{
+			font-size: 14px;
+			color:#606266;
+			padding: 5px 0px;
+			font-weight: 600;
+		}
+		.tableStyle{
+			width: 100%;
+			// border-top: 1px solid #000;
+			// border-left: 1px solid #000;
+			thead{
+				tr{
+				    text-align: center;
+					line-height: 25px;
+					background: #f8f8f9;
+					th{
+						padding: 0;
+						color:#606266;
+						border-bottom: 1px solid #dfe6ec;
+						// border-right: 1px solid #000;
+						// border-bottom: 1px solid #000;
+					}	
 				}
-
-				if(this.queryParams.supplierName.indexOf(objs[i].supplierName)<0){
-				  desc = desc + objs[i].supplierName + ',';
+			}
+			tbody tr{	
+					text-align: center;
+					line-height: 25px;
+					td{
+						padding: 0;
+						border-bottom: 1px solid #dfe6ec;
+						color:#86898b;
+					}			
+			}
+		}
+	}
+	.top-right-table{
+		width: 48%;
+		height: 100%;
+		.title{
+			font-size: 14px;
+			color:#606266;
+			padding: 5px 0px;
+			font-weight: 600;
+		}
+		.tableStyle{
+			width: 100%;
+			// border-top: 1px solid #000;
+			// border-left: 1px solid #000;
+			thead{
+				tr{
+				    text-align: center;
+					line-height: 50px;
+					background: #f8f8f9;
+					th{
+						padding: 0;
+						color:#606266;
+						border-bottom: 1px solid #dfe6ec;
+						// border-right: 1px solid #000;
+						// border-bottom: 1px solid #000;
+					}	
 				}
 			}
-			this.queryParams.supplierCode += code;
-			this.queryParams.supplierName += desc;
-		},
-		// 新增—删除标签
-		handleClose(tag) {
-			this.selectMaterielListtag.splice(this.selectMaterielListtag.indexOf(tag.supplierName), 1);
-
-			var code = "";
-			var desc = "";
-			for (let i = 0; i < this.selectMaterielListtag.length; i++) {
-				code = code + this.selectMaterielListtag[i].supplierCode + ",";
-				desc = desc + this.selectMaterielListtag[i].supplierName + ",";
+			tbody tr{	
+					text-align: center;
+					line-height: 25px;
+					td{
+						padding: 0;
+						border-bottom: 1px solid #dfe6ec;
+						color:#86898b;
+					}			
 			}
-			this.queryParams.supplierCode += code;
-			this.queryParams.supplierName += desc;
 		}
 	}
-};
-</script>
-<style lang="scss" scoped>
+}
+.bottom-echart{
+	display: flex;
+	justify-content: space-between;
+	width: 1450px;
+	height: 240px;
+	padding-top: 15px;
+	.left-echart{
+		width: 48%;
+		height: 100%;
+		.title{
+			font-size: 14px;
+			color:#606266;
+			padding: 5px 0px;
+			font-weight: 600;
+		}
+	}
+	.right-echart{
+		width: 48%;
+		height: 100%;
+		.title{
+			font-size: 14px;
+			color:#606266;
+			padding: 5px 0px;
+			font-weight: 600;
+		}
+	}
+}
 .tagbox {
   display: flex;
   /* overflow: scroll; */

From b2c2ba25c2cbc7f7ec31f3001fa3f2a097d4b27b Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 20 Aug 2024 10:35:40 +0800
Subject: [PATCH 18/19] =?UTF-8?q?2024-08-20=20=E8=AE=BE=E5=A4=87-=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=A1=B9-=E5=8A=A0=E5=91=A8=E6=9C=9F=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/item/index.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index 6cbe2f8..f718670 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -54,6 +54,20 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="周期" prop="itemLoopType">
+        <el-select
+          v-model="queryParams.itemLoopType"
+          placeholder="请选择周期类型"
+          clearable
+        >
+          <el-option
+            v-for="dict in dict.type.device_loop_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="false" label="维护类型名称" prop="itemTypeName">
         <el-input
           class="my-select-input"

From be55e95b1986e531acf666f547f045fac708c38e Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 20 Aug 2024 18:47:59 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E9=95=BF=E5=AE=BD=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/product/index.vue | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 234985d..9853560 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -317,15 +317,7 @@
 				<el-form-item label="69码" prop="skuBarcode">
 					<el-input v-model="form.skuBarcode" placeholder="请输入69码" />
 				</el-form-item>
-				<el-form-item label="长" prop="length">
-					<el-input v-model="form.length" placeholder="请输入长" />
-				</el-form-item>
-				<el-form-item label="宽" prop="width">
-					<el-input v-model="form.width" placeholder="请输入宽" />
-				</el-form-item>
-				<el-form-item label="高" prop="height">
-					<el-input v-model="form.height" placeholder="请输入高" />
-				</el-form-item>
+
 				<el-form-item label="毛重" prop="grossWeight">
 					<el-input v-model="form.grossWeight" placeholder="请输入毛重" />
 				</el-form-item>
@@ -386,8 +378,8 @@
         </el-form-item>
 
          <el-form-item label="标准模板" prop="mvgr5">
-					<el-input v-model="form.mvgr5" placeholder="请输入建议标准模板" />
-				</el-form-item> 
+					<el-input v-model="form.mvgr5" placeholder="请输入建议标准模板" style="width: 320px" />
+				</el-form-item>
 
         <el-form-item label="是否启用" prop="activeFlag">
           <el-select
@@ -405,6 +397,23 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="长" prop="length" label-width="50px">
+              <el-input type="number" v-model="form.length" placeholder="请输入长" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="宽" prop="width" label-width="50px">
+              <el-input type="number" v-model="form.width" placeholder="请输入宽" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="高" prop="height" label-width="50px">
+              <el-input type="number" v-model="form.height" placeholder="请输入高" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <!-- <el-form-item label="${comment}" prop="syncFlag">
 					<el-input v-model="form.syncFlag" placeholder="请输入${comment}" />
 				</el-form-item>