Просмотр исходного кода

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

chenrui 2 лет назад
Родитель
Сommit
9f3a329af7

+ 1 - 1
src/libs/JGPrint.js

@@ -185,7 +185,7 @@ export const jGPlPrint = function (data, type, callback, printLogParams, orginDa
   // 循环页
   for(var i=0;i<data.length;i=i+2){
      if(i%2==0){
-       LODOP.NewPageA();
+       LODOP.NewPage();
      }
      LODOP.ADD_PRINT_HTM(0, 0, '100%', '99%', data[i]+(data[i+1]||''))
   }

+ 2 - 2
src/views/dealerManagement/dealerZoneSearch/list.vue

@@ -80,8 +80,8 @@ export default {
       },
       columns: [
         { title: '经销商名称', dataIndex: 'subareaName1', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '所属区域', dataIndex: 'subareaName2', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属分区', dataIndex: 'subareaName3', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaArea.subareaAreaName', width: "10%", align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客服', dataIndex: 'subareaName4', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域负责人', dataIndex: 'subareaName5', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售总监', dataIndex: 'subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }

+ 3 - 9
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -73,13 +73,6 @@
           <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
           <span v-else>{{ record.dealerName }}</span>
         </template>
-        <!-- 区域 -->
-        <template slot="area" slot-scope="text, record">
-          <div v-if="record.subareaNameSet&&record.subareaNameSet.length!=0">
-            <span v-for="(item, index) in record.subareaNameSet" :key="index">{{ item }}{{ index+1 == record.subareaNameSet.length ? '' : ',' }}</span>
-          </div>
-          <span v-else>--</span>
-        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
@@ -139,7 +132,8 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域', scopedSlots: { customRender: 'area' }, width: '7%', align: 'center' },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户名称', scopedSlots: { customRender: 'dealerName' }, width: '10%', align: 'center', ellipsis: true },
         { title: '商户别名', dataIndex: 'dealerAlias', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -150,7 +144,7 @@ export default {
         { title: '审核状态', dataIndex: 'auditStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '合作状态', dataIndex: 'cooperateFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '生效时间', dataIndex: 'cooperateEffectiveTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ],
       loading: false,
       // 加载数据方法 必须为 Promise 对象

+ 6 - 4
src/views/expenseManagement/expenseReimbursement/chooseImportModal.vue

@@ -129,8 +129,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
         { title: '记账类型', dataIndex: 'importAccountType', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'importAccountName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属区域', dataIndex: 'subareaNames', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '所属省份', dataIndex: 'provinceName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '所属区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属省份', dataIndex: 'provinceName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remarks', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },
@@ -141,8 +142,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '9%', align: 'center' },
         { title: '记账类型', dataIndex: 'importAccountType', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'importAccountName', width: '21%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属区域', dataIndex: 'subareaNames', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '所属省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '所属区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remarks', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用承担方', scopedSlots: { customRender: 'fycdf' }, align: 'center', width: '15%' },

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -141,7 +141,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '记账类型', dataIndex: 'accountTypeDictValue', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', scopedSlots: { customRender: 'jzname' }, align: 'center', width: '14%' },
-        { title: '所属区域', dataIndex: 'subareaNames', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
+        { title: '所属区域', dataIndex: 'subareaArea.subareaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所属分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属省份', dataIndex: 'provinceName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', align: 'center', width: '8%', customRender: function (text) { return text || '--' } },
         { title: '记账费用', dataIndex: 'expense', align: 'right', width: '10%', customRender: function (text) { return (text||text==0)?_this.toThousands(text):'--' } },

+ 8 - 17
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -150,8 +150,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaSnList: undefined, //  所属区域
-        subareaNameList: undefined,
+        subareaSn: undefined, //  所属区域
+        subareaName: undefined,
+        subareaAreaSn: undefined, // 分区
         provinceSn: undefined, // 省份
         provinceName: '',
         citySn: undefined, // 市
@@ -188,19 +189,14 @@ export default {
           this.form.citySn = row.citySn
           this.form.provinceName = row.provinceName
           this.form.cityName = row.cityName
-          if (row.subareaNameSet) {
-            const a = row.subareaNameSet.filter(item => item !== '中国')
-            this.form.subareaNameList = [a[0]]
-            this.form.subareaSnList = [this.$refs.subareaBox.getValByName(this.form.subareaNameList)[0]]
-          }
+          this.form.subareaSn = row.subareaSn
+          this.form.subareaAreaSn = row.subareaAreaSn
         } else {
           this.form.accountNameSn = ''
           this.form.provinceSn = ''
           this.form.citySn = ''
           this.form.provinceName = ''
           this.form.cityName = ''
-          this.form.subareaNameList = ''
-          this.form.subareaSnList = ''
           this.form.subareaSn = ''
           this.form.subareaAreaSn = ''
           this.$refs.subareaBox.clearData()
@@ -212,7 +208,6 @@ export default {
     },
     // 分区
     subareaChange(val, row){
-      this.form.subareaName = row.subareaName
       this.form.subareaSn = val[0] ? val[0] : undefined
       this.form.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -287,13 +282,9 @@ export default {
           form.citySn = form.citySn ? form.citySn : ''
           form.cityName = form.cityName ? form.cityName : ''
           form.expense = Math.abs(form.expense)
-          // 不是数组
-          if (!Array.isArray(form.subareaSnList)) {
-            form.subareaSnList = [form.subareaSnList]
-          }
+          
           console.log(form)
-          delete form.subareaNames
-          delete form.subareaSns
+        
           _this.spinning = true
           expenseAcctDetailSave(form).then(res => {
             if (res.status == 200) {
@@ -315,6 +306,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.ruleForm.resetFields()
         this.$refs.city.clearData()
+        this.$refs.subareaBox.clearData()
       })
       this.form = {
         id: undefined,
@@ -340,7 +332,6 @@ export default {
       this.form.cityName = ''
       this.form.expenseAccountSn = this.expenseAccountSn
       this.form.expenseAccountNo = this.expenseAccountNo
-      this.$refs.subareaBox.clearData()
     }
   },
   watch: {

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/previewModal.vue

@@ -162,13 +162,13 @@ export default {
       for (let i = 0; i < printCons.length; i++) {
         if (printCons[i].h > 560) {
           htmlStr.push('')
-        }else{
-          printCons[i].t = '<div style="height:535px;">' +printCons[i].t+'</div>'
         }
+        printCons[i].t = '<div style="height:530px;margin:0 auto;">' +printCons[i].t+'</div>'
         htmlStr.push(printCons[i].t)
       }
       this.$store.state.app.curActionPermission = 'B_eRPrint'
       // html, type, callback, printLogParams
+      // console.log(htmlStr)
       jGPlPrint(htmlStr, 'preview', function (res) {
         _this.$store.state.app.curActionPermission = ''
         _this.$emit('printOk', res)

+ 2 - 1
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -276,7 +276,8 @@ export default {
         { title: '记账类型', dataIndex: 'accountTypeDictValue', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账名称', dataIndex: 'accountName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '财务编码', dataIndex: 'accountNameFnumber', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '所属区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '所属城市', dataIndex: 'cityName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账费用', dataIndex: 'expense', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 1 - 0
src/views/financialManagement/financialCollection/edit.vue

@@ -329,6 +329,7 @@ export default {
       if (this.$hasPermissions('B_glDispatch_salesPrice')) { //  售价权限
         arr.splice(9, 0, { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '6%', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
+      return arr
     }
   },
   methods: {

+ 2 - 4
src/views/financialManagement/inventoryConfirmation/detail.vue

@@ -58,10 +58,8 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item style="margin-bottom: 10px;">
-                      <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationDetail-refresh">查询</a-button>
-                      <a-button style="margin-left: 5px" @click="resetSearchForm" id="inventoryConfirmationDetail-reset">重置</a-button>
-                    </a-form-model-item>
+                    <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryConfirmationDetail-refresh">查询</a-button>
+                    <a-button style="margin-left: 5px" @click="resetSearchForm" id="inventoryConfirmationDetail-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form-model>

+ 2 - 9
src/views/reportData/allCountryCostReport/list.vue

@@ -154,15 +154,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        {
-          title: '区域',
-          dataIndex: 'area',
-          width: 200,
-          align: 'center',
-          customRender: function (text) {
-            return text || '--'
-          }
-        },
+        { 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: '',

+ 2 - 1
src/views/reportData/allocationDetails/list.vue

@@ -242,7 +242,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'allocateNo', width: 160, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '调拨开单日期', dataIndex: 'allocateDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 20 - 14
src/views/reportData/allocationOrderTotal/list.vue

@@ -72,12 +72,18 @@
         :data="loadData"
         :defaultLoadData="false"
         bordered>
-        <template slot="footer" slot-scope="currentPageData">
-          <a-row :gutter="15">
-            <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</a-col>
-          </a-row>
+        <template slot="footer">
+          <table>
+            <tr>
+              <td style="width:15%"></td>
+              <td style="width:15%"></td>
+              <td style="width:20%"></td>
+              <td style="width:12%;text-align: center;">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</td>
+              <td style="width:12%;text-align: right;"><span v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总成本价:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</span></td>
+              <td style="width:12%;text-align: right;"><span v-if="$hasPermissions('M_allocationOrderTotalList_costPrice')">总毛利:{{ (totalData && (totalData.totalGrossProfit || totalData.totalGrossProfit==0)) ? toThousands(totalData.totalGrossProfit) : '--' }}</span></td>
+              <td style="width:14%"></td>
+            </tr>
+          </table>
         </template>
       </s-table>
     </a-spin>
@@ -152,17 +158,17 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '调拨单号', dataIndex: 'allocateNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨单号', dataIndex: 'allocateNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨开单日期', dataIndex: 'allocateDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'targetName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调拨数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '成本价', dataIndex: 'totalCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作员', dataIndex: 'creatorName', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '客户名称', dataIndex: 'targetName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调拨数量', dataIndex: 'totalQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '成本价', dataIndex: 'totalCost', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '毛利', dataIndex: 'totalGrossProfit', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作员', dataIndex: 'creatorName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_allocationOrderTotalList_costPrice')) { //  成本价权限
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(5, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'totalCost', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 2 - 1
src/views/reportData/allocationPresentation/list.vue

@@ -204,7 +204,8 @@ export default {
   computed: {
     columns () {
       let arr = [
-        { title: '区域', dataIndex: 'subareaName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'allocateNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 2 - 1
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -215,7 +215,8 @@ export default {
     columns () {
       let _this=this
       const arr = [
-        { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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 || '--' } },

+ 2 - 6
src/views/reportData/regionTypeSalesReport/list.vue

@@ -136,12 +136,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域',
-          dataIndex: 'subareaNames',
-          width: 50,
-          align: 'center',
-          customRender: function (text) { return text || '--' }
-        },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售状态', dataIndex: 'salesStatus', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '箭牌滤清器', dataIndex: 'jpLqqAmount', width: 50, align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '冠牌滤清器', dataIndex: 'gpLqqAmount', width: 50, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 2 - 1
src/views/reportData/salesDetails/list.vue

@@ -209,7 +209,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'salesBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { 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 },

+ 2 - 1
src/views/reportData/salesReturnDetailReport/list.vue

@@ -212,7 +212,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'salesReturnBillNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerProvinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 2 - 1
src/views/reportData/transferReturnDetailReport/list.vue

@@ -231,7 +231,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: 'allocateReturnNo', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货完成日期', dataIndex: 'financeAuditTime', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 3 - 2
src/views/salesManagement/sendOutOrder/list.vue

@@ -216,11 +216,12 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '12%', align: 'center' },
-        { title: '所在区域', dataIndex: 'subareaNameSet', width: '8%', align: 'center', customRender: function (text) { return text.toString() || '--' } },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流电话', dataIndex: 'transportTele', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流单号', dataIndex: 'transportNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总件数', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 2 - 1
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -202,7 +202,8 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '区域', dataIndex: 'subareaNames', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { 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: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, align: 'center' },
         { title: '省份', dataIndex: 'dealerEntity.provinceName', width: 80, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: 140, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 1
vue.config.js

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