Browse Source

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

lilei 4 years ago
parent
commit
b27c233ffb

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

@@ -93,7 +93,7 @@
       </template>
       <!-- 现有库存数量 -->
       <template slot="currentStockQty" slot-scope="text, record">
-        {{ record.currentStockQty + record.freezeQty }}
+        {{ record.currentStockQty||0 + record.freezeQty||0 }}
         <span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
       </template>
       <!-- 操作 -->

+ 6 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -103,6 +103,11 @@
         <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
         <span v-else>--</span>
       </template>
+      <!-- 实时库存数 -->
+      <template slot="stockQty" slot-scope="text, record">
+        {{ record.stockQty||0 + record.freezeQty||0 }}
+        <span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
+      </template>
       <!-- 预警提示 -->
       <template slot="warnTip" slot-scope="text, record">
         <span v-if="record.warnTipDictValue" :class="[record.warnTip=='OVERFLOW'?'yellow':record.warnTip=='NOT_ENOUGH'?'red':record.warnTip=='LACK'?'blue':record.warnTip=='NORMAL'?'green':'']">{{ record.warnTipDictValue }}</span>
@@ -186,7 +191,7 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
-        { title: '实时库存数(个)', dataIndex: 'stockQty', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '实时库存数(个)', scopedSlots: { customRender: 'stockQty' }, width: 130, align: 'center' },
         { title: '在途数(个)', scopedSlots: { customRender: 'inTransit' }, width: 130, align: 'center' },
         { title: '总库存数(个)', dataIndex: 'totalStockQty', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库存数(个)', scopedSlots: { customRender: 'upperLimit' }, width: 130, align: 'center' },

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

@@ -108,7 +108,7 @@ export default {
     handleEdit (row) {
       this.itemId = row && row.id ? row.id : null
       const nowData = row
-      nowData.psn = nowData && nowData.productTypeSn ? nowData.productTypeSn : null
+      nowData.psn = nowData && nowData.psn ? nowData.psn : null
       this.nowData = nowData
       this.openModal = true
     },