Merge branch 'feature/zl' into 'release'

fix:经营范围问题修改

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!398

src/views/shop/create-shop.vue

@@ -985,7 +985,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.includes('2')">
+                <div v-if="controlLicense.includes(3)">
                   <p v-if="certifyValidDtoList(10)" class="red">{{certifyValidDtoList(10)}}</p>
                   <p class="tips">医疗器械经营许可证</p>
                   <el-form-item prop="imgUrlP10">
@@ -1082,7 +1082,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.includes('2')">
+                <div v-if="controlLicense.includes(2)">
                   <p v-if="certifyValidDtoList(11)" class="red">{{certifyValidDtoList(11)}}</p>
                   <p class="tips">二类医疗器械经营备案凭证</p>
                   <el-form-item prop="imgUrlP11">
@@ -1683,12 +1683,14 @@ export default {
   watch: {
     "formData.certifyReq.bizScope": {
       handler(val) {
+        console.log(val);
         const j = [];
         if(val) {
           val.map( i => {
-            i.type && j.push(String(i.type))
+            i.type && j.push(String(i.type),i.id)
           })
           this.controlLicense = j;
+          console.log(this.controlLicense);
         }
       },
       deep: true,
@@ -2478,6 +2480,7 @@ export default {
       const n = checkedNodes.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
       vm.formData.certifyReq.bizScope = n;
       this.bizScopeCasValue = v;
+      console.log(this.bizScopeCasValue ,this.controlLicense);
     },
     // 获取裁剪的图片数据
     getCropImg(argument) {
@@ -2652,6 +2655,7 @@ export default {
               item.list = res.data.filter(v => v.type == item.id.charAt(0) );
             });
             this.orgScopeLIST = m;
+            console.log(this.orgScopeLIST);
           }
         });
         resolve(true);