chenrui 1 rok temu
rodzic
commit
38e9450c37

+ 9 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -59,6 +59,11 @@
                   <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="outboundOrderList-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -219,7 +224,8 @@ export default {
         },
         shippingAddrProvinceSn: undefined,
         sendFlag: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        outBizSubNo: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
       loading: false,
@@ -255,6 +261,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库单号', scopedSlots: { customRender: 'stockOutNo' }, width: '10%', align: 'center' },
         { title: '业务单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货单号', dataIndex: 'outBizSubNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -318,6 +325,7 @@ export default {
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.outBizSubNo = ''
       if (this.advanced) {
         this.$refs.subarea.clearData()
       }

+ 16 - 12
src/views/salesManagement/salesQueryNew/list.vue

@@ -435,6 +435,11 @@ export default {
           value: 'showCancelQty',
           key: 'showCancelQty'
         },
+        {
+          title: '待下推数量',
+          value: 'showPushedQty',
+          key: 'showPushedQty'
+        },
         {
           title: '待下推金额',
           value: 'showPushedPrice',
@@ -458,14 +463,8 @@ export default {
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'left', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
-        // 总售价
-        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // 待下推金额
         { title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // 下推总金额
-        // 已取消数量
         { title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // 转采购额数量
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
@@ -474,17 +473,22 @@ export default {
         { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-      if (this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showPushedPrice')) {
-        arr.splice(7, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
       if (this.$hasPermissions('M_salesQueryList_salesPrice')) { // 售价权限
-        const pos = this.showCols.includes('showPushedPrice') ? 10 : 9
         arr.splice(6, 0, { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(pos, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.showCols.includes('showCancelQty')) {
-        arr.splice(11, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') ? 9 : 7
+        arr.splice(pos, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
+      if (this.showCols.includes('showPushedQty')) {
+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showCancelQty') ? 11 : 8
+        arr.splice(pos, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      }
+      if (this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showPushedPrice')) {
+        arr.splice(12, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+
       if (this.showCols.includes('showPurchaseQty')) {
         arr.splice(13, 0, { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }