Merge branch 'testing/finance' of...

Merge branch 'testing/finance' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into feature/finance-zs

src/views/goods/rules.js

@@ -116,7 +116,7 @@ const rules = {
 const rules3 = {
   goodsName: [
     { required: true, message: "请输入商品名称", trigger: "submit" },
-    { validator: checkProjectStr, trigger: "submit" },
+    // { validator: checkProjectStr, trigger: "submit" },
   ],
   goodsDescription: [
     { required: true, message: "请输入商品介绍", trigger: "submit" },

src/views/shop/create-shop.vue

@@ -851,7 +851,8 @@
                 </div>
               </el-form-item>
               <el-form-item label="资质信息" class="required-label" v-if="formData.storeType < 3">
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0 || formData.storeType == 2">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0 || formData.storeType == 2"> -->
+                <div v-if="imgUrlP7Show || formData.storeType == 2">
                   <p v-if="certifyValidDtoList(7)" class="red">{{certifyValidDtoList(7)}}</p>
                   <p class="tips">药品经营许可证</p>
                   <el-form-item prop="imgUrlP7">
@@ -950,7 +951,8 @@
 <!--                    </el-date-picker>-->
 <!--                  </el-form-item>-->
 <!--                </div>-->
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0"> -->
+                <div v-if="imgUrlP9Show">
                   <p v-if="certifyValidDtoList(9)" class="red">{{certifyValidDtoList(9)}}</p>
                   <p class="tips">食品经营(流通)许可证</p>
                   <el-form-item prop="imgUrlP9">
@@ -999,7 +1001,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0"> -->
+                <div v-if="imgUrlP10Show">
                   <p v-if="certifyValidDtoList(10)" class="red">{{certifyValidDtoList(10)}}</p>
                   <p class="tips">医疗器械经营许可证</p>
                   <el-form-item prop="imgUrlP10">
@@ -1048,7 +1051,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0"> -->
+                <div v-if="imgUrlP13Show">
                   <p class="tips">医疗器械网络销售备案</p>
                   <el-form-item prop="imgUrlP13">
                   <el-upload
@@ -1096,7 +1100,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0"> -->
+                <div v-if="imgUrlP11Show">
                   <p v-if="certifyValidDtoList(11)" class="red">{{certifyValidDtoList(11)}}</p>
                   <p class="tips">二类医疗器械经营备案凭证</p>
                   <el-form-item prop="imgUrlP11">
@@ -1699,6 +1704,21 @@ export default {
   computed: {
     certifyStatusColor () {
       return `certifyStatusColor${this.certifyStatus}`;
+    },
+    imgUrlP7Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0
+    },
+    imgUrlP9Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0
+    },
+    imgUrlP10Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0
+    },
+    imgUrlP11Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0
+    },
+    imgUrlP13Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0
     }
   },
   watch: {
@@ -1914,6 +1934,47 @@ export default {
       });
     },
     completeWholeForm() {
+      console.log(this.controlLicense,this.formData);
+      if(!this.imgUrlP7Show){
+        this.formData.imgUrlP7 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 7) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP9Show){
+        this.formData.imgUrlP9 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 9) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP10Show){
+        this.formData.imgUrlP10 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 10) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP11Show){
+        this.formData.imgUrlP11 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 11) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP13Show){
+        this.formData.imgUrlP13 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 13) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
       let flag = this.submitForm();
       if (flag && this.certifyStatus == 3) {
         this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', {