zhangdan 3 年之前
父節點
當前提交
09d480c8ff

+ 4 - 5
src/views/numsGoodsShelves/partsDealerManagement/list.vue

@@ -26,7 +26,6 @@
         ref="table"
         :style="{ height: tableHeight+84.5+'px', wordBreak: 'break-all' }"
         size="small"
-        rowKey="id"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
@@ -67,10 +66,10 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '配件经销商(商户名称)', dataIndex: 'dealerEntity.dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系人', dataIndex: 'dealerEntity.contact', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '联系电话', dataIndex: 'dealerEntity.dealerTelephone', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '合作状态', dataIndex: 'dealerEntity.cooperateFlagDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '配件经销商(商户名称)', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contact', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'contactMobile', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '平台商户号', dataIndex: 'merchantNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],

+ 5 - 9
src/views/numsGoodsShelves/partsDealerManagement/setSHModal.vue

@@ -20,7 +20,7 @@
           :wrapperCol="{span:16}"
         >
           <a-form-model-item label="配件经销商" >
-            <span>{{ form.dealerEntity?form.dealerEntity.dealerName:'--' }}</span>
+            <span>{{ form.dealerName||'--' }}</span>
           </a-form-model-item>
           <a-form-model-item label="平台商户号" prop="merchantNo" >
             <a-input id="setSHModal-merchantNo" allowClear v-model.trim="form.merchantNo" placeholder="请输入平台商户号"/>
@@ -68,9 +68,7 @@ export default {
       message: '以下结算账户信息需要与进件时填写的资料保持一直否则将无法体现成功',
       pageInfo: null,
       form: {
-        dealerEntity: {
-          dealerName: ''
-        },
+        dealerName: '',
         bankName: '', // 开户行
         bankAccount: '', // 账户名
         bankCard: '', // 账户号
@@ -87,9 +85,7 @@ export default {
   methods: {
     close (e) {
       this.form = {
-        dealerEntity: {
-          dealerName: ''
-        },
+        dealerName: '',
         bankName: '', // 开户行
         bankAccount: '', // 账户名
         bankCard: '', // 账户号
@@ -104,7 +100,7 @@ export default {
       merchantAccountDetail({ merchantSn: this.nowData.merchantSn, merchantType: this.nowData.merchantType }).then(res => {
         if (res.status == 200) {
           this.form.merchantNo = res.data.merchantNo
-          this.form.dealerEntity.dealerName = res.data.dealerEntity.dealerName
+          this.form.dealerName = res.data.dealerName
           this.form.bankName = res.data.merchantBankAccountEntity.bankName
           this.form.bankAccount = res.data.merchantBankAccountEntity.bankAccount
           this.form.bankCard = res.data.merchantBankAccountEntity.bankCard
@@ -127,7 +123,7 @@ export default {
             params.merchantBankAccountEntity.bankName = _this.form.bankName
             params.merchantBankAccountEntity.bankAccount = _this.form.bankAccount
             params.merchantBankAccountEntity.bankCard = _this.form.bankCard
-            params.dealerEntity.dealerName = _this.form.dealerEntity.dealerName
+            // params.dealerEntity.dealerName = _this.form.dealerEntity.dealerName
             params.merchantNo = _this.form.merchantNo
           }
           console.log(params, 'params')