chenrui %!s(int64=4) %!d(string=hai) anos
pai
achega
17fafaa488

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -86,7 +86,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1630, y: tableHeight }"
+      :scroll="{ x: 1450, y: tableHeight }"
       bordered>
       <!-- 现有库存数量 -->
       <template slot="currentStockQty" slot-scope="text, record">
@@ -141,7 +141,7 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '最后入库时间', dataIndex: 'lastStockTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位', dataIndex: 'productUnit', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量(个)', dataIndex: 'currentStockQty', scopedSlots: { customRender: 'currentStockQty' }, width: 165, align: 'center', sorter: true },
         { title: '库存成本(¥)', dataIndex: 'currentStockCost', width: 165, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -36,7 +36,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="(record) => record.id"
         :columns="$route.params.type=='stockOut' ? outColumns : columns"
         :data="loadData"

+ 13 - 24
src/views/salesManagement/salesReturn/detail.vue

@@ -33,7 +33,7 @@
       <s-table
         class="sTable"
         ref="table"
-        size="default"
+        size="small"
         :rowKey="record => record.id"
         :columns="columns"
         :data="loadData"
@@ -86,23 +86,21 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        {
-          title: '采购单号',
-          dataIndex: 'purchaseBillNo',
-          align: 'center',
-          width: 200
-        },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', align: 'center', width: 200, customRender: function (text) { return text || '--' } },
         {
           title: '产品编码',
           dataIndex: 'productEntity.code',
           align: 'center',
-          width: 160
+          width: 160,
+          customRender: function (text) { return text || '--' }
         },
         {
           title: '产品名称',
           dataIndex: 'productEntity.name',
           align: 'center',
-          width: 200
+          width: 200,
+          customRender: function (text) { return text || '--' },
+          ellipsis: true
         },
         {
           title: '售价',
@@ -110,7 +108,7 @@ export default {
           width: 100,
           align: 'center',
           customRender: function (text) {
-            return '¥' + (text || 0)
+            return ((text || text == 0) ? '¥' + text : '--')
           }
         },
         {
@@ -144,7 +142,8 @@ export default {
           title: '单位',
           dataIndex: 'productEntity.unit',
           align: 'center',
-          width: 100
+          width: 100,
+          customRender: function (text) { return text || '--' }
         },
         {
           title: '退货金额小计',
@@ -152,16 +151,7 @@ export default {
           width: 120,
           align: 'center',
           customRender: function (text) {
-            return '¥' + (text || 0)
-          }
-        },
-        {
-          title: '批次',
-          dataIndex: 'batchNo',
-          width: 100,
-          align: 'center',
-          customRender: function (text) {
-            return text || text == 0 ? text : '--'
+            return ((text || text == 0) ? '¥' + text : '--')
           }
         },
         {
@@ -169,9 +159,8 @@ export default {
           dataIndex: 'remark',
           width: 150,
           align: 'center',
-          customRender: function (text) {
-            return text || text == 0 ? text : '--'
-          }
+          customRender: function (text) { return text || '--' },
+          ellipsis: true
         }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -100,7 +100,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1120, y: tableHeight }"
+      :scroll="{ x: 1210, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="salesBillNo" slot-scope="text, record">