Merge branch 'feature/zl' into 'test'

save

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

src/views/shop/create-shop.vue

@@ -1141,7 +1141,7 @@
             <el-tab-pane v-if="formData.storeType != 3" label="其他设置" name="third">
               <el-form-item label="仓库地址管理" prop="selectedKey" class="required-label warehouseAdress-wrap" v-if="formData.storeType < 3">
                 <p class="warehouseAdress-tip">(该地址用于买家退货时退回地址，请准确填写)</p>
-                <el-button type="success" plain class="warehouseAdress-add" size="small" @click="createAdress(0)">+新增地址</el-button>
+                <el-button type="success" class="warehouseAdress-add" size="small" @click="createAdress(0)">+新增地址</el-button>
                 <el-radio-group v-model="formData.selectedKey" class="warehouseAdress-list">
                   <el-radio :label="addressItem.key" class="warehouseAdress-item" v-for="(addressItem, index) of formData.repotList" :key="index">
                     <span>默认</span>
@@ -1151,7 +1151,8 @@
                 <span class="warehouseAdress-msg">{{setAddress(addressItem)}}</span>
               </span>
                     <span class="warehouseAdress-do">
-                <span @click.prevent="createAdress(1,index)">编辑</span> ｜ <span @click.prevent="deleteAdress(index)">删除</span>
+                <el-button class="btn-small" @click.prevent="createAdress(1,index)">编辑</el-button> ｜
+                 <el-button class="btn-small" @click.prevent="deleteAdress(index)">删除</el-button>
               </span>
                   </el-radio>
                 </el-radio-group>
@@ -1922,9 +1923,9 @@ export default {
             if (res.code == "000000") {
               storejs.remove('store_info');
               this.$message.success("操作成功");
-              // this.$router.push({
-              //   path: "/shop-list",
-              // });
+              this.$router.push({
+                path: "/shop-list",
+              });
             } else {
               this.$message.error(res.message);
             }
@@ -2065,6 +2066,7 @@ export default {
     submitForm() {
       let formName = "formData";
       let submitFlag = false;
+      console.log('--this.formData', this.formData);
       if (!this.formData.storeLogo) {
         this.uploadImgMessage1 = true;
         return;
@@ -2222,16 +2224,16 @@ export default {
           this.beforeUploadCommon(file, fileLimit, 'licenseFileHandle');
           break;
         case 'imgUrlC2':
-          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 1);
+          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 1, 'legal');
           break;
         case 'imgUrlC3':
-          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 2);
+          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 2, 'legal');
           break;
         case 'imgUrlC4':
-          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 1);
+          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 1, 'assignor');
           break;
         case 'imgUrlC5':
-          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 2);
+          this.beforeUploadCommon(file, fileLimit, 'idCardFileHandle', 2, 'assignor');
           break;
         default:
           return false;
@@ -2239,7 +2241,7 @@ export default {
       }
     },
 
-    beforeUploadCommon(file, fileLimit, needOCR, isFront) {
+    beforeUploadCommon(file, fileLimit, needOCR, isFront, legal) {
       let vm = this;
       const isJPG = file.type === "image/jpeg";
       const isPNG = file.type === "image/png";
@@ -2281,12 +2283,17 @@ export default {
             vm.$message.success("上传成功");
           });
         };
-        const s = {file64Str:theFile.currentTarget.result, name:file.name};
+        const fileContent = theFile.currentTarget.result.split('base64,');
+        const fD = {
+          file64Str: fileContent[1],
+          name:file.name
+        };
+
         if(needOCR && needOCR == 'licenseFileHandle'){
-          vm.licenseFileHandle(s)
+          vm.licenseFileHandle(fD)
         }
         if(needOCR && needOCR == 'idCardFileHandle'){
-          vm.idCardFileHandle(s, isFront)
+          vm.idCardFileHandle(fD, isFront, legal)
         }
       };
       return isJPG && isLt2M;
@@ -2346,6 +2353,7 @@ export default {
     },
     //删除图片
     deleteImg(type) {
+      if(this.disabledFORM){return false;}
       vm.formData[type] = "";
       const testMouse = new Map()
         .set("storeLogo", "imgMouseOver1")
@@ -2782,6 +2790,7 @@ export default {
               const {creditCode, establishmentDate, orgName, validDate} = wordsResult;
               vm.formData.certifyReq.orgName = orgName;
               vm.formData.certifyReq.creditCode = creditCode;
+              vm.formData.imgUrlC1Date = [establishmentDate,validDate];
               console.log('-establishmentDate', establishmentDate, validDate);
             }
           } else {
@@ -2790,15 +2799,37 @@ export default {
       });
     },
     // 身份证正面/反面OCR上传后的回调处理
-    idCardFileHandle(file, type) {
+    idCardFileHandle(file, type, legal) {
       file['cardSide'] = type;
       console.log('---cardSide', file);
       idCardOcr(file).then((res) => {
         try {
           const { code, data } = res;
           if (code === '000000') {
+            console.log('---data', data);
+            if(data.ocrCardDto.wordsResultDto){
+              const {cardNo,name} = data.ocrCardDto.wordsResultDto;
+              if(legal == 'legal'){
+                vm.formData.certifyReq.legalName = name;
+                vm.formData.certifyReq.legalCertNo = cardNo;
+              }else {
+                vm.formData.certifyReq.assignorName = name;
+                vm.formData.certifyReq.assignorCertNo = cardNo;
+              }
+            }
 
-            console.log(data);
+            if(data.ocrCardDto.wordsResultBackDto){
+              const {signYmd, endYmd} = data.ocrCardDto.wordsResultBackDto;
+              if(legal == 'legal'){
+                vm.formData.imgUrlC3Date = [signYmd, endYmd];
+                vm.formData.certifyReq.legalValidDateBegin = signYmd;
+                vm.formData.certifyReq.legalValidDateEnd = endYmd;
+              }else {
+                vm.formData.imgUrlC5Date = [signYmd, endYmd];
+                vm.formData.certifyReq.assignorValidDateBegin = signYmd;
+                vm.formData.certifyReq.assignorValidDateEnd = endYmd;
+              }
+            }
           } else {
             console.log(res);
           }
@@ -2815,25 +2846,29 @@ export default {
       return [...m.values()];
     },
     certifyValidDtoList (v) {
-      const l = vm.formData.certifyValidDtoList || [];
-      return l.filter(i => {return i.infoType == v;})[0] || '';
+      const l = vm.formData.certifyReq.certifyValidDtoList || [];
+      const m = l.filter(i => {return i.infoType == v;})[0] || '';
+      return m ? m.refuseContent : '';
     },
-    storeTypeChange () {
-      vm.formData.certifyValidDtoList = [];
+    storeTypeChange (v) {
+      if(v != 1){
+        vm.formData.certifyReq.certifyValidDtoList = [];
+        vm.formData.certifyReq.bizScope = [];
+      }
       console.log('--vm.formData', vm.formData);
     }
   },
   filters: {
     storeStatusFormat(v) {
       let s = '';
-      switch (v) {
-        case 2:
+      switch (String(v)) {
+        case '2':
           s = '待审核'
           break;
-        case 3:
+        case '3':
           s = '审核成功'
           break;
-        case 4:
+        case '4':
           s = '审核失败'
           break;
         default:
@@ -2991,7 +3026,7 @@ export default {
       color: #8c8c8c;
     }
     .warehouseAdress-add {
-      color: #449284;
+      color: #FFFFFF;
       border-color: #449284;
     }
     .warehouseAdress-list {
@@ -3035,7 +3070,14 @@ export default {
         color: #449284;
         background: #fff;
         padding: 0 10px 0 10px;
-        width: 100px;
+        width: 130px;
+        .btn-small{
+          width: 50px;
+          text-align: center;
+          padding: 3px 0px;
+          margin: 0px;
+
+        }
       }
     }
   }