Pārlūkot izejas kodu

Merge branch 'develop_szhj' of jianguan-web/qpls-md-html into develop

李磊 3 gadi atpakaļ
vecāks
revīzija
72eb5c8dfc

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -133,7 +133,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'state', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/replenishmentDetail.vue

@@ -6,7 +6,7 @@
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions size="small" :column="3">
             <a-descriptions-item label="关联客户">
-              {{ detailData&&detailData.shelfInfo.storeName || '--' }}
+              {{ detailData&&detailData.customerName || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="货架名称" :span="2">
               {{ detailData&&detailData.shelfInfo.shelfName || '--' }}

+ 2 - 2
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -33,8 +33,8 @@
         <a-collapse :activeKey="['1']" v-else>
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
-              <a-descriptions-item label="关联客户">{{ (detailData&&detailData.buyerName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="货架名称">{{ detailData&&detailData.shelf.name || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="关联客户">{{ (detailData&&detailData.customerName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="货架名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="急件单号">{{ (detailData&&detailData.urgentBillNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="状态">{{ (detailData&&detailData.statusDictValue) || '--' }}</a-descriptions-item>
             </a-descriptions>

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.188:8503/qpls-md',
-        target: 'http://frps.chelingzhu.com:7800/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://frps.chelingzhu.com:7800/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,