修改界面

src/api/ldt_mall/mall.js

@@ -105,3 +105,13 @@ export const getProductFeeByMall = () => {
     method: 'get',
   })
 }
+
+export const getMallDetail = (id) => {
+  return request({
+    url: '/api/ldt_mall/mall/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}

src/api/ldt_shop/shop.js

@@ -146,3 +146,13 @@ export const getProductFeeByShop = () => {
     method: 'get',
   })
 }
+
+export const getShopDetail = (id) => {
+  return request({
+    url: '/api/ldt_shop/shop/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}

src/views/ldt_shop/handleMiniCROShopAudit.vue

@@ -9,8 +9,11 @@
         </el-row>
         <el-row type="flex" class="row-bg" justify="end">
           <el-form-item>
-            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="primary" @click="handleAgree" :loading="loading">同意</el-button>
-            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="danger" @click="handleDisagree" :loading="loading">驳回
+            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="primary" @click="handleAgree"
+                       :loading="loading">同意
+            </el-button>
+            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="danger" @click="handleDisagree"
+                       :loading="loading">驳回
             </el-button>
             <el-button @click="handleCancel">关闭</el-button>
           </el-form-item>
@@ -21,7 +24,7 @@
           <el-collapse-item title="易宝信息" name="yeepay">
             <el-card shadow="hover" style="margin-top: 20px;">
               <div v-for="(fee,index) in yeePayData.data" :key="index">
-                <h4 style="padding-left: 50px">{{fee.productName}}</h4>
+                <h4 style="padding-left: 50px">{{ fee.productName }}</h4>
                 <avue-form :option="yeePayData.option[index]" v-model="yeePayData.data[index]"></avue-form>
                 <el-divider/>
               </div>
@@ -56,7 +59,7 @@
 
 <script>
 import {getDetail} from "@/api/ldt_shop/audit"
-import {getProductFeeByShop} from "@/api/ldt_shop/shop"
+import {getProductFeeByShop, getShopDetail} from "@/api/ldt_shop/shop"
 import {historyFlowList} from "@/api/work/process";
 import {completeTask, todoList} from "@/api/work/work";
 
@@ -69,26 +72,34 @@ export default {
       businessId: null,
       form: {},
       task: {},
-      yeePayData:{
-        option:[],
-        data:[]
+      yeePayData: {
+        option: [],
+        data: []
       },
       loading: false,
       option: {
         emptyBtn: false,
         submitBtn: false,
-        labelPosition:"left",
+        labelPosition: "left",
         column: [
           {
             label: "商户名称",
             prop: "shopName",
-            span: 24,
+            span: 8,
             disabled: true,
           },
+          {
+            label: "商户联系人姓名",
+            prop: "contactName",
+            disabled: true,
+            labelWidth: 120,
+            span: 8
+          },
           {
             label: "身份证号",
             prop: "idCard",
             disabled: true,
+            span: 8,
             rules: [{
               required: true,
               message: "请输入身份证号",
@@ -99,6 +110,7 @@ export default {
             label: "具体地址",
             prop: "address",
             disabled: true,
+            span: 8,
             rules: [{
               required: true,
               message: "请输入具体地址",
@@ -108,43 +120,37 @@ export default {
           {
             label: "住址",
             prop: "addr",
-            disabled: true
-          },
-          {
-            label: "商户实际经营地所在省",
-            prop: "province",
-            disabled: true,
-            labelWidth: 160,
-            span: 8
-          },
-          {
-            label: "商户实际经营地所在市",
-            prop: "district",
-            disabled: true,
-            labelWidth: 160,
-            span: 8
-          },
-          {
-            label: "商户实际经营地所在区",
-            prop: "contactMobile",
-            disabled: true,
-            labelWidth: 160,
-            span: 8
-          },
-          {
-            label: "商户联系人姓名",
-            prop: "contactName",
             disabled: true,
-            labelWidth: 120,
-            span: 8
-          },
-          {
-            label: "商户联系人证件号码",
-            prop: "contactLicenceNo",
-            disabled: true,
-            labelWidth: 160,
-            span: 8
+            span: 8,
           },
+          // {
+          //   label: "商户实际经营地所在省",
+          //   prop: "province",
+          //   disabled: true,
+          //   labelWidth: 160,
+          //   span: 8
+          // },
+          // {
+          //   label: "商户实际经营地所在市",
+          //   prop: "city",
+          //   disabled: true,
+          //   labelWidth: 160,
+          //   span: 8
+          // },
+          // {
+          //   label: "商户实际经营地所在区",
+          //   prop: "district",
+          //   disabled: true,
+          //   labelWidth: 160,
+          //   span: 8
+          // },
+          // {
+          //   label: "商户联系人证件号码",
+          //   prop: "contactLicenceNo",
+          //   disabled: true,
+          //   labelWidth: 160,
+          //   span: 8
+          // },
           {
             label: "商户联系人手机号",
             prop: "contactMobile",
@@ -180,13 +186,25 @@ export default {
             labelWidth: 120,
             span: 8
           },
+          {
+            label: "位置编码",
+            prop: "locationCode",
+            disabled: true,
+            span: 12
+          },
+          {
+            label: "位置",
+            prop: "location",
+            disabled: true,
+            span: 12
+          },
           {
             label: "商户logo",
             prop: "shopLogo",
             type: 'upload',
             disabled: true,
             listType: 'picture-img',
-            span: 12,
+            span: 8,
             labelWidth: 120,
             propsHttp: {
               res: 'data',
@@ -210,7 +228,7 @@ export default {
             type: 'upload',
             disabled: true,
             listType: 'picture-img',
-            span: 12,
+            span: 8,
             labelWidth: 120,
             propsHttp: {
               res: 'data',
@@ -234,7 +252,7 @@ export default {
             disabled: true,
             type: 'upload',
             listType: 'picture-img',
-            span: 12,
+            span: 8,
             labelWidth: 120,
             propsHttp: {
               res: 'data',
@@ -246,17 +264,18 @@ export default {
             },
             tip: '只能上传jpg/png文件，且不超过500kb',
             action: '/api/blade-resource/oss/endpoint/put-file',
-           /* rules: [{
-              required: true,
-              message: "请输入身份证-反面",
-              trigger: "blur"
-            }]*/
+            /* rules: [{
+               required: true,
+               message: "请输入身份证-反面",
+               trigger: "blur"
+             }]*/
           },
           {
             label: "经营范围",
             prop: "businessScope",
             disabled: true,
-            type: "textarea"
+            type: "textarea",
+            span: 24,
           },
         ]
       },
@@ -293,7 +312,7 @@ export default {
         } else {
           this.$message.error(data.msg || '提交失败');
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.loading = false;
       });
     },
@@ -321,7 +340,7 @@ export default {
         } else {
           this.$message.error(data.msg || '提交失败');
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.loading = false;
       });
     },
@@ -332,6 +351,10 @@ export default {
       this.businessId = this.$route.params.businessId;
       this.processInstanceId = this.$route.params.processInstanceId;
       getDetail(this.businessId).then(res => {
+        getShopDetail(res.data.data.entityId).then(res => {
+          this.form.locationCode = res.data.data.locationCode;
+          this.form.location = res.data.data.location;
+        });
         this.form = res.data.data;
       });
       todoList(1, 10, {
@@ -345,14 +368,14 @@ export default {
         this.flowList = res.data.data;
         console.log(this.flowList)
       })
-      getProductFeeByShop().then(res=>{
+      getProductFeeByShop().then(res => {
         this.updateProductFee(res.data.data);
       });
     },
     updateProductFee(data) {
       this.yeePayData.data = data;
       this.yeePayData.option = [];
-      for(let i=0;i<this.yeePayData.data.length;i++){
+      for (let i = 0; i < this.yeePayData.data.length; i++) {
         const productFeeOption = {
           labelWidth: 150,
           emptyBtn: false,

src/views/ldt_shop/handleShopAudit.vue

@@ -9,8 +9,11 @@
         </el-row>
         <el-row type="flex" class="row-bg" justify="end">
           <el-form-item>
-            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'"  type="primary" @click="handleAgree" :loading="loading">同意</el-button>
-            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'"  type="danger" @click="handleDisagree" :loading="loading">驳回
+            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="primary" @click="handleAgree"
+                       :loading="loading">同意
+            </el-button>
+            <el-button v-if="form.auditStatus == 'WAITING_PLATFORM'" type="danger" @click="handleDisagree"
+                       :loading="loading">驳回
             </el-button>
             <el-button @click="handleCancel">关闭</el-button>
           </el-form-item>
@@ -21,7 +24,7 @@
           <el-collapse-item title="易宝信息" name="yeepay">
             <el-card shadow="hover" style="margin-top: 20px;">
               <div v-for="(fee,index) in yeePayData.data" :key="index">
-                <h4 style="padding-left: 50px">{{fee.productName}}</h4>
+                <h4 style="padding-left: 50px">{{ fee.productName }}</h4>
                 <avue-form :option="yeePayData.option[index]" v-model="yeePayData.data[index]"></avue-form>
                 <el-divider/>
               </div>
@@ -56,7 +59,7 @@
 
 <script>
 import {getDetail} from "@/api/ldt_shop/audit"
-import {getProductFeeByMall} from "@/api/ldt_mall/mall"
+import {getMallDetail, getProductFeeByMall} from "@/api/ldt_mall/mall"
 import {historyFlowList} from "@/api/work/process";
 import {completeTask, todoList} from "@/api/work/work";
 
@@ -69,32 +72,34 @@ export default {
       businessId: null,
       form: {},
       loading: false,
-      yeePayData:{
-        option:[],
-        data:[]
+      yeePayData: {
+        option: [],
+        data: []
       },
       task: {},
       option: {
         emptyBtn: false,
         submitBtn: false,
-        labelPosition:"left",
+        labelPosition: "left",
         column: [
           {
             label: "商户名称",
             prop: "shopName",
-            span: 24,
+            span: 8,
             disabled: true,
           },
           {
             label: "企业名称【商户全称】",
             prop: "enterpriseName",
             disabled: true,
-            labelWidth: 160
+            labelWidth: 160,
+            span: 8,
           },
           {
             label: "主体信息",
             disabled: true,
             prop: "entity",
+            span: 8,
             rules: [{
               required: true,
               message: "请输入主体信息",
@@ -105,6 +110,7 @@ export default {
             label: "法人姓名",
             prop: "legalPerson",
             disabled: true,
+            span: 8,
             rules: [{
               required: true,
               message: "请输入法人姓名",
@@ -116,6 +122,7 @@ export default {
             prop: "legalLicenceType",
             disabled: true,
             labelWidth: 120,
+            span: 8,
             rules: [{
               required: true,
               message: "请输入法人证件类型",
@@ -127,22 +134,23 @@ export default {
             prop: "legalLicenceNo",
             disabled: true,
             labelWidth: 120,
+            span: 8,
             rules: [{
               required: true,
               message: "请输入法人证件号码",
               trigger: "blur"
             }]
           },
-          {
-            label: "身份证号",
-            prop: "idCard",
-            disabled: true,
-            rules: [{
-              required: true,
-              message: "请输入身份证号",
-              trigger: "blur"
-            }]
-          },
+          // {
+          //   label: "身份证号",
+          //   prop: "idCard",
+          //   disabled: true,
+          //   rules: [{
+          //     required: true,
+          //     message: "请输入身份证号",
+          //     trigger: "blur"
+          //   }]
+          // },
           {
             label: "具体地址",
             prop: "address",
@@ -158,7 +166,7 @@ export default {
             prop: "addr",
             disabled: true
           },
-          {
+          /*{
             label: "商户实际经营地所在省",
             prop: "province",
             disabled: true,
@@ -167,18 +175,18 @@ export default {
           },
           {
             label: "商户实际经营地所在市",
-            prop: "district",
+            prop: "city",
             disabled: true,
             labelWidth: 160,
             span: 8
           },
           {
             label: "商户实际经营地所在区",
-            prop: "contactMobile",
+            prop: "district",
             disabled: true,
             labelWidth: 160,
             span: 8
-          },
+          },*/
           {
             label: "成立时间",
             prop: "registeredDate",
@@ -204,13 +212,13 @@ export default {
             labelWidth: 120,
             span: 8
           },
-          {
-            label: "商户联系人证件号码",
-            prop: "contactLicenceNo",
-            disabled: true,
-            labelWidth: 160,
-            span: 8
-          },
+          // {
+          //   label: "商户联系人证件号码",
+          //   prop: "contactLicenceNo",
+          //   disabled: true,
+          //   labelWidth: 160,
+          //   span: 8
+          // },
           {
             label: "商户联系人手机号",
             prop: "contactMobile",
@@ -223,7 +231,7 @@ export default {
             prop: "openAccountLicenceNo",
             disabled: true,
             labelWidth: 120,
-            span:24
+            span: 8,
           },
           {
             label: "银行账户类型",
@@ -246,6 +254,18 @@ export default {
             labelWidth: 120,
             span: 8
           },
+          {
+            label: "位置编码",
+            prop: "locationCode",
+            disabled: true,
+            span: 8
+          },
+          {
+            label: "位置",
+            prop: "location",
+            disabled: true,
+            span: 8
+          },
           {
             label: "开户许可证照片",
             prop: "openAccountLicenceUrl",
@@ -334,11 +354,11 @@ export default {
             },
             tip: '只能上传jpg/png文件，且不超过500kb',
             action: '/api/blade-resource/oss/endpoint/put-file',
-           /* rules: [{
-              required: true,
-              message: "请输入身份证-反面",
-              trigger: "blur"
-            }]*/
+            /* rules: [{
+               required: true,
+               message: "请输入身份证-反面",
+               trigger: "blur"
+             }]*/
           },
           {
             label: "营业执照",
@@ -404,7 +424,7 @@ export default {
         } else {
           this.$message.error(data.msg || '提交失败');
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.loading = false;
       });
     },
@@ -432,7 +452,7 @@ export default {
         } else {
           this.$message.error(data.msg || '提交失败');
         }
-      }).finally(()=>{
+      }).finally(() => {
         this.loading = false;
       })
     },
@@ -443,6 +463,10 @@ export default {
       this.businessId = this.$route.params.businessId;
       this.processInstanceId = this.$route.params.processInstanceId;
       getDetail(this.businessId).then(res => {
+        getMallDetail(res.data.data.entityId).then(res => {
+          this.form.locationCode = res.data.data.locationCode;
+          this.form.location = res.data.data.location;
+        });
         this.form = res.data.data;
       });
       todoList(1, 10, {
@@ -450,20 +474,18 @@ export default {
         processInstanceId: this.processInstanceId
       }).then(res => {
         this.task = res.data.data.records[0];
-        console.log(this.task);
       })
       historyFlowList(this.processInstanceId).then(res => {
         this.flowList = res.data.data;
-        console.log(this.flowList)
       })
-      getProductFeeByMall().then(res=>{
+      getProductFeeByMall().then(res => {
         this.updateProductFee(res.data.data);
       });
     },
     updateProductFee(data) {
       this.yeePayData.data = data;
       this.yeePayData.option = [];
-      for(let i=0;i<this.yeePayData.data.length;i++){
+      for (let i = 0; i < this.yeePayData.data.length; i++) {
         const productFeeOption = {
           labelWidth: 150,
           emptyBtn: false,