浏览代码

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei 4 年之前
父节点
当前提交
09d8964538
共有 23 个文件被更改,包括 87 次插入85 次删除
  1. 1 1
      src/views/allocationManagement/chainTransferIn/detail.vue
  2. 3 3
      src/views/allocationManagement/chainTransferIn/edit.vue
  3. 9 9
      src/views/allocationManagement/chainTransferOut/edit.vue
  4. 1 1
      src/views/allocationManagement/chainTransferOut/list.vue
  5. 10 10
      src/views/allocationManagement/storeTransferOut/edit.vue
  6. 2 2
      src/views/allocationManagement/storeTransferOut/list.vue
  7. 7 7
      src/views/allocationManagement/warehouseAllocation/edit.vue
  8. 2 2
      src/views/allocationManagement/warehouseAllocation/list.vue
  9. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  10. 10 10
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  11. 4 4
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  12. 1 1
      src/views/customerManagement/customerInfo/list.vue
  13. 1 1
      src/views/inventoryManagement/warehouse/list.vue
  14. 1 1
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  15. 1 1
      src/views/productManagement/productBrand/list.vue
  16. 6 6
      src/views/productManagement/productInfo/list.vue
  17. 1 1
      src/views/productManagement/productInfoJg/list.vue
  18. 7 7
      src/views/purchasingManagement/purchaseReturn/edit.vue
  19. 1 1
      src/views/purchasingManagement/purchaseReturn/list.vue
  20. 4 2
      src/views/salesManagement/outboundOrder/list.vue
  21. 6 6
      src/views/salesManagement/urgentItemsOffset/detail.vue
  22. 4 4
      src/views/salesManagement/urgentItemsOffset/list.vue
  23. 1 1
      src/views/supplierManagement/supplierInfo/list.vue

+ 1 - 1
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -40,7 +40,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"

+ 3 - 3
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -49,7 +49,7 @@
                   @change="changeProductType"
                   change-on-select
                   v-model="productType"
-				  expand-trigger="hover"
+                  expand-trigger="hover"
                   :options="productTypeList"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   id="chainTransferInEdit-productType"
@@ -68,7 +68,7 @@
       <a-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"
@@ -79,7 +79,7 @@
           <a-cascader
             @change="e => changeWarehouseCascade(e, record, index)"
             v-model="record.warehouseCascade"
-			expand-trigger="hover"
+            expand-trigger="hover"
             :options="warehouseCascadeData"
             :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
             id="chainTransferInEdit-warehouseCascade"

+ 9 - 9
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -56,7 +56,7 @@
                         @change="changeProductType"
                         change-on-select
                         v-model="productType"
-						expand-trigger="hover"
+                        expand-trigger="hover"
                         :options="productTypeList"
                         :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                         id="chainTransferOutEdit-productType"
@@ -92,7 +92,7 @@
             :columns="columns"
             :customRow="handleClickRow"
             :dataSource="loadData"
-            :scroll="{ x: 1650, y: 300 }"
+            :scroll="{ x: 1680, y: 300 }"
             bordered>
             <!-- 调出数量 -->
             <template slot="outQty" slot-scope="text, record">
@@ -158,7 +158,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :data="chooseLoadData"
-            :scroll="{ x: 1665, y: 300 }"
+            :scroll="{ x: 1695, y: 300 }"
             bordered>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
@@ -214,16 +214,16 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '成本价(¥)', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 150, align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
@@ -243,15 +243,15 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'dealerProductEntity.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调出数量', dataIndex: 'outQty', width: 150, align: 'center' },
+        { title: '调出数量', dataIndex: 'outQty', width: 140, align: 'center' },
         { title: '成本小计', dataIndex: 'costSubtotal', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -88,7 +88,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1680, y: tableHeight }"
+      :scroll="{ x: 1670, y: tableHeight }"
       bordered>
       <!-- 连锁调出单号 -->
       <template slot="allocationLinkageOutNo" slot-scope="text, record">

+ 10 - 10
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -44,7 +44,7 @@
                         @change="changeProductType"
                         change-on-select
                         v-model="productType"
-						expand-trigger="hover"
+                        expand-trigger="hover"
                         :options="productTypeList"
                         :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                         id="storeTransferOutEdit-productType"
@@ -87,7 +87,7 @@
             :columns="columns"
             :customRow="handleClickRow"
             :data="loadData"
-            :scroll="{ x: 1080, y: 300 }"
+            :scroll="{ x: 1180, y: 300 }"
             :defaultLoadData="false"
             bordered>
             <!-- 操作 -->
@@ -142,7 +142,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :dataSource="chooseLoadData"
-            :scroll="{ x: 1185, y: 300 }"
+            :scroll="{ x: 1335, y: 300 }"
             :pagination="choosePaginationProps"
             bordered>
             <!-- 调出数量 -->
@@ -214,11 +214,11 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '库存数量', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本价(¥)', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
@@ -239,13 +239,13 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价(¥)', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 150, align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],

+ 2 - 2
src/views/allocationManagement/storeTransferOut/list.vue

@@ -149,7 +149,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: 200, align: 'center' },
+        { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: 220, align: 'center' },
         { title: '调往对象名称', dataIndex: 'putPersonName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '调拨类型', dataIndex: 'callOutTypeName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -164,7 +164,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight - 380
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 7 - 7
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -57,7 +57,7 @@
                         @change="changeProductType"
                         change-on-select
                         v-model="productType"
-						expand-trigger="hover"
+                        expand-trigger="hover"
                         :options="productTypeList"
                         :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                         id="warehouseAllocationEdit-productType"
@@ -93,7 +93,7 @@
             :columns="columns"
             :customRow="handleClickRow"
             :dataSource="loadData"
-            :scroll="{ x: 1080, y: 300 }"
+            :scroll="{ x: 1780, y: 300 }"
             :pagination="paginationProps"
             bordered>
             <!-- 产品分类 -->
@@ -171,7 +171,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :dataSource="chooseLoadData"
-            :scroll="{ x: 1185, y: 300 }"
+            :scroll="{ x: 1680, y: 300 }"
             :pagination="choosePaginationProps"
             bordered>
             <!-- 产品分类 -->
@@ -261,9 +261,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
@@ -286,9 +286,9 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },

+ 2 - 2
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -65,7 +65,7 @@
       :rowKey="record => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1480, y: tableHeight }"
+      :scroll="{ x: 1500, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="allocationWarehouseNo" slot-scope="text, record">
@@ -146,7 +146,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight - 380
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -61,7 +61,7 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
-            :scroll="{ x: 1280 }"
+            :scroll="{ x: 1180 }"
             bordered>
           </s-table>
         </a-collapse-panel>
@@ -98,14 +98,14 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购单价', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'putQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购金额', dataIndex: 'purchaseAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 200, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 10 - 10
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -91,7 +91,7 @@
               :columns="columns"
               :customRow="handleClickRow"
               :dataSource="loadData"
-              :scroll="{ x: 1780, y: 300 }"
+              :scroll="{ x: 1600, y: 300 }"
               :pagination="paginationProps"
               bordered>
               <!-- 成本价 -->
@@ -159,7 +159,7 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
-              :scroll="{ x: 1880, y: 300 }"
+              :scroll="{ x: 1700, y: 300 }"
               :pagination="choosePaginationProps"
               bordered>
               <!-- 成本价 -->
@@ -251,13 +251,13 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'origCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 150, align: 'center' },
-        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 150, align: 'center' },
+        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 140, align: 'center' },
+        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 140, align: 'center' },
         { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
@@ -274,13 +274,13 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 200, align: 'center', sorter: true },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', sorter: true },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 150, align: 'center' },
-        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 150, align: 'center' },
+        { title: '成本价', scopedSlots: { customRender: 'putCost' }, width: 140, align: 'center' },
+        { title: '数量', scopedSlots: { customRender: 'putQty' }, width: 140, align: 'center' },
         { title: '成本小计', dataIndex: 'costSubtotal', width: 100, align: 'center' },
         { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -96,7 +96,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1410, y: tableHeight }"
+      :scroll="{ x: 1360, y: tableHeight }"
       bordered>
       <!-- 散件单号 -->
       <template slot="sparePartsPurchaseNo" slot-scope="text, record">
@@ -165,14 +165,14 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, width: 200, align: 'center' },
+        { title: '散件单号', scopedSlots: { customRender: 'sparePartsPurchaseNo' }, width: 220, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '供应商', dataIndex: 'supplierName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总金额', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center' },
+        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
src/views/customerManagement/customerInfo/list.vue

@@ -178,7 +178,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 284
+          this.tableHeight = window.innerHeight - 380
         }
         // 创建时间
         if (this.creatTime && this.creatTime.length > 0) {

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -84,7 +84,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 340
+          this.tableHeight = window.innerHeight - 380
         }
         return warehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -82,7 +82,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 340
+          this.tableHeight = window.innerHeight - 380
         }
         return warehouseLocList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -90,7 +90,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight - 380
         }
         return dealerProductBrandList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 6 - 6
src/views/productManagement/productInfo/list.vue

@@ -40,7 +40,7 @@
                   @change="changeProductType"
                   change-on-select
                   v-model="productType"
-				  expand-trigger="hover"
+                  expand-trigger="hover"
                   :options="productTypeList"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   id="productInfoList-productType"
@@ -85,7 +85,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1500, y: tableHeight }"
+      :scroll="{ x: 1610, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
@@ -155,11 +155,11 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: 140, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
+        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '终端价', dataIndex: 'terminalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 140, align: 'center', fixed: 'right' },
@@ -169,7 +169,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 340
+          this.tableHeight = window.innerHeight - 380
         }
         return dealerProductList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data

+ 1 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -40,7 +40,7 @@
                   @change="changeProductType"
                   change-on-select
                   v-model="productType"
-				  expand-trigger="hover"
+                  expand-trigger="hover"
                   :options="productTypeList"
                   :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   id="productInfoList-productType"

+ 7 - 7
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -45,7 +45,7 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :dataSource="loadData"
-            :scroll="{ x: 1280, y: 300 }"
+            :scroll="{ x: 1320, y: 300 }"
             :pagination="paginationProps"
             bordered>
             <!-- 数量 -->
@@ -90,7 +90,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :dataSource="chooseLoadData"
-            :scroll="{ x: 1320, y: 300 }"
+            :scroll="{ x: 1420, y: 300 }"
             :pagination="choosePaginationProps"
             bordered>
             <!-- 退货数量 -->
@@ -154,9 +154,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 200, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center' },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: 200, align: 'center', ellipsis: true },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center' },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
         { title: '采购总数', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可退数量', dataIndex: 'qtyLeft', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: 100, align: 'center' },
@@ -177,8 +177,8 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 200, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: 220, align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
         { title: '采购总数', dataIndex: 'purchaseBillQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', scopedSlots: { customRender: 'qty' }, width: 100, align: 'center' },

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -133,7 +133,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 275
+          this.tableHeight = window.innerHeight - 380
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 4 - 2
src/views/salesManagement/outboundOrder/list.vue

@@ -123,7 +123,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      tableHeight: 300, // 表格高度
+      tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
         demanderName: undefined, //  客户名称
         outBizType: undefined, //  出库类型
@@ -152,7 +152,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        this.tableHeight = window.innerHeight - 220
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight
+        }
         // 审核时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)

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

@@ -63,21 +63,21 @@ export default {
     return {
       unColumns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 200, align: 'center' },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center' },
         { title: '库存数量', scopedSlots: { customRender: 'inventoryQuantity' }, width: 100, align: 'center' },
         { title: '未冲减数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: 220, align: 'center' },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'stockInDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '成本价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '已冲减数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 4 - 4
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -72,7 +72,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1280, y: tableHeight }"
+      :scroll="{ x: 1340, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="urgentBillNo" slot-scope="text, record">
@@ -105,8 +105,8 @@ export default {
       custAllList: [], //  客户下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 200, align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 220, align: 'center' },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -118,7 +118,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight
         }
         // 创建时间
         if (this.time && this.time.length > 0) {

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -91,7 +91,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 275
+          this.tableHeight = window.innerHeight - 380
         }
         return supplierList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data