From aac056665900b7fd3bf2cca6a15b4ad8c7d6c3c0 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Wed, 25 Dec 2024 10:42:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=82=B9=E6=A3=80=E5=8C=85?=
 =?UTF-8?q?=E5=85=BB=E9=A1=B9=E7=9B=AE=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=87=E9=95=BF=E6=A0=A1=E9=AA=8C=E3=80=82?=
 =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=8C=85=E5=85=BB=E8=AE=A1=E5=88=92=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3=E3=80=82=E6=9D=A5=E6=96=99=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95=E4=B8=AD=E6=8E=A5=E6=94=B6=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8E=E5=90=88=E6=A0=BC=E6=95=B0=E4=B8=8D=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dvsubjectSelect/multi.vue | 25 ++++++++++++------------
 src/views/mes/dv/subject/index.vue       | 15 +++++++++-----
 src/views/mes/qc/iqc/iqc.vue             | 24 +++++++++++++++++++++--
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/components/dvsubjectSelect/multi.vue b/src/components/dvsubjectSelect/multi.vue
index a205660..fc81c82 100644
--- a/src/components/dvsubjectSelect/multi.vue
+++ b/src/components/dvsubjectSelect/multi.vue
@@ -23,16 +23,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目类型" prop="subjectType">
-        <el-select v-model="queryParams.subjectType" placeholder="请选择项目类型" clearable>
-          <el-option
-            v-for="dict in dict.type.mes_dvsubject_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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>
@@ -56,7 +46,7 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -68,7 +58,7 @@
         <el-button type="primary" @click="confirmSelect">确 定</el-button>
         <el-button @click="showFlag=false">取 消</el-button>
     </div>
-  </el-dialog>  
+  </el-dialog>
 </template>
 
 <script>
@@ -81,7 +71,7 @@ export default {
   },
   data() {
     return {
-      showFlag:false,      
+      showFlag:false,
       // 遮罩层
       loading: true,
       // 选中数组s
@@ -128,9 +118,18 @@ export default {
         this.loading = false;
       });
     },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {}
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.subjectType = this.subjectType
+      this.getList();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
       this.getList();
     },
     // 多选框选中数据
diff --git a/src/views/mes/dv/subject/index.vue b/src/views/mes/dv/subject/index.vue
index c216165..23606ba 100644
--- a/src/views/mes/dv/subject/index.vue
+++ b/src/views/mes/dv/subject/index.vue
@@ -114,7 +114,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -137,7 +137,7 @@
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -171,7 +171,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="项目内容" prop="subjectContent">          
+        <el-form-item label="项目内容" prop="subjectContent">
           <el-input type="textarea" v-model="form.subjectContent" placeholder="请输入项目内容" />
         </el-form-item>
         <el-form-item label="标准" prop="subjectStandard">
@@ -229,13 +229,18 @@ export default {
       // 表单校验
       rules: {
         subjectCode: [
-          { required: true, message: "项目编码不能为空", trigger: "blur" }
+          { required: true, message: "项目编码不能为空", trigger: "blur" },
+          { max: 64, message: "字段过长", trigger: "blur" }
         ],
         subjectType: [
           { required: true, message: "请选择项目类型", trigger: "blur" }
         ],
+        subjectName: [
+          { max: 100, message: "字段过长", trigger: "blur" }
+        ],
         subjectContent: [
-          { required: true, message: "项目内容不能为空", trigger: "blur" }
+          { required: true, message: "项目内容不能为空", trigger: "blur" },
+          { max: 250, message: "字段过长", trigger: "blur" }
         ],
         enableFlag: [
           { required: true, message: "是否启用不能为空", trigger: "blur" }
diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue
index 71c90b6..962d8b2 100644
--- a/src/views/mes/qc/iqc/iqc.vue
+++ b/src/views/mes/qc/iqc/iqc.vue
@@ -296,7 +296,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="合格品数量" prop="quantityQualified">
-              <el-input :min="0" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
+              <el-input-number :min="0" v-model="form.quantityQualified" placeholder="请输入合格品数量" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -305,7 +305,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-            <el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="来料日期" prop="reciveDate">
               <el-date-picker clearable
@@ -619,6 +619,26 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      // 判断接收总数与合格不合格数之间的校验
+      if (this.form.quantityQualified != '' && this.form.quantityQualified != undefined && this.form.quantityQualified != 0
+        && this.form.quantityUnqualified != '' && this.form.quantityUnqualified != undefined && this.form.quantityUnqualified != 0) {
+        if ((this.form.quantityQualified + this.form.quantityUnqualified) != this.form.quantityRecived) {
+          this.$message.warning("合格数与不合格数之和必须等于接收总数！");
+          return
+        }
+      }
+      if (this.form.quantityQualified != '' && this.form.quantityQualified != undefined) {
+        if (this.form.quantityQualified > this.form.quantityRecived) {
+          this.$message.warning("合格数不能大于接收总数！");
+          return
+        }
+      }
+      if (this.form.quantityUnqualified != '' && this.form.quantityUnqualified != undefined) {
+        if (this.form.quantityUnqualified > this.form.quantityRecived) {
+          this.$message.warning("不合格数不能大于接收总数！");
+          return
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.iqcId != null) {