Browse Source

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

chenrui 4 months ago
parent
commit
e35f1bd925
1 changed files with 27 additions and 11 deletions
  1. 27 11
      src/views/salesManagement/salesQueryNew/list.vue

+ 27 - 11
src/views/salesManagement/salesQueryNew/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate ref="rangeDate" id="salesManagementList-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -82,12 +82,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse id="salesManagementList-warehouse" ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="促销单">
                   <v-select
+                    id="salesManagementList-promoFlag"
                     v-model="queryParam.promoFlag"
                     ref="cxFlag"
                     code="FLAG"
@@ -102,7 +103,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="转费用报销单">
-                  <a-select v-model="queryParam.expenseClainFlag" placeholder="请选择转费用报销单状态" allowClear>
+                  <a-select v-model="queryParam.expenseClainFlag" id="salesManagementList-expenseClainFlag" placeholder="请选择转费用报销单状态" allowClear>
                     <a-select-option value="N">待转</a-select-option>
                     <a-select-option value="Y">已转</a-select-option>
                     <a-select-option value="ALL">全部</a-select-option>
@@ -111,23 +112,24 @@
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
-                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                  <customerService ref="customerName" id="salesManagementList-bizUserSn" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24">
-              <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 10px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a-button type="primary" :disabled="disabled" id="salesManagementList-searchButton" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 10px" :disabled="disabled" id="salesManagementList-resetButton" @click="resetSearchForm()">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
+                id="salesManagementList-export"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_sales_export')"
               >导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
+              <a @click="advanced=!advanced" style="margin-left: 8px" id="salesManagementList-advanced">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
@@ -141,8 +143,8 @@
         <!-- 操作按钮 -->
         <div class="table-operator" style="display: flex;justify-content: space-between;align-items: center;">
           <div style="padding-right: 15px;">
-            <a-button type="primary" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button>
-            <a-button type="primary" class="button-info" v-if="$hasPermissions('B_convertExpense')" @click="toWaitCostOrder">批量转</a-button>
+            <a-button type="primary" v-if="$hasPermissions('B_salesAdd')" id="salesManagementList-handleAdd" @click="handleAdd">新增</a-button>
+            <a-button type="primary" class="button-info" v-if="$hasPermissions('B_convertExpense')" id="salesManagementList-plz" @click="toWaitCostOrder">批量转</a-button>
           </div>
           <div style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
             <div class="tongji-bar">
@@ -479,6 +481,18 @@ export default {
           key: 'totalConvertPromoGiftsAmount',
           disabled: !this.$hasPermissions('M_salesQueryList_salesPrice'),
           checked: false
+        },
+        {
+          title: '发货经销商',
+          key: 'transferDealerName',
+          disabled: false,
+          checked: false
+        },
+        {
+          title: '转单时间',
+          key: 'transferDate',
+          disabled: false,
+          checked: false
         }
       ]
     }
@@ -497,8 +511,9 @@ export default {
         { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '10%', align: 'left' },
-        { title: '提交时间', slots: { title: 'customDateTitle' }, dataIndex: 'firstSubmitDate', width: '6%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
+        { title: '提交时间', slots: { title: 'customDateTitle' }, dataIndex: 'firstSubmitDate', width: '6.5%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '发货经销商', dataIndex: 'transferDealerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', dataIndex: 'warehouseNameSet', width: '6.5%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '4%', align: 'center' },
         { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -514,7 +529,8 @@ export default {
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6.5%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
+        { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '7%', align: 'center', customRender: function (text) { return formatDate(text) }, sorter: true },
+        { title: '转单时间', dataIndex: 'transferDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '6.5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]