店铺页面新增长期有效，优化详情展示页面

src/views/hisStore/components/storeDetails.vue

@@ -113,7 +113,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="药品经营许可证有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.drugLicenseExpiryStart}} - {{item.drugLicenseExpiryEnd}}</span>
+          <span v-if="item!=null && item.isDrugLicensePermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.drugLicenseExpiryStart}} - {{item.drugLicenseExpiryEnd}}</span>
         </el-descriptions-item>
         <el-descriptions-item label="1类器械生产" v-if="medicalMallConfig.isMedicalMall">
           <el-image
@@ -123,7 +124,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="1类器械生产有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.medicalDevice1ExpiryStart}} - {{item.medicalDevice1ExpiryEnd}}</span>
+          <span v-if="item!=null && item.isMedicalDevice1ExpiryPermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.medicalDevice1ExpiryStart}} - {{item.medicalDevice1ExpiryEnd}}</span>
         </el-descriptions-item>
         <el-descriptions-item label="2类器械备案" v-if="medicalMallConfig.isMedicalMall">
           <el-image
@@ -133,7 +135,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="2类器械备案有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.medicalDevice2ExpiryStart}} - {{item.medicalDevice2ExpiryEnd}}</span>
+          <span v-if="item!=null && item.isMedicalDevice2ExpiryPermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.medicalDevice2ExpiryStart}} - {{item.medicalDevice2ExpiryEnd}}</span>
         </el-descriptions-item>
         <el-descriptions-item label="3类器械营业许可证" v-if="medicalMallConfig.isMedicalMall">
           <el-image
@@ -143,7 +146,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="3类器械营业许可证有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.medicalDevice3ExpiryStart}} - {{item.medicalDevice3ExpiryEnd}}</span>
+          <span v-if="item!=null && item.isMedicalDevice3ExpiryPermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.medicalDevice3ExpiryStart}} - {{item.medicalDevice3ExpiryEnd}}</span>
         </el-descriptions-item>
         <el-descriptions-item label="食品许可证" v-if="medicalMallConfig.isMedicalMall">
           <el-image
@@ -153,7 +157,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="食品许可证有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.foodLicenseExpiryStart}} - {{item.foodLicenseExpiryEnd}}</span>
+          <span v-if="item!=null && item.isFoodLicenseExpiryPermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.foodLicenseExpiryStart}} - {{item.foodLicenseExpiryEnd}}</span>
         </el-descriptions-item>
         <el-descriptions-item label="药品许可证" v-if="medicalMallConfig.isMedicalMall">
           <el-image
@@ -163,7 +168,8 @@
           </el-image>
         </el-descriptions-item>
         <el-descriptions-item label="药品许可证有效期" v-if="medicalMallConfig.isMedicalMall">
-          <span v-if="item!=null">{{item.medicalLicenseExpiryStart}} - {{item.medicalLicenseExpiryEnd}}</span>
+          <span v-if="item!=null && item.isMedicalLicenseExpiryPermanent == 1">长期有效</span>
+          <span v-else-if="item!=null">{{item.medicalLicenseExpiryStart}} - {{item.medicalLicenseExpiryEnd}}</span>
         </el-descriptions-item>
 
 

src/views/hisStore/store/index.vue

@@ -376,7 +376,15 @@
               </el-col>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="药品经营许可证有效期" prop="drugLicenseExpiry">
+              <el-form-item label="药品经营许可证是否长期有效" prop="isDrugLicensePermanent">
+                <el-switch
+                  @change="switchChange()"
+                  v-model="drugLicenseValue"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+              <el-form-item label="药品经营许可证有效期" prop="drugLicenseExpiry" v-if="!drugLicenseValue">
                 <el-date-picker
                   v-model="form.drugLicenseExpiry"
                   type="daterange"
@@ -449,7 +457,15 @@
 
             </el-col>
             <el-col :span="12">
-              <el-form-item label="2类医疗器械备案有效期" prop="medicalDevice2Expiry">
+              <el-form-item label="2类医疗器械备案是否长期有效" prop="isMedicalDevice2ExpiryPermanent">
+                <el-switch
+                  @change="switchChange()"
+                  v-model="medicalDevice2ExpiryValue"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+              <el-form-item label="2类医疗器械备案有效期" prop="medicalDevice2Expiry" v-if="!medicalDevice2ExpiryValue">
                 <el-date-picker
                   v-model="form.medicalDevice2Expiry"
                   type="daterange"
@@ -479,7 +495,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="3类器械经营许可证有效期" prop="medicalDevice3Expiry">
+              <el-form-item label="3类器械经营许可证是否长期有效" prop="isMedicalDevice3ExpiryPermanent">
+                <el-switch
+                  @change="switchChange()"
+                  v-model="medicalDevice3ExpiryValue"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+              <el-form-item label="3类器械经营许可证有效期" prop="medicalDevice3Expiry" v-if="!medicalDevice3ExpiryValue">
                 <el-date-picker
                   v-model="form.medicalDevice3Expiry"
                   type="daterange"
@@ -509,7 +533,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="食品经营许可证有效期" prop="foodLicenseExpiry">
+              <el-form-item label="食品经营许可证是否长期有效" prop="isFoodLicenseExpiryPermanent">
+                <el-switch
+                  @change="switchChange()"
+                  v-model="foodLicenseExpiryValue"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+              <el-form-item label="食品经营许可证有效期" prop="foodLicenseExpiry" v-if="!foodLicenseExpiryValue">
                 <el-date-picker
                   v-model="form.foodLicenseExpiry"
                   type="daterange"
@@ -539,7 +571,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="医疗机构执业许可证有效期" prop="medicalLicenseExpiry">
+              <el-form-item label="医疗机构执业许可证是否长期有效" prop="isMedicalLicenseExpiryPermanent">
+                <el-switch
+                  @change="switchChange()"
+                  v-model="medicalLicenseExpiryValue"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+
+              <el-form-item label="医疗机构执业许可证有效期" prop="medicalLicenseExpiry" v-if="!medicalLicenseExpiryValue">
                 <el-date-picker
                   v-model="form.medicalLicenseExpiry"
                   type="daterange"
@@ -763,6 +804,11 @@ export default {
       dialogVisible: false,
       switchValue:false,
       switchMedicalValue:false,
+      drugLicenseValue:false,
+      medicalDevice2ExpiryValue:false,
+      medicalDevice3ExpiryValue:false,
+      foodLicenseExpiryValue:false,
+      medicalLicenseExpiryValue:false,
       show: {
         title: "店铺详情",
         open: false,
@@ -1167,6 +1213,21 @@ export default {
         if(this.form.isMedicalDevice1ExpiryPermanent == 1){
           this.switchMedicalValue = true;
         }
+        if(this.form.isDrugLicensePermanent == 1){
+          this.drugLicenseValue = true;
+        }
+        if(this.form.isMedicalDevice2ExpiryPermanent == 1){
+          this.medicalDevice2ExpiryValue = true;
+        }
+        if(this.form.isMedicalDevice3ExpiryPermanent == 1){
+          this.medicalDevice3ExpiryValue = true;
+        }
+        if(this.form.isFoodLicenseExpiryPermanent == 1){
+          this.foodLicenseExpiryValue = true;
+        }
+        if(this.form.isMedicalLicenseExpiryPermanent == 1){
+          this.medicalLicenseExpiryValue = true;
+        }
         this.open = true;
         this.title = "修改店铺";
 
@@ -1304,6 +1365,31 @@ export default {
           }else {
             formData.isMedicalDevice1ExpiryPermanent=0;
           }
+          if(!!this.drugLicenseValue){
+            formData.isDrugLicensePermanent=1;
+          }else {
+            formData.isDrugLicensePermanent=0;
+          }
+          if(!!this.medicalDevice2ExpiryValue){
+            formData.isMedicalDevice2ExpiryPermanent=1;
+          }else {
+            formData.isMedicalDevice2ExpiryPermanent=0;
+          }
+          if(!!this.medicalDevice3ExpiryValue){
+            formData.isMedicalDevice3ExpiryPermanent=1;
+          }else {
+            formData.isMedicalDevice3ExpiryPermanent=0;
+          }
+          if(!!this.foodLicenseExpiryValue){
+            formData.isFoodLicenseExpiryPermanent=1;
+          }else {
+            formData.isFoodLicenseExpiryPermanent=0;
+          }
+          if(!!this.medicalLicenseExpiryValue){
+            formData.isMedicalLicenseExpiryPermanent=1;
+          }else {
+            formData.isMedicalLicenseExpiryPermanent=0;
+          }
           if (formData.storeId != null) {
             updateStore(formData).then(response => {
               this.msgSuccess("修改成功");