chenrui 3 gadi atpakaļ
vecāks
revīzija
9b1573e6fb

+ 5 - 1
src/views/financialManagement/inventoryCheckAudit/list.vue

@@ -40,6 +40,10 @@
           <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_inventoryCheckingDetail')" @click="handleDetail(record)">{{ record.checkWarehouseNo }}</span>
           <span v-else>{{ record.checkWarehouseNo }}</span>
         </template>
+        <!-- 盈亏数量 -->
+        <template slot="totalLossQty" slot-scope="text, record">
+          <span :style="{ color: record.totalLossQty>0?'red':record.totalLossQty<0?'green':'', fontWeight: record.totalLossQty!=0?'bold':'' }">{{ (record.totalLossQty || record.totalLossQty==0) ? Math.abs(record.totalLossQty) : '--' }}</span>
+        </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -91,7 +95,7 @@ export default {
         { title: '总数量', dataIndex: 'totalStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'totalStockCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '盘盈数量', dataIndex: 'totalProfitQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盘亏数量', dataIndex: 'totalLossQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘亏数量', scopedSlots: { customRender: 'totalLossQty' }, width: 80, align: 'center' },
         { title: '盘点完成时间', dataIndex: 'checkTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务审核时间', dataIndex: 'financeAuditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务审核状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -115,7 +115,7 @@
           </template>
           <!-- 盈亏数量 -->
           <template slot="checkProfitLossQty" slot-scope="text, record">
-            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? Math.abs(record.checkProfitLossQty) : '--' }}</span>
+            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'', fontWeight: record.checkProfitLossQty!=0?'bold':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? Math.abs(record.checkProfitLossQty) : '--' }}</span>
           </template>
         </s-table>
       </a-card>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -134,7 +134,7 @@
           </template>
           <!-- 盈亏数量 -->
           <template slot="checkProfitLossQty" slot-scope="text, record">
-            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? record.checkProfitLossQty : '--' }}</span>
+            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'', fontWeight: record.checkProfitLossQty!=0?'bold':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? Math.abs(record.checkProfitLossQty) : '--' }}</span>
           </template>
         </s-table>
       </a-card>

+ 5 - 5
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -93,7 +93,7 @@
           :columns="columns"
           :customRow="handleClickRow"
           :data="loadData"
-          :scroll="{ x: 1280, y: 300 }"
+          :scroll="{ x: 1340, y: 300 }"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -182,7 +182,7 @@
           :rowKey="(record) => record.id"
           :columns="chooseColumns"
           :data="chooseLoadData"
-          :scroll="{ x: 1280, y: 300 }"
+          :scroll="{ x: 1420, y: 300 }"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -213,7 +213,7 @@
 import { STable, VSelect } from '@/components'
 import ProductType from '@/views/common/productType.js'
 import ProductBrand from '@/views/common/productBrand.js'
-import { checkWarehouseDetail, checkWarehouseDetailStockList, checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseWarehouse, checkWarehouseDetailSave, checkWarehouseDetailSaveBatch, checkWarehouseDetailDel, checkWarehouseSubmit } from '@/api/checkWarehouse'
+import { checkWarehouseDetail, checkWarehouseDetailStockList, checkWarehouseDetailList, checkWarehouseDetailCount, checkWarehouseDetailSave, checkWarehouseDetailSaveBatch, checkWarehouseDetailDel, checkWarehouseSubmit } from '@/api/checkWarehouse'
 export default {
   components: { STable, VSelect, ProductType, ProductBrand },
   props: {},
@@ -284,7 +284,7 @@ export default {
     columns () {
       const arr = [
         { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140 },
         { title: '单位', dataIndex: 'unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
@@ -301,7 +301,7 @@ export default {
     chooseColumns () {
       const arr = [
         { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品品牌', dataIndex: 'brandName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 180, align: 'center' },
         { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },