소스 검색

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

chenrui 2 년 전
부모
커밋
51bb37c890

+ 1 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -184,7 +184,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '9%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -267,7 +267,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 1
src/views/allocationManagement/transferReturn/list.vue

@@ -211,7 +211,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨退货单号', scopedSlots: { customRender: 'allocateReturnNo' }, align: 'center', width: '8%' },
         { title: '调拨退货对象类型', dataIndex: 'targetTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨退货对象名称', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨退货对象名称', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '费用类型', dataIndex: 'costTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨退货类型', scopedSlots: { customRender: 'allocateType' }, width: '6%', align: 'center' },
         { title: '是否抓单', dataIndex: 'grabFlagDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },

+ 6 - 3
src/views/reportData/actualSalesReport/list.vue

@@ -76,7 +76,8 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.id"
+        :rowKey="(record) => record.no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :scroll="{ x: 2250 }"
@@ -288,13 +289,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/billingBackReport/list.vue

@@ -237,13 +237,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/billingOrderReport/list.vue

@@ -243,13 +243,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/billingReturnReport/list.vue

@@ -284,13 +284,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 3 - 3
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -223,9 +223,9 @@ export default {
     columns () {
       let _this=this
       const arr = [
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '订单号', dataIndex: 'bizNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '日期', dataIndex: 'bizCreateDate', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },

+ 5 - 3
src/views/reportData/regionTypeSalesReport/list.vue

@@ -32,7 +32,7 @@
                 <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-if="activeKey==0">
+            <a-col :md="6" :sm="24">
                 <a-form-model-item label="区域负责人">
                     <BizUser v-model="queryParam.subareaArea.bizUserSn"></BizUser>
                 </a-form-model-item>
@@ -224,13 +224,15 @@ export default {
       const tableTitle = await titUrl().then(res => res.data)
       this.columns = tableTitle.list
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/returnGoodsPresentation/list.vue

@@ -286,13 +286,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 3 - 1
src/views/reportData/returnSlipReport/list.vue

@@ -299,9 +299,11 @@ export default {
         if(item.customRender == 'amount'){
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w*2: (w>=360?200:w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -282,13 +282,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 6 - 6
src/views/reportData/salesDetails/list.vue

@@ -225,13 +225,13 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库仓库', dataIndex: 'warehouseName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealerName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 4 - 2
src/views/reportData/salesPresentation/list.vue

@@ -285,13 +285,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 3 - 3
src/views/reportData/salesReturnDetailReport/list.vue

@@ -229,9 +229,9 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'subareaArea.bizUserName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货单号', dataIndex: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 4 - 2
src/views/reportData/salesReturnReport/list.vue

@@ -288,13 +288,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 4 - 2
src/views/reportData/salesSlipReport/list.vue

@@ -290,13 +290,15 @@ export default {
       this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
       this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
       this.columns.map(item => {
-        let mw = 40
+        let mw = 20
         if (item.customRender == 'amount') {
           mw = 15
           item.customRender = function (text) { return (text || text == 0) ? _this.toThousands(text) : '--' }
+        }else{
+          item.customRender = function (text) { return text || '--' }
         }
         const w = item.title.length * mw
-        const tw = w <= 80 && item.customRender != 'amount' ? w * 2 : (w >= 360 ? 200 : w)
+        const tw = w <= 80 ? mw*5 : w
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117/ocs-admin',
+        // target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {