Merge branch 'feature/zl' into 'release'

fix:委托书必填

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

src/views/shop/create-shop.vue

@@ -594,6 +594,7 @@
                   <div v-if="formData.certifyReq.certType == 2|| formData.storeType == 2 " class="flex-upload">
                     <p v-if="certifyValidDtoList(5)" class="red">{{certifyValidDtoList(5)}}</p>
                     <div>委托书</div>
+                    <el-form-item prop="imgUrlP5" ref="pIdCardBack">
                     <el-upload
                       :disabled="Boolean(formData.imgUrlP5)"
                       v-model="formData.imgUrlP5"
@@ -623,6 +624,7 @@
                         <i class="el-icon-delete"></i>
                       </div>
                     </el-upload>
+                    </el-form-item>
                   </div>
 
                   <div v-if="formData.storeType == 1 && formData.certifyReq.certType === 1">
@@ -1605,7 +1607,7 @@ export default {
         'certifyReq.legalName':[{type: "string", required: true, message: '请输入法人姓名', trigger: 'change'}],
         'certifyReq.legalCertNo':[{type: "string", required: true, message: '请输入证件号码', trigger: 'change'}],
         imgUrlC3Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
-        imgUrlP5:[{type: "string", required: true, message: '请上传图片', trigger: 'blur'}],
+        imgUrlP5:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
         imgUrlP5Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
         imgUrlP8:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
         imgUrlP9:[{type: "string", required: true, message: '请上传图片', trigger: 'change'}],
@@ -1705,8 +1707,8 @@ export default {
           val.map( i => {
             i.type && j.push(String(i.type),i.id)
           })
-          this.controlLicense = j;
-          console.log(this.controlLicense);
+          // this.controlLicense = j;
+          // console.log(this.controlLicense);
         }
       },
       deep: true,
@@ -2388,6 +2390,7 @@ export default {
           break;
         case 'imgUrlP5':
           // 委托书
+          this.$refs.pIdCardBack.clearValidate();
           this.formData.certifyReq.assignorLetterUrl = u;
           break;
         case 'imgUrlP7':
@@ -2495,7 +2498,12 @@ export default {
       const checkedNodes = this.$refs['cascaderBizScope'].getCheckedNodes();
       const n = checkedNodes.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
       vm.formData.certifyReq.bizScope = n;
+      console.log(vm.formData.certifyReq.bizScope,v);
       this.bizScopeCasValue = v;
+      this.controlLicense = []
+      v.forEach(item => {
+        this.controlLicense.push(...item)
+      })
       console.log(this.bizScopeCasValue ,this.controlLicense);
     },
     // 获取裁剪的图片数据