2 Commits 67c988dbed ... 4e5af6b58b

Author SHA1 Message Date
  Guos 4e5af6b58b Merge remote-tracking branch 'origin/yjb_ScrmStores' into yjb_ScrmStores 2 days ago
  Guos d8dc071716 隐藏生产批号/序列号 2 days ago

+ 29 - 29
src/views/hisStore/storeProduct/index.vue

@@ -99,15 +99,15 @@
           />
         </el-form-item>
 
-        <el-form-item label="批号" prop="batchNumber">
-          <el-input
-            v-model="queryParams.batchNumber"
-            placeholder="请输入批号"
-            clearable
-            size="small"
+<!--        <el-form-item label="批号" prop="batchNumber">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.batchNumber"-->
+<!--            placeholder="请输入批号"-->
+<!--            clearable-->
+<!--            size="small"-->
 
-          />
-        </el-form-item>
+<!--          />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="上市许可持有人" prop="mah">
           <el-input
@@ -587,11 +587,11 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="批号" prop="batchNumber">
-                  <el-input v-model="form.batchNumber" placeholder="请输入批号"/>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="生产号/序列号" prop="batchNumber">-->
+<!--                  <el-input v-model="form.batchNumber" placeholder="请输入生产批号/序列号"/>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="规格" prop="prescribeSpec">
                   <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
@@ -1409,19 +1409,19 @@ export default {
           this.debounceCheckStoreLicense();
         }
         // 动态调整批号的验证规则
-        this.$nextTick(() => {
-          if (this.isMedicalDeviceCategory) {
-            // 是器械时,批号为必填
-            if (!this.rules.batchNumber?.some(rule => rule.required)) {
-              this.rules.batchNumber = [{ required: true, message: "批号不能为空", trigger: "blur" }, ...(this.rules.batchNumber || [])];
-            }
-          } else {
-            // 非器械时,移除批号必填规则
-            if (this.rules.batchNumber) {
-              this.rules.batchNumber = this.rules.batchNumber.filter(rule => !rule.required);
-            }
-          }
-        });
+        // this.$nextTick(() => {
+        //   if (this.isMedicalDeviceCategory) {
+        //     // 是器械时,批号为必填
+        //     if (!this.rules.batchNumber?.some(rule => rule.required)) {
+        //       this.rules.batchNumber = [{ required: true, message: "批号不能为空", trigger: "blur" }, ...(this.rules.batchNumber || [])];
+        //     }
+        //   } else {
+        //     // 非器械时,移除批号必填规则
+        //     if (this.rules.batchNumber) {
+        //       this.rules.batchNumber = this.rules.batchNumber.filter(rule => !rule.required);
+        //     }
+        //   }
+        // });
       },
       immediate: true
     },
@@ -1714,9 +1714,9 @@ export default {
         unitPrice: [
           {required: true, message: "单价不能为空", trigger: "blur"}
         ],
-        batchNumber: [
-          {required: true, message: "批号不能为空", trigger: "blur"}
-        ],
+        // batchNumber: [
+        //   {required: true, message: "批号不能为空", trigger: "blur"}
+        // ],
         mah: [
           {required: true, message: "上市许可持有人不能为空", trigger: "blur"}
         ],

+ 8 - 8
src/views/hisStore/storeProductAudit/index.vue

@@ -247,11 +247,11 @@
             </el-row>
 
             <el-row>
-              <el-col :span="12">
-                <el-form-item label="批号" prop="batchNumber">
-                  <el-input v-model="form.batchNumber" placeholder="请输入批号"/>
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="12">-->
+<!--                <el-form-item label="生产号/序列号" prop="batchNumber">-->
+<!--                  <el-input v-model="form.batchNumber" placeholder="请输入生产批号/序列号"/>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="规格" prop="prescribeSpec">
                   <el-input v-model="form.prescribeSpec" placeholder="请输入规格"/>
@@ -1049,9 +1049,9 @@ export default {
         unitPrice: [
           { required: true, message: "单价不能为空", trigger: "blur" }
         ],
-        batchNumber: [
-          { required: true, message: "批号不能为空", trigger: "blur" }
-        ],
+        // batchNumber: [
+        //   { required: true, message: "批号不能为空", trigger: "blur" }
+        // ],
         mah: [
           { required: true, message: "上市许可持有人不能为空", trigger: "blur" }
         ],