From 0618112d9948226604fd7749cf07634ee8c3a675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Fri, 25 Aug 2023 17:31:11 +0800
Subject: [PATCH] =?UTF-8?q?2023-08-25=20=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamAdmin.vue            |  1 -
 src/views/modules/eam/eamPropertiesItem.vue   | 82 +++++++++++++------
 .../modules/eam/eamWorkOrderForCheck.vue      |  1 -
 src/views/modules/eam/eamWorkPlanForCheck.vue |  6 +-
 .../reportWorkOrder/reportCheckOrder.vue      | 61 +++++++-------
 .../reportWorkOrder/reportDefectOrder.vue     | 14 ++--
 6 files changed, 102 insertions(+), 63 deletions(-)

diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue
index f1f269a..5af8890 100644
--- a/src/views/modules/eam/eamAdmin.vue
+++ b/src/views/modules/eam/eamAdmin.vue
@@ -231,7 +231,6 @@
     eamAdminSave,
     eamAdminEdit,
     eamAdminDelete,
-    initAdminLevel,
     getEmpyDeptList,
     getMesList, // 获取可用的MES账号
   } from "@/api/eam/eam.js"
diff --git a/src/views/modules/eam/eamPropertiesItem.vue b/src/views/modules/eam/eamPropertiesItem.vue
index 90cea52..35a1fce 100644
--- a/src/views/modules/eam/eamPropertiesItem.vue
+++ b/src/views/modules/eam/eamPropertiesItem.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="mod-config">
     <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
+      <span @click="favoriteFunction()">
+        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+      </span>
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item :label="'点检项目编码'">
@@ -106,7 +106,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="点检方法说明:">
-          <el-input v-model="modalData.itemRemark" style="width: 224px"></el-input>
+          <el-input v-model="modalData.itemRemark" style="width: 160px"></el-input>
         </el-form-item>
         <el-form-item :label="'是否值可选'" prop="valueChooseFlag" :rules="rules.valueChooseFlagType">
           <el-select v-model="modalData.valueChooseFlag" style="width: 80px">
@@ -117,6 +117,9 @@
         <el-form-item label="图片必填:">
           <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="modalData.imageFlag"/>
         </el-form-item>
+        <el-form-item label="生产管控:">
+          <input type="checkbox" value="Y" name="produceControlRule" v-model="modalData.produceControlFlag"/>
+        </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
@@ -255,19 +258,20 @@
           createdBy: this.$store.state.user.name
         },
         modalData:{
-          flag:'',
-          itemNo:'',
-          itemDesc:'',
-          valueTypeDb:'',
-          defaultValue:'',
-          valueChooseFlag:'',
-          createdBy:this.$store.state.user.name,
-          maxValue:'',
-          minValue:'',
-          itemRemark:'',
-          itemType:'A',
+          flag: '',
+          itemNo: '',
+          itemDesc: '',
+          valueTypeDb: '',
+          defaultValue: '',
+          valueChooseFlag: '',
+          createdBy: this.$store.state.user.name,
+          maxValue: '',
+          minValue: '',
+          itemRemark: '',
+          itemType: 'A',
           updateBy: this.$store.state.user.name,
-          imageFlag: ''
+          imageFlag: '',
+          produceControlFlag: ''
         },
         departmentList:[],
         // 展示列集
@@ -425,6 +429,23 @@
             status: true,
             fixed: '',
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101008,
+            serialNumber: '101008TableValueChooseFlag',
+            tableId: "101008Table",
+            tableName: "common",
+            columnProp: 'produceControlFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '生产管控',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 101008,
@@ -646,7 +667,8 @@
           itemRemark:'',
           itemType:'A',
           updateBy: this.$store.state.user.name,
-          imageFlag: ''
+          imageFlag: '',
+          produceControlFlag: ''
         };
         this.modalDisableFlag = false;
         this.modalFlag = true;
@@ -674,7 +696,8 @@
           itemRemark: row.itemRemark,
           itemType: 'A',
           updateBy: this.$store.state.user.name,
-          imageFlag: row.imageFlag
+          imageFlag: row.imageFlag,
+          produceControlFlag: row.produceControlFlag
         };
         this.modalDisableFlag = true;
         this.modalFlag = true;
@@ -718,15 +741,24 @@
           })
           return false
         }
-        let obj = document.getElementsByName('addWorkOrderRule');
-        let s = '';
-        for (let i = 0; i < obj.length; i++) {
-          if (obj[i].checked) {
-            s += obj[i].value + ',';
+        let obj1 = document.getElementsByName('addWorkOrderRule');
+        let obj2 = document.getElementsByName('produceControlRule');
+        let Rule1 = '';
+        let Rule2 = '';
+        for (let i = 0; i < obj1.length; i++) {
+          if (obj1[i].checked) {
+            Rule1 += obj1[i].value + ',';
+          }
+        }
+        for (let i = 0; i < obj2.length; i++) {
+          if (obj2[i].checked) {
+            Rule2 += obj2[i].value + ',';
           }
         }
-        s = s.substring(0,s.length-1)
-        this.modalData.imageFlag = s
+        Rule1 = Rule1.substring(0,Rule1.length-1)
+        Rule2 = Rule2.substring(0,Rule2.length-1)
+        this.modalData.imageFlag = Rule1
+        this.modalData.produceControlFlag = Rule2
         if(this.modalData.flag === '1'){
           eamPropertiesItemSave(this.modalData).then(({data}) => {
             if (data && data.code === '0') {
diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index b6fc981..ba632a9 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -366,7 +366,6 @@
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
-
         dataList: [],
         dataListLoading: false,
         dataListSelections: [],
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 435ebf4..1e4d0bd 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -12,9 +12,9 @@
       <el-form-item :label="'计划描述'">
         <el-input v-model="searchData.planDesc" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'设备编码'">
-        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>
-      </el-form-item>
+<!--      <el-form-item :label="'设备编码'">-->
+<!--        <el-input v-model="searchData.objectID" style="width: 120px"></el-input>-->
+<!--      </el-form-item>-->
       <el-form-item :label="'计划开始日期：'">
         <el-date-picker
           style="width: 120px"
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index ac9362b..df6621c 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -122,7 +122,7 @@
     </el-pagination>
 
     <el-dialog title="执行点检工单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
-      <el-form :inline="true"  label-position="top" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'工厂编码'">
           <el-input v-model="saveData.site" disabled style="width: 120px"></el-input>
         </el-form-item>
@@ -142,7 +142,7 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
-      <el-form :inline="true"  label-position="top" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'工作时长(m)'">
           <el-input v-model="saveData.workTime" type="number" readonly :min="0" style="width: 60px"></el-input>
         </el-form-item>
@@ -189,7 +189,7 @@
                 :min-width="item.columnWidth"
                 :label="item.columnLabel">
                 <template slot-scope="scope">
-                  <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                  <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
                   <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
                 </template>
               </el-table-column>
@@ -757,6 +757,24 @@
             status: true,
             fixed: '',
             columnWidth: 70,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101019,
+            serialNumber: '101019Table2MinValue',
+            tableId: "101019Table2",
+            tableName: "点检项目表",
+            columnProp: 'produceControlFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '生产控制',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
           }
         ],
         HistoryRecordList: [],
@@ -1142,6 +1160,7 @@
         this.detailModelFlag = true;
       },
       async saveCheckReport(){
+        let tempFlag = 'N'
         if(this.saveData.checkResult === ''|| this.saveData.checkResult == null){
           this.$message.warning('请选择点检结论！')
           return
@@ -1167,37 +1186,23 @@
             this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！')
             return
           }
-          // if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){
-          //   this.detailList[i].itemResult = '合格'
-          // }
-          // if(this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){
-          //   if(this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue){
-          //     await  this.$confirm(this.detailList[i].itemDesc+'实测值小于最小值！是否继续', '提示', {
-          //       confirmButtonText: '确定',
-          //       cancelButtonText: '取消',
-          //       type: 'warning'
-          //     }).then(() => {
-          //     }).then(() =>{
-          //       return false
-          //     })
-          //   }
-          //   if(this.detailList[i].minValue != ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue){
-          //     await this.$confirm(this.detailList[i].itemDesc+'实测值大于最大值！是否继续', '提示', {
-          //       confirmButtonText: '确定',
-          //       cancelButtonText: '取消',
-          //       type: 'warning'
-          //     }).then(() => {
-          //     }).then(() =>{
-          //       return false
-          //     })
-          //   }
-          // }
           if(this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue != '' && this.detailList[i].numberValue != null){
             if((this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){
               this.detailList[i].itemResult = '不合格'
             }
           }
         }
+        if (this.saveData.checkResult == '不合格') {
+          this.detailList.forEach(val => {
+            if (val.itemResult == '不合格') {
+              tempFlag = 'Y'
+            }
+          })
+          if (tempFlag != 'Y') {
+            this.$message.warning('请选择不合格项目！')
+            return
+          }
+        }
         this.saveData.itemList = JSON.parse(JSON.stringify(this.detailList))
         await saveCheckOrderReport(this.saveData).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index f133e6f..88b549a 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="mod-config">
     <div>
-        <span @click="favoriteFunction()">
-         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
-        </span>
+      <span @click="favoriteFunction()">
+        <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>
+      </span>
     </div>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
       <el-form-item style="margin-left: 0px" >
@@ -66,7 +66,7 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -661,7 +661,9 @@
           operatorName: '',
           disposalMeasures: '',
           objectID: '',
-          objectDesc: ''
+          objectDesc: '',
+          checkWorkPlanId: '',
+          checkItemNo: ''
         },
         operatorData: {
           site: this.$store.state.user.site,
@@ -1130,6 +1132,8 @@
           defectDesc: row.defectDesc,
           objectID: row.objectID,
           objectDesc: row.objectDesc,
+          checkWorkPlanId: row.checkWorkPlanId,
+          checkItemNo: row.checkItemNo
         }
         this.queryHistoryRecord();
         this.detailModelFlag = true;