save

src/views/shop/create-shop.vue

@@ -18,7 +18,7 @@
           <el-button
             size="small"
             type="primary"
-            :disabled="storeData && storeData.tradeStore.storeType == 3"
+            :disabled="disabledFORM || storeData && storeData.tradeStore.storeType == 3"
             @click="complete"
             >完成</el-button
           >
@@ -480,7 +480,7 @@
                     </div>
                   </div>
                   <el-form-item v-if="formData.storeType == 1" label="认证类型" label-width="100px">
-                    <el-radio-group v-model="formData.isLegal">
+                    <el-radio-group v-model="formData.isLegal" >
                       <el-radio :label="1">法人认证</el-radio>
                       <el-radio :label="2">委托人认证</el-radio>
                     </el-radio-group>
@@ -1469,7 +1469,7 @@ export default {
         repotExpressList: [
           { required: true, message: "请选择物流公司名称", trigger: "change" },
         ],
-        'certifyReq.orgType':[{type: "string", required: true, message: '请填企业类型', trigger: 'blur'}],  //有多条校验条件的时候可以放个ob
+        'certifyReq.orgType':[{required: true, message: '请填企业类型', trigger: 'blur'}],  //有多条校验条件的时候可以放个ob
         'certifyReq.orgAddress':[{type: "string", required: true, message: '请填写详细地址', trigger: 'blur'}],
         'certifyReq.bizScope':[{type: "array", required: true, message: '请选择经营范围', trigger: 'change'}],
         'certifyReq.orgName':[{type: "string", required: true, message: '请输入企业名称', trigger: 'blur'}],
@@ -1496,7 +1496,6 @@ export default {
         imgUrlP4Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
         imgUrlP5Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
         imgUrlP6Date:[{type: "array", required: true, message: '请选择有效日期', trigger: 'change'}],
-
       },
       imgMouseOver1: false,
       uploadImgMessage1: false, //未上传图片，校验提示语
@@ -1583,27 +1582,36 @@ export default {
       if(q && w && e){
         const storeId = this.$route.query.storeId || null;
         const s = storejs.get('store_info');
-        if (storeId) {
-          this.curmbSecond = "编辑店铺";
-          this.isDisabled = true;
-          if(s && s.storeId == storeId){
-            this.formData = s;
-            const {orgRegionValue} = s;
-            const v = orgRegionValue.map(i => {return i.label;}).join('/');
-            this.orgRegionValueFirst = v;
-            this.orgDateReverse();
+          if(storeId){
+            // 编辑  详情
+            this.curmbSecond = "编辑店铺";
+            this.isDisabled = true;
+            if(s && s.storeId == storeId){
+              this.formData = s;
+              const {orgRegionValue} = s;
+              const v = orgRegionValue.map(i => {return i.label;}).join('/');
+              this.orgRegionValueFirst = v;
+              this.orgDateReverse();
+            }else{
+              this.formData.storeId = storeId;
+              storejs.remove('store_info');
+              this.initInfo();
+              this.getDetail();
+            }
           }else{
-            this.formData.storeId = storeId;
-            storejs.remove('store_info');
-            this.initInfo();
-            this.getDetail();
+            // 新建店铺
+            this.curmbSecond = "新建店铺";
+            this.isDisabled = false;
+            if(s){
+              // 存在数据 就反现
+              this.formData = s;
+              const {orgRegionValue} = s;
+              const v = orgRegionValue.map(i => {return i.label;}).join('/');
+              this.orgRegionValueFirst = v;
+              this.orgDateReverse();
+            }
           }
-        } else {
-          storejs.remove('store_info');
-          this.curmbSecond = "新建店铺";
-          this.isDisabled = false;
         }
-      }
     },
     //日期 设置
     orgDateReverse () {
@@ -1746,16 +1754,17 @@ export default {
     },
     // 返回
     back() {
-      this.$confirm('返回后您填写的信息将不会被保存。', '确认要返回吗？', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'error'
-        }).then(() => {
-          this.$router.push({
-            path: "/shop-list",
-          });
-        }).catch(() => {
-        });
+      this.$router.push({
+        path: "/shop-list",
+      });
+      // this.$confirm('返回后您填写的信息将不会被保存。', '确认要返回吗？', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'error'
+      //   }).then(() => {
+      //
+      //   }).catch(() => {
+      //   });
     },
     checkPhone(val) {
       if (!/^1[3456789]\d{9}$/.test(val)) {
@@ -2533,13 +2542,17 @@ export default {
       return Array.from(new Set(segs));
     },
     handleTabName() {
+      const {query} = this.$route;
       storejs.set('store_info', this.formData);
-      vm.$router.push({ path: "create-shop", query: {currentTab: this.activeTabName, storeId: this.formData.storeId,disabled: this.disabledFORM}});
+      const s = {...query, currentTab: this.activeTabName};
+      vm.$router.push({ path: "create-shop", query: s});
     },
     nextStepFirst(v) {
+      const {query} = this.$route;
       storejs.set('store_info', this.formData);
       this.activeTabName = v;
-      vm.$router.push({ path: "create-shop", query: {currentTab: this.activeTabName, storeId: this.formData.storeId,disabled: this.disabledFORM}});
+      const s = {...query, currentTab: this.activeTabName};
+      vm.$router.push({ path: "create-shop", query: s});
     },
     handleRegionChange(v) {
       const checkedNodes = this.$refs['regionCascader'].getCheckedNodes()[0];

src/views/shop/shop-list.vue

@@ -111,16 +111,16 @@
         </el-table-column>
         <el-table-column prop="storeType" label="审核状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span :class="scope.row.tradeStore.storeStatus == 4 ? 'red' : 'green'">
-              {{ scope.row.certificateInfoResp ? scope.row.certificateInfoResp.certifyValidDtoList[0].refuseContent : ''}}
+            <span :class="scope.row.tradeStore.certifyStatus == 3 ? 'red' : 'green'">
+              {{ scope.row.tradeStore.certifyStatus | storeStatusFormat}}
             </span>
             <el-popover
               placement="top-start"
               title="标题"
               width="200"
               trigger="hover"
-              content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
-              <i v-if="scope.row.tradeStore.storeStatus == 3"  slot="reference" class="el-icon-warning-outline red"></i>
+              :content="certificateInfoRespContent(scope.row.certificateInfoResp)">
+              <i v-if="scope.row.tradeStore.certifyStatus == 3"  slot="reference" class="el-icon-warning-outline red"></i>
             </el-popover>
 
           </template>
@@ -167,8 +167,8 @@
           <template slot-scope="scope">
             <div>
               <el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
-              <el-button v-if="scope.row.tradeStore.storeStatus <= 2" @click="editShop(scope.row)" type="text" size="small">{{scope.row.tradeStore.storeStatus <= 2 ? '查看' : ''}}</el-button>
-              <el-button @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
+              <el-button v-if="scope.row.tradeStore.storeStatus <= 2" @click="editShop(scope.row, 'true')" type="text" size="small">{{scope.row.tradeStore.storeStatus <= 2 ? '查看' : ''}}</el-button>
+              <el-button v-if="scope.row.tradeStore.storeType != 3" @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
               <el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
               <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
               <el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
@@ -242,8 +242,6 @@
                 <el-button type="primary" @click="confirmSetPrice">确 定</el-button>
             </span>
       </el-dialog>
-
-
     </div>
   </div>
 </template>
@@ -412,9 +410,8 @@
       },
       //新建店铺
       createShop() {
-        this.$router.push({
-          path: `/create-shop`
-        })
+        let l = `${location.origin}#/create-shop?disabled=false`;
+        window.open(l);
       },
       //店铺管理
       shopManage(row) {
@@ -439,7 +436,7 @@
       },
       //编辑
       editShop(row, disabled) {
-        let l = `${location.origin}#/create-shop?storeId=${row.tradeStore.id}&disabled=${disabled}`;
+        let l = `${location.origin}#/create-shop?storeId=${row.tradeStore.id}&disabled=${disabled}&certifyStatus=${row.tradeStore.certifyStatus}`;
         window.open(l);
       },
       handleSizeChange(val) {
@@ -666,6 +663,17 @@
         });
         window.open(routeData.href, '_blank');
       },
+      certificateInfoRespContent (c) {
+        let v ='';
+        if( c && c.length > 0) {
+            c.map( (i, j)=> {
+              if(j <= 3){
+                v = v + i.refuseContent;
+              }
+            });
+        }
+        return v;
+      }
 
     },
     filters: {