Selaa lähdekoodia

优化提交提示,如果长期按钮打开,那么日期检查不生效

Guos 20 tuntia sitten
vanhempi
commit
1d6bf7bdae
1 muutettua tiedostoa jossa 18 lisäystä ja 51 poistoa
  1. 18 51
      src/views/hisStore/storeProduct/index.vue

+ 18 - 51
src/views/hisStore/storeProduct/index.vue

@@ -953,7 +953,7 @@
         <div v-if="form.isDrug === '1'">
         <el-form-item v-if="form.isShow==='1'" label="审核说明" prop="reviewAudit">
           <el-select style="width: 240px" v-model="form.reviewAudit" placeholder="请选择审核说明" clearable
-                     @change="handleReviewAudit"  size="small">
+                    size="small">
             <el-option
               v-for="item in reviewAuditOptions"
               :key="item.dictValue"
@@ -972,7 +972,7 @@
         </el-form-item>
 
         <el-form-item v-if="form.isShow === '1' && businessArr.length > 0" label="生产企业营业执照是否长期有效" prop="isBusinessPermanent">
-          <el-switch @change="switchChange()" v-model="businessValue" active-color="#13ce66" inactive-color="#ff4949" />
+          <el-switch v-model="businessValue" active-color="#13ce66" inactive-color="#ff4949" />
         </el-form-item>
 
           <el-form-item v-if="form.isShow === '1' && businessArr.length > 0 && !businessValue" prop="businessExpire">
@@ -992,7 +992,7 @@
         </el-form-item>
 
         <el-form-item v-if="form.isShow === '1' && licenseArr.length > 0" label="生产企业的生产许可证/备案凭证是否长期有效" prop="isLicensePermanent">
-            <el-switch @change="switchChange()" v-model="licenseValue" active-color="#13ce66" inactive-color="#ff4949" />
+            <el-switch v-model="licenseValue" active-color="#13ce66" inactive-color="#ff4949" />
         </el-form-item>
 
           <el-form-item v-if="form.isShow === '1' && licenseArr.length > 0 && !licenseValue" prop="licenseExpire">
@@ -1012,7 +1012,7 @@
         </el-form-item>
 
         <el-form-item v-if="form.isShow === '1' && licenseArr.length > 0" label="商品注册证/备案凭证是否长期有效" prop="isCertificatePermanent">
-          <el-switch @change="switchChange()" v-model="certificateValue" active-color="#13ce66" inactive-color="#ff4949" />
+          <el-switch v-model="certificateValue" active-color="#13ce66" inactive-color="#ff4949" />
         </el-form-item>
 
         <el-form-item v-if="form.isShow === '1' && certificateArr.length > 0 && !certificateValue" prop="certificateExpire">
@@ -1138,8 +1138,6 @@
     <el-table-column label="目录名称" align="center" prop="directoryName" />
     <el-table-column label="产品描述" align="center" prop="productDescription" />
     <el-table-column label="产品用途" align="center" prop="usageStr" />
-<!--    <el-table-column label="创建时间" align="center" prop="createTime" width="180" />-->
-<!--    <el-table-column label="更新时间" align="center" prop="updateTime" width="180" />-->
   </el-table>
 
   <div slot="footer" class="dialog-footer">
@@ -2581,8 +2579,7 @@ export default {
             this.form.qualificationCertificateStart = this.form.qualificationExpire[0];
             this.form.qualificationCertificateEnd = this.form.qualificationExpire[1];
           }
-
-          //无语,有的时候要删除,删除了又要加回来。
+          //删除后加回来。
           if (!!this.businessValue) {
             this.form.isBusinessPermanent = 1;
           } else {
@@ -2600,7 +2597,6 @@ export default {
           } else {
             this.form.isCertificatePermanent = 0;
           }
-
           // // 组装companyIds
           // if (this.form.companyIds != null && this.form.companyIds != undefined) {
           //   this.form.companyIds = this.form.companyIds.join(',');
@@ -2684,12 +2680,13 @@ export default {
       }).catch(function() {
       });
     },
-    handleReviewAudit() {
-      console.log("aaaaaaaaaaaaaaa->", this.form.reviewAudit);
-    },
-    switchChange() {
-      console.log(this.form.isBusinessLicensePermanent);
-    },
+    //没有任何实际操作
+    // handleReviewAudit() {
+    //   console.log("aaaaaaaaaaaaaaa->", this.form.reviewAudit);
+    // },
+    // switchChange() {
+    //   console.log(this.form.isBusinessLicensePermanent);
+    // },
     showOperLog(row) {
       getAuthInfo(row.productId).then(response => {
         this.auditLogs = response.auditLog;
@@ -2731,10 +2728,9 @@ export default {
       this.licenseExpireError = '';
       this.certificateExpireError = '';
     },
-
-    // 统一校验证书有效期(返回错误信息或null)
-    checkCertificateExpire(dates, certName) {
-      if (dates && dates.length === 2) {
+    // 统一校验证书有效期(返回错误信息或null),新增如果选择长期按钮打开,验证就会跳过
+    checkCertificateExpire(dates, flag, certName) {
+      if (dates && dates.length === 2 && !flag) {
         const endDate = new Date(dates[1]);
         const today = new Date();
         today.setHours(0, 0, 0, 0);
@@ -2744,48 +2740,19 @@ export default {
       }
       return null;
     },
-
     // 检查所有证书是否过期(提交时使用)
     checkAllCertificatesExpire() {
       // 按顺序检查,返回第一个过期的证书错误信息
       let error = null;
-
-      error = this.checkCertificateExpire(this.form.businessExpire, '营业执照');
+      error = this.checkCertificateExpire(this.form.businessExpire, this.businessValue,'生产企业营业执照');
       if (error) return error + '后再提交!';
-
-      error = this.checkCertificateExpire(this.form.licenseExpire, '生产许可证');
+      error = this.checkCertificateExpire(this.form.licenseExpire, this.licenseValue,'生产企业的生产许可证/备案凭证');
       if (error) return error + '后再提交!';
-
-      error = this.checkCertificateExpire(this.form.certificateExpire, '注册证');
+      error = this.checkCertificateExpire(this.form.certificateExpire, this.certificateValue,'商品注册证/备案凭证');
       if (error) return error + '后再提交!';
-
       return null;
     },
 
-    // 校验所有证书并更新错误提示(用于实时显示)
-    validateAllExpires() {
-      this.validateBusinessExpire(this.form.businessExpire);
-      this.validateLicenseExpire(this.form.licenseExpire);
-      this.validateCertificateExpire(this.form.certificateExpire);
-    },
-
-    // 验证营业执照有效期
-    validateBusinessExpire(dates) {
-      const error = this.checkCertificateExpire(dates, '营业执照');
-      this.businessExpireError = error ? error + '!' : '';
-    },
-
-    // 验证生产许可证有效期
-    validateLicenseExpire(dates) {
-      const error = this.checkCertificateExpire(dates, '生产许可证');
-      this.licenseExpireError = error ? error + '!' : '';
-    },
-
-    // 验证注册证有效期
-    validateCertificateExpire(dates) {
-      const error = this.checkCertificateExpire(dates, '注册证');
-      this.certificateExpireError = error ? error + '!' : '';
-    },
     // 添加一个新的方法用于初始化处方药相关规则
     initPrescriptionDrugRules() {
       // 初始化处方药相关字段的校验规则