save

src/views/shop/create-shop.vue

@@ -332,6 +332,7 @@
               </div>
               <el-form-item
                 v-if="formData.storeType == 1"
+                class="required-label"
                 label="企业类型"
                 prop="certifyReq.orgType"
               >
@@ -354,6 +355,7 @@
               <el-form-item
                 v-if="formData.storeType == 1"
                 label="企业地区"
+                class="required-label"
               >
                   <el-cascader
                     style="width:35%"
@@ -367,6 +369,7 @@
               <el-form-item
                 v-if="formData.storeType == 1"
                 label="详细地址"
+                class="required-label"
                 prop="certifyReq.orgAddress"
               >
                 <el-input
@@ -380,6 +383,7 @@
               <el-form-item
                 v-if="formData.storeType == 1"
                 label="经营范围"
+                class="required-label"
               >
                 <el-cascader
                   ref="cascaderBizScope"
@@ -539,9 +543,9 @@
                         <el-form-item
                           label="委托人姓名"
                           label-width="100px"
-                          v-model="formData.certifyReq.assignorName"
                         >
                           <el-input
+                            v-model="formData.certifyReq.assignorName"
                             size="small"
                             placeholder="请输入"
                           ></el-input>
@@ -1427,6 +1431,7 @@ export default {
         repotExpressList: [
           { required: true, message: "请选择物流公司名称", trigger: "change" },
         ],
+        'certifyReq.orgType':[{type: "string", required: true, message: '请填写名字', trigger: 'blur'}],  //有多条校验条件的时候可以放个ob
       },
       imgMouseOver1: false,
       uploadImgMessage1: false, //未上传图片，校验提示语
@@ -1527,7 +1532,6 @@ export default {
       getStoreAdressRepot(this.formData.storeId).then(res => {
         if (res.code == "000000") {
           Object.assign(this.formData,res.data);
-          console.log('--this.formData', this.formData);
         } else {
           this.$message.error(res.message);
         }
@@ -1626,7 +1630,13 @@ export default {
       queryStore(req).then((res) => {
         if (res.code == "000000") {
           this.storeData = res.data.tradeStore[0];
-          this.getStoreInfo();
+          const s = storejs.get('store_info');
+          if(s){
+            this.formData = s;
+            console.log('--this.formData', this.formData);
+          }else{
+            this.getStoreInfo();
+          }
         } else {
           this.$message.error(res.message);
         }

src/views/shop/shop-list.vue

@@ -65,6 +65,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="店铺状态">
+              <el-select
+                v-model="searchForm.certifyStatus"
+                placeholder="请选择"
+                size="small"
+                clearable>
+                <el-option
+                  v-for="item in storeTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6" style="text-align: right">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
@@ -95,8 +111,8 @@
         </el-table-column>
         <el-table-column prop="storeType" label="审核状态" min-width="100" align="center">
           <template slot-scope="scope">
-            <span :class="scope.row.tradeStore.storeType == 3 ? 'red' : 'green'">
-              {{ scope.row.tradeStore.storeType | storeStatusFormat}}
+            <span :class="scope.row.tradeStore.storeStatus == 4 ? 'red' : 'green'">
+              {{ scope.row.certificateInfoResp ? scope.row.certificateInfoResp.certifyValidDtoList[0].refuseContent : ''}}
             </span>
             <el-popover
               placement="top-start"
@@ -104,7 +120,7 @@
               width="200"
               trigger="hover"
               content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
-              <i v-if="scope.row.tradeStore.storeType == 3"  slot="reference" class="el-icon-warning-outline red"></i>
+              <i v-if="scope.row.tradeStore.storeStatus == 3"  slot="reference" class="el-icon-warning-outline red"></i>
             </el-popover>
 
           </template>
@@ -151,7 +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 @click="editShop(scope.row)" type="text" size="small">{{scope.row.tradeStore.storeType == 3 ? '查看' : '编辑'}}</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)" 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>
@@ -253,7 +270,8 @@
           id: null,
           type: null,
           commissionType: 0,
-          proxyCommissionType:0
+          proxyCommissionType:0,
+          certifyStatus:null
         },
         canAdd: false,
         totalRows: 0,
@@ -285,15 +303,30 @@
             value: 2,
             label: "固定分佣"
           }],
+        storeTypeList: [
+          {
+            value: 1,
+            label: "未认证"
+          },
+          {
+            value: 2,
+            label: "认证提交中"
+          },
+          {
+            value: 3,
+            label: "认证通过"
+          },
+           {
+            value: 4,
+            label: "审核失败"
+          },
+           {
+            value: 5,
+            label: "作废"
+          },
+          ],
         setPriceVisible: false,
         setPriceForm:{
-          // commissionType: 1,
-          // commissionPrice: '',
-          // commissionPrice1: '',
-          // commissionPrice2: '',
-          // storeId: '',
-          // goodsId: '',
-          // maxPrice: ''
           adminCommissionGoodsRespList:[],
           commission:{
             commissionKind: "",
@@ -406,12 +439,15 @@
       },
       //编辑
       editShop(row) {
-        this.$router.push({
-          path: `/create-shop`,
-          query:{
-            storeId: row.tradeStore.id,
-          }
-        })
+        const l = `${location.origin}#/create-shop?storeId=${row.tradeStore.id}`;
+        console.log('---', l);
+        window.open(l);
+        // this.$router.push({
+        //   path: `/create-shop`,
+        //   query:{
+        //     storeId: row.tradeStore.id,
+        //   }
+        // })
       },
       handleSizeChange(val) {
         this.searchForm.pageSize = val;
@@ -688,17 +724,17 @@
       storeStatusFormat(v) {
         let s = '';
         switch (v) {
+          case 1:
+            s = '未认证'
+            break;
           case 2:
-            s = '审核通过'
+            s = '待审核'
             break;
           case 3:
-            s = '审核不通过'
+            s = '审核成功'
             break;
           case 4:
-            s = '信息待完善'
-            break;
-          case 5:
-            s = '待审核'
+            s = '审核失败'
             break;
           default:
             s ='审核通过'