From ec6086c99a5ce53bff1be23df5a30b5d03230e23 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, 13 Oct 2023 17:19:16 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-13=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/eamWorkPlanForCheck.vue | 10 ++-
 .../modules/eam/eamWorkPlanForMaintenance.vue | 12 +++-
 src/views/modules/qc/IQCResultEntry.vue       | 51 ++++++++++----
 src/views/modules/qc/qcTemplate.vue           | 68 +++++--------------
 4 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 35629d8..0bc3b3e 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -106,7 +106,7 @@
         width="200"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="createOrder(scope.row)">下达</a>
+          <a type="text" size="small" :style='pointerEvents' v-if="scope.row.status==='已计划'" @click="createOrder(scope.row)">下达</a>
           <a type="text" size="small" v-if="scope.row.status==='进行中'" @click="planOrder(scope.row)">计划</a>
           <a type="text" size="small" v-if="scope.row.status!='已结束' && scope.row.status!='已取消'" @click="cancelPlan(scope.row)">取消</a>
           <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="updateModal(scope.row)">编辑</a>
@@ -1554,6 +1554,7 @@
           name:"周末",
           id:'A'
         },
+        pointerEvents: ''
       }
     },
     mounted () {
@@ -2308,6 +2309,8 @@
 
       // 下达
       createOrder(row){
+        // 将按钮失效，防止重复提交
+        this.pointerEvents = 'pointer-events: none'
         let tempData = {
           site: row.site,
           planID: row.planID,
@@ -2322,12 +2325,14 @@
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
+            this.pointerEvents = ''
           }
         })
         if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
           this.$alert('计划开始日期小于今天！请修改开始日期', '错误', {
             confirmButtonText: '确定'
           })
+          this.pointerEvents = ''
           return false
         }
         this.$confirm(`是否下达点检工单?`, '提示', {
@@ -2337,6 +2342,7 @@
         }).then(() => {
           createEamWorkOrder(tempData).then(({data}) => {
             if (data && data.code === 0) {
+              this.pointerEvents = ''
               this.getDataList()
               this.$message({
                 message: '操作成功',
@@ -2348,9 +2354,11 @@
               this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
+              this.pointerEvents = ''
             }
           })
         }).catch(() => {
+          this.pointerEvents = ''
         })
       },
 
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index c4aa7d8..cbc00b2 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -92,7 +92,7 @@
       width="160"
       label="操作">
       <template slot-scope="scope">
-        <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="createOrder(scope.row)">下达</a>
+        <a type="text" size="small" :style='pointerEvents' v-if="scope.row.status==='已计划'" @click="createOrder(scope.row)">下达</a>
         <a type="text" size="small" v-if="scope.row.status==='进行中'" @click="planOrder(scope.row)">计划</a>
         <a type="text" size="small" v-if="scope.row.status!='已结束'&&scope.row.status!='已取消'" @click="cancelPlan(scope.row)">取消</a>
         <a type="text" size="small" v-if="scope.row.status==='已计划'" @click="updateModal(scope.row)">编辑</a>
@@ -1514,7 +1514,8 @@
               trigger: 'change'
             }
           ],
-        }
+        },
+        pointerEvents: ''
       }
     },
     mounted () {
@@ -2201,6 +2202,8 @@
       },
       // 下达
       createOrder(row){
+        // 将按钮失效，防止重复提交
+        this.pointerEvents = 'pointer-events: none'
         let tempData = {
           site: row.site,
           planID: row.planID,
@@ -2215,12 +2218,14 @@
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'
             })
+            this.pointerEvents = ''
           }
         })
         if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
           this.$alert('计划开始日期小于今天！请修改开始日期', '错误', {
             confirmButtonText: '确定'
           })
+          this.pointerEvents = ''
           return false
         }
         row.userId = this.$store.state.user.name
@@ -2231,6 +2236,7 @@
         }).then(() => {
           createEamWorkOrder(tempData).then(({data}) => {
             if (data && data.code == 0) {
+              this.pointerEvents = ''
               this.getDataList()
               this.$message({
                 message: '操作成功',
@@ -2243,9 +2249,11 @@
               this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
+              this.pointerEvents = ''
             }
           })
         }).catch(() => {
+          this.pointerEvents = ''
         })
       },
       objectIDBlur(){
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 6eeefdc..7a3f93e 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -463,18 +463,6 @@
             status: true,
             fixed: '',
           },
-          {
-            columnProp: 'disposalMeasures',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '处置措施',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
           {
             columnProp: 'taskDate',
             headerAlign: "center",
@@ -559,6 +547,30 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'poOrderNo',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '单据号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'poItemNo',
+            headerAlign: "center",
+            align: "right",
+            columnLabel: '单据行号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'supplierDesc',
             headerAlign: "center",
@@ -583,6 +595,18 @@
             status: true,
             fixed: '',
           },
+          {
+            columnProp: 'disposalMeasures',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '处置措施',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
           {
             columnProp: 'disposalRemark',
             headerAlign: "center",
@@ -1206,8 +1230,7 @@
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {
-                }
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index 63b0273..340f7cb 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -127,7 +127,7 @@
     <!-- 检验模板新增/修改 -->
     <el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验模板名称:" prop="templateName" :rules="rules.templateNameType">
+        <el-form-item label="检验模板名称" prop="templateName" :rules="rules.templateNameType">
           <el-input v-model="modalData.templateName"  style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
@@ -141,32 +141,32 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="samplingProgrammeNo" :rules="rules.samplingProgrammeNoType">
-          <span slot="label" style="" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
+          <span slot="label" @click="getBaseList(1051)"><a herf="#">抽样方案编码</a></span>
           <el-input v-model="modalData.samplingProgrammeNo" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="抽样方案名称:" prop="samplingProgrammeDesc" :rules="rules.samplingProgrammeDescType">
+        <el-form-item label="抽样方案名称">
           <el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item prop="samplingLevelNo" :rules="rules.samplingLevelNoType">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item>
           <span slot="label" style="" @click="getBaseList(1048)"><a herf="#">检验水平编码</a></span>
           <el-input v-model="modalData.samplingLevelNo" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="检验水平名称:" prop="samplingLevelDesc" :rules="rules.samplingLevelDescType">
+        <el-form-item label="检验水平名称">
           <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="检验周期(h):">
+        <el-form-item label="检验周期(h)">
           <el-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="默认抽样数量:">
+        <el-form-item label="默认抽样数量">
           <el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="默认抽样比例:">
+        <el-form-item label="默认抽样比例">
           <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
@@ -182,10 +182,10 @@
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="版本号:">
+        <el-form-item label="版本号">
           <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="检验模板备注:">
+        <el-form-item label="检验模板备注">
           <el-input v-model="modalData.templateRemark"  style="width: 255px"></el-input>
         </el-form-item>
       </el-form>
@@ -790,35 +790,7 @@
               message: ' ',
               trigger: 'change'
             }
-          ],
-          samplingProgrammeNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          samplingProgrammeDescType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          samplingLevelNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          samplingLevelDescType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
+          ]
         }
       }
     },
@@ -1053,20 +1025,16 @@
           this.$message.warning('请输入检验模板名称！')
           return
         }
-        if (this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) {
-          this.$message.warning('请选择抽检方案！')
-          return
-        }
         if (this.modalData.inspectionTypeNo === '' || this.modalData.inspectionTypeNo == null) {
           this.$message.warning('请选择检验类型！')
           return
         }
-        if (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null) {
-          this.$message.warning('请选择检验水平！')
+        if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.defaultSamplingQuantity === '' || this.modalData.defaultSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
+          this.$message.warning('抽样方案、默认抽样数量、默认抽样比例至少选择一项！')
           return
         }
-        if ((this.modalData.defaultSamplingQuantity === '' || this.modalData.defaultSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
-          this.$message.warning('请输入 默认抽样数量 或者 默认抽样比例！')
+        if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) {
+          this.$message.warning('请选择检验水平！')
           return
         }
         if(this.modalData.flag === '1'){