chenrui 4 tahun lalu
induk
melakukan
e79677a185

+ 6 - 6
src/views/salesManagement/salesQuery/detail.vue

@@ -41,18 +41,18 @@
       <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
         <div slot="message">
           总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;已发货数量:<strong>{{ detailData.totalDispatchQty || 0 }}</strong>;待发货数量:<strong>{{ detailData.totalUndispatchQty || 0 }}</strong>;<br/>
-          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }};已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }};待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
-          </strong></strong></div>
+          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;已发货金额:<strong>{{ detailData.totalDispatchAmount || 0 }}</strong>;待发货金额:<strong>{{ detailData.totalUndispatchAmount || 0 }}</strong>;
+        </div>
       </a-alert>
       <!-- 列表 -->
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1660 }"
+        :scroll="{ x: 1440 }"
         bordered>
         <!-- 产品编码 -->
         <template slot="productCode" slot-scope="text, record">
@@ -113,9 +113,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, scopedSlots: { customRender: 'productCode' }, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, scopedSlots: { customRender: 'productCode' }, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'showCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '销售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 3 - 3
src/views/salesManagement/salesQuery/edit.vue

@@ -70,7 +70,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x:1000, y: 300 }"
+        :scroll="{ x:1190, y: 300 }"
         bordered>
         <!-- 产品名称 -->
         <template slot="productName" slot-scope="text, record">
@@ -184,9 +184,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 150, align: 'center', sorter: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', sorter: true },
         { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '售价', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '售价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },

+ 12 - 5
src/views/salesManagement/salesQuery/list.vue

@@ -26,6 +26,11 @@
             </a-form-item>
           </a-col>
           <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="采购单号">
+                <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="打印状态">
                 <v-select
@@ -106,11 +111,11 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2500, y:tableHeight }"
+      :scroll="{ x: 2640, y:tableHeight }"
       bordered>
       <!-- 销售单号 -->
       <template slot="salesBillNo" slot-scope="text, record">
-        <a-badge :count="'改'+record.changeTimes" v-if="record.changeTimes>0">
+        <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
           <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
         </a-badge>
         <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
@@ -207,7 +212,8 @@ export default {
       queryParam: {
         buyerSn: undefined, //  客户名称
         salesBillNo: '', //  销售单号
-        printStatus: undefined, //  采购单号
+        purchaseBillNo: '',
+        printStatus: undefined,
         billStatus: undefined, //  业务状态
         financialStatus: undefined //  财务状态
       },
@@ -231,6 +237,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '单据来源', dataIndex: 'salesBillSourceDictValue', width: 120, align: 'center' },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: 210, align: 'center' },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 210, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: 100, align: 'center' },
         { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
@@ -366,11 +373,11 @@ export default {
     },
     // 重置
     resetSearchForm () {
-      this.queryParam.buyerSn = undefined
       this.$refs.custList.resetForm()
+      this.queryParam.buyerSn = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.purchaseBillNo = ''
-      this.queryParam.payType = undefined
+      this.queryParam.printStatus = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.financialStatus = undefined
       this.time = []

+ 6 - 6
src/views/salesManagement/salesQuery/queryPart.vue

@@ -55,7 +55,7 @@
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
-      :scroll="{ x: 1400, y: 300 }"
+      :scroll="{ x: 1710, y: 300 }"
       :defaultLoadData="false"
       bordered>
       <!-- 销售数量 -->
@@ -123,14 +123,14 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'productBrandName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'productBrandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentStockQty', width: 100, align: 'center', customRender: function (text) { return text || 0 } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价', dataIndex: 'productPrice', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '包装数', dataIndex: 'productPackQty', width: 100, align: 'center' },
+        { title: '售价', dataIndex: 'productPrice', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '包装数', dataIndex: 'productPackQty', width: 100, align: 'center', customRender: function (text) { return text || 0 } },
         { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: 150, align: 'center' },
         { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],

+ 6 - 6
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -7,7 +7,7 @@
     :rowKey="(record) => record.id"
     :columns="columns"
     :data="loadData"
-    :scroll="{ x:1000, y: 300 }"
+    :scroll="{ x:1470, y: 300 }"
     :defaultLoadData="false"
     bordered>
     <!-- 产品名称 -->
@@ -61,14 +61,14 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: 150, align: 'center', sorter: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 220, align: 'center', sorter: true },
         { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center' },
-        { title: '成本价', dataIndex: 'showCost', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '原售价', dataIndex: 'origPrice', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '促销价', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '成本价', dataIndex: 'showCost', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '原售价', dataIndex: 'origPrice', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '促销价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promotionRulesName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 3 - 3
src/views/salesManagement/waitDispatch/edit.vue

@@ -59,7 +59,7 @@
         :columns="columns"
         :data="loadData"
         :showPagination="false"
-        :scroll="{ x:1000, y: 300 }"
+        :scroll="{ x:1150, y: 300 }"
         bordered>
         <!-- 产品编码 -->
         <template slot="productCode" slot-scope="text, record">
@@ -133,8 +133,8 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 300, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', width: 300, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 220, align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '剩余待下推', dataIndex: 'surplusQty', width: 150, align: 'center' },
         { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 11 - 11
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -82,7 +82,7 @@
       :columns="columns"
       :showPagination="false"
       :data="loadData"
-      :scroll="{ x: 1400, y: 300 }"
+      :scroll="{ x: 2060, y: 300 }"
       bordered>
       <!-- 取消数量 -->
       <template slot="nums" slot-scope="text, record">
@@ -155,17 +155,17 @@ export default {
       selectedRows: [],
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 200, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: 200, align: 'center' },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 140, align: 'center', customRender: function (text) { return text == '' ? text : '--' } },
-        { title: '成本价', dataIndex: 'showCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '销售价', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 220, align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text == '' ? text : '--' } },
+        { title: '成本价', dataIndex: 'showCost', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '销售价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '可用库存', dataIndex: 'stockQty', width: 150, align: 'center', customRender: function (text) { return text || 0 } },
-        { title: '销售数量', dataIndex: 'qty', width: 150, align: 'center', customRender: function (text) { return text || 0 } },
-        { title: '已取消', dataIndex: 'cancelQty', width: 150, align: 'center', customRender: function (text) { return text || 0 } },
-        { title: '已下推', dataIndex: 'pushedQty', width: 150, align: 'center', customRender: function (text) { return text || 0 } },
-        { title: '剩余待下推', dataIndex: 'surplusQty', width: 150, align: 'center', customRender: function (text) { return text || 0 } },
+        { title: '可用库存', dataIndex: 'stockQty', width: 120, align: 'center', customRender: function (text) { return text || 0 } },
+        { title: '销售数量', dataIndex: 'qty', width: 120, align: 'center', customRender: function (text) { return text || 0 } },
+        { title: '已取消', dataIndex: 'cancelQty', width: 120, align: 'center', customRender: function (text) { return text || 0 } },
+        { title: '已下推', dataIndex: 'pushedQty', width: 120, align: 'center', customRender: function (text) { return text || 0 } },
+        { title: '剩余待下推', dataIndex: 'surplusQty', width: 120, align: 'center', customRender: function (text) { return text || 0 } },
         { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: 150, align: 'center' },
         { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],