From 4a45c660eec7934fa04c98620c33c7582fc93163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Thu, 19 Oct 2023 15:17:30 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-19=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/qc/qcItem.vue     | 38 +++++++++--------------------
 src/views/modules/qc/qcMethod.vue   | 22 +++--------------
 src/views/modules/qc/qcTemplate.vue | 30 +++++++++++------------
 3 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/src/views/modules/qc/qcItem.vue b/src/views/modules/qc/qcItem.vue
index 736ac50..47e2bf7 100644
--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@@ -122,16 +122,13 @@
     </el-pagination>
 
     <!-- 新增和修改 -->
-    <el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+    <el-dialog title="检验项目" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="项目编码:" prop="itemNo" :rules="rules.itemNoType">
-          <el-input v-model="modalData.itemNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item label="项目名称:" prop="itemDesc" :rules="rules.itemDescType">
-          <el-input v-model="modalData.itemDesc" style="width: 120px"></el-input>
+          <el-input v-model="modalData.itemDesc" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验值类型:" prop="valueTypeDb" :rules="rules.valueTypeDbType">
-          <el-select filterable v-model="modalData.valueTypeDb" style="width: 120px">
+          <el-select filterable v-model="modalData.valueTypeDb" style="width: 221px">
             <el-option label="文本" value="T"></el-option>
             <el-option label="数字" value="N"></el-option>
           </el-select>
@@ -140,13 +137,13 @@
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item prop="methodNo" :rules="rules.methodNoType">
           <span slot="label" style="" @click="getBaseList(1036)"><a herf="#">方法编码</a></span>
-          <el-input v-model="modalData.methodNo" style="width: 120px"></el-input>
+          <el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
-          <el-input v-model="modalData.methodName" disabled style="width: 120px"></el-input>
+          <el-input v-model="modalData.methodName" disabled style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
+          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 143px">
             <el-option
               v-for = "i in options"
               :key = "i.inspectionTypeNo"
@@ -158,16 +155,16 @@
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="参照值:">
-          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 120px"></el-input>
-          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 120px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.defaultValue" style="width: 143px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.defaultValue" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="最大值:">
-          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 120px"></el-input>
-          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 120px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.maxValue" type="number" disabled style="width: 143px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.maxValue" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="最小值:">
-          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 120px"></el-input>
-          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 120px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'T'" v-model="modalData.minValue" type="number" disabled style="width: 143px"></el-input>
+          <el-input v-if="modalData.valueTypeDb === 'N'" v-model="modalData.minValue" type="number" style="width: 143px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -451,13 +448,6 @@
               message: ' ',
               trigger: 'change'
             }
-          ],
-          itemNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
           ]
         },
         options: [],
@@ -626,10 +616,6 @@
         })
       },
       saveData () {
-        if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
-          this.$message.warning('请输入检验项目编码！')
-          return
-        }
         if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
           this.$message.warning('请输入检验项目名称！')
           return
diff --git a/src/views/modules/qc/qcMethod.vue b/src/views/modules/qc/qcMethod.vue
index 080347b..e53a2c8 100644
--- a/src/views/modules/qc/qcMethod.vue
+++ b/src/views/modules/qc/qcMethod.vue
@@ -112,16 +112,13 @@
     </el-pagination>
 
     <!-- 新增和修改 -->
-    <el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="450px">
+    <el-dialog title="检验方法" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="方法编码:" prop="methodNo" :rules="rules.methodNoType">
-          <el-input v-model="modalData.methodNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item label="方法名称:" prop="methodName" :rules="rules.methodNameType">
-          <el-input v-model="modalData.methodName" style="width: 120px"></el-input>
+          <el-input v-model="modalData.methodName" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验类型:" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择">
+          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in options"
               :key = "i.inspectionTypeNo"
@@ -133,7 +130,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item :label="'检验方法说明:'">
-          <el-input v-model="modalData.methodRemark" style="width: 407px"></el-input>
+          <el-input v-model="modalData.methodRemark" style="width: 456px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -297,13 +294,6 @@
           },
         ],
         rules:{
-          methodNoType:[
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
           methodNameType:[
             {
               required: true,
@@ -449,10 +439,6 @@
       },
       // 新增/修改方法
       saveData () {
-        if (this.modalData.methodNo === '' || this.modalData.methodNo == null) {
-          this.$message.warning('请输入检验方法编码！')
-          return
-        }
         if (this.modalData.methodName === '' || this.modalData.methodName == null) {
           this.$message.warning('请输入检验方法名称！')
           return
diff --git a/src/views/modules/qc/qcTemplate.vue b/src/views/modules/qc/qcTemplate.vue
index 76d2ccb..0580c3b 100644
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@@ -125,13 +125,13 @@
     </el-pagination>
 
     <!-- 检验模板新增/修改 -->
-    <el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="430px">
+    <el-dialog title="检验模板" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
       <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-input v-model="modalData.templateName"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.templateName"  style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
-          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 120px">
+          <el-select v-model="modalData.inspectionTypeNo" placeholder="请选择" style="width: 221px">
             <el-option
               v-for = "i in options"
               :key = "i.inspectionTypeNo"
@@ -144,49 +144,49 @@
       <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-input v-model="modalData.samplingProgrammeNo" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="抽样方案名称">
-          <el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 120px"></el-input>
+          <el-input v-model="modalData.samplingProgrammeDesc" disabled style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <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-input v-model="modalData.samplingLevelNo" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验水平名称">
-          <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 120px"></el-input>
+          <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 221px"></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-input v-model="modalData.inspectionCycle" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.inspectionCycle" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="默认抽样数量">
-          <el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.defaultSamplingQuantity" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="默认抽样比例">
-          <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></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="AQL:">
-          <el-input v-model="modalData.aql" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.aql" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="AC:">
-          <el-input v-model="modalData.ac" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.ac" type="number" style="width: 143px"></el-input>
         </el-form-item>
         <el-form-item label="RE:">
-          <el-input v-model="modalData.re" type="number" style="width: 120px"></el-input>
+          <el-input v-model="modalData.re" type="number" style="width: 143px"></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="版本号">
-          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 120px"></el-input>
+          <el-input v-model="modalData.templateVersion" :disabled="modalDisableFlag" style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item label="检验模板备注">
-          <el-input v-model="modalData.templateRemark"  style="width: 255px"></el-input>
+          <el-input v-model="modalData.templateRemark" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">