lilei %!s(int64=3) %!d(string=hai) anos
pai
achega
687cb01fe5

+ 1 - 1
src/views/allocationManagement/transferOut/printModal.vue

@@ -66,7 +66,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        id: undefined,
+        id: 'all',
         priceType: undefined
       },
       rules: {

+ 5 - 5
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -49,7 +49,7 @@
         :rowKey="(record) => record.sparePartsSn"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1550, y: tableHeight }"
+        :scroll="{ x: 1350, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 入库单号 -->
@@ -107,11 +107,11 @@ export default {
         { title: '商户名称', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量', dataIndex: 'productTotalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库成本', dataIndex: 'productTotalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'relationNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金蝶单号', dataIndex: 'kingdeeNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'relationNo', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '金蝶单号', dataIndex: 'kingdeeNo', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remark', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '备注', dataIndex: 'remark', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column

+ 1 - 1
src/views/salesManagement/salesQuery/printModal.vue

@@ -65,7 +65,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        id: undefined,
+        id: 'all',
         priceType: undefined
       },
       rules: {