Преглед изворни кода

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

chenrui пре 1 година
родитељ
комит
ac40f5fc90

+ 8 - 1
src/views/salesManagement/backorder/list.vue

@@ -15,6 +15,11 @@
                 <dealerSubareaScopeList ref="custList" id="backorderList-buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销售单号">
+                <a-input id="backorderList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              </a-form-item>
+            </a-col>
             <!-- <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库">
                 <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
@@ -82,7 +87,8 @@ export default {
         beginDate: '',
         endDate: '',
         buyerSn: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        salesBillNo: ''
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -140,6 +146,7 @@ export default {
       this.$refs.rangeDate.resetDate()
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
+      this.queryParam.salesBillNo = ''
       this.queryParam.buyerSn = undefined
       this.queryParam.warehouseSn = undefined
       this.$refs.custList.resetForm()

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

@@ -111,7 +111,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y:tableHeight, x: 1600 }"
+          :scroll="{ y:tableHeight, x: 1380 }"
           :defaultLoadData="false"
           bordered>
           <!-- 销售单号 -->
@@ -272,28 +272,28 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '40px', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '110px', align: 'center' },
-        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '100px', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '110px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '130px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '60px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '50px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货打印状态', width: '60px', align: 'center', scopedSlots: { customRender: 'printStatus' } },
         { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '40px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '80px', align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center',fixed:'right'}
       ]
 
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         const ind = this.isShowWarehouse ? 10 : 9
-        arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })