Selaa lähdekoodia

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy

lilei 4 vuotta sitten
vanhempi
commit
69133ee2ee

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -121,7 +121,7 @@ export default {
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系人', dataIndex: 'contact', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系人', dataIndex: 'contact', width: 200, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系电话', dataIndex: 'dealerTelephone', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系电话', dataIndex: 'dealerTelephone', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '绑定手机号码', dataIndex: 'contactMobile', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '绑定手机号码', dataIndex: 'managerMobile', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -175,7 +175,7 @@ export default {
       const _this = this
       const _this = this
       stockByProductSn({ sn: sn }).then(res => {
       stockByProductSn({ sn: sn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
-          _this.form.productCost = res.data.lastStockCost
+          _this.form.productCost = res.data.lastStockCost || ''
         }
         }
       })
       })
     },
     },

+ 2 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -121,7 +121,7 @@
           id="salesReturn-eexamine-btn">品检</a-button>
           id="salesReturn-eexamine-btn">品检</a-button>
         <a-button
         <a-button
           size="small"
           size="small"
-          v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT')"
+          v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT')"
           type="link"
           type="link"
           class="button-info"
           class="button-info"
           @click="handleEdit(record)"
           @click="handleEdit(record)"
@@ -135,7 +135,7 @@
           id="salesReturn-edit-btn">改单</a-button>
           id="salesReturn-edit-btn">改单</a-button>
         <a-button
         <a-button
           size="small"
           size="small"
-          v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT')"
+          v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT')"
           type="link"
           type="link"
           class="button-error"
           class="button-error"
           @click="handleDel(record)"
           @click="handleDel(record)"