lilei 11 bulan lalu
induk
melakukan
971e08277c
1 mengubah file dengan 12 tambahan dan 12 penghapusan
  1. 12 12
      src/views/salesManagement/waitCostOrder/list.vue

+ 12 - 12
src/views/salesManagement/waitCostOrder/list.vue

@@ -14,8 +14,13 @@
               <a-form layout="inline" @keyup.enter.native="searchTable">
                 <a-row :gutter="15" type="flex">
                   <a-col flex="300px">
-                    <a-form-item label="促销名称/简称">
-                      <a-input id="waitCostList-promotionDescription" v-model.trim="queryParam.promotionDescription" allowClear placeholder="请输入促销名称/简称"/>
+                    <a-form-item label="销售单号">
+                      <a-input id="waitCostList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col flex="300px">
+                    <a-form-item label="客户名称">
+                      <dealerSubareaScopeList id="waitCostList-dealerSubareaScopeList" ref="dealerSubareaScopeList" @change="custChange" />
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
@@ -29,13 +34,8 @@
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
-                    <a-form-item label="客户名称">
-                      <dealerSubareaScopeList id="waitCostList-dealerSubareaScopeList" ref="dealerSubareaScopeList" @change="custChange" />
-                    </a-form-item>
-                  </a-col>
-                  <a-col flex="300px">
-                    <a-form-item label="销售单号">
-                      <a-input id="waitCostList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                    <a-form-item label="促销名称/简称">
+                      <a-input id="waitCostList-promotionDescription" v-model.trim="queryParam.promotionDescription" allowClear placeholder="请输入促销名称/简称"/>
                     </a-form-item>
                   </a-col>
                   <a-col flex="300px">
@@ -192,14 +192,14 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '费用类型', dataIndex: 'convertExpenseAccountTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '待转金额', dataIndex: 'expense', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '促销名称', dataIndex: 'promotionTitle', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销简称', dataIndex: 'promotionDescription', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '规则简称', dataIndex: 'promotionRuleDescription', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '促销简称', dataIndex: 'promotionDescription', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '规则简称', dataIndex: 'promotionRuleDescription', width: '16%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '促销类型', dataIndex: 'promotionRuleTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]