浏览代码

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

lilei 2 年之前
父节点
当前提交
2baeb6b3fc

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

@@ -65,7 +65,7 @@
                 <div>
                   盘盈总数量: <strong>{{ productTotal&&(productTotal.checkProfitQty || productTotal.checkProfitQty==0) ? productTotal.checkProfitQty : '--' }}</strong>,
                   <span v-if="basicInfoData&&basicInfoData.state=='FINISH'">盘盈总成本: <strong>{{ productTotal&&(productTotal.checkProfitCost || productTotal.checkProfitCost==0) ? toThousands(productTotal.checkProfitCost) : '--' }}</strong>,</span>
-                  盘亏总数量: <strong>{{ productTotal&&(productTotal.checkLossQty || productTotal.checkLossQty==0) ? productTotal.checkLossQty : '--' }}</strong>,
+                  盘亏总数量: <strong>{{ productTotal&&(productTotal.checkLossQty || productTotal.checkLossQty!=0) ?'-'+productTotal.checkLossQty:productTotal.checkLossQty==0?productTotal.checkLossQty : '--' }}</strong>,
                   <span v-if="basicInfoData&&basicInfoData.state=='FINISH'">盘亏总成本: <strong>{{ productTotal&&(productTotal.checkLossCost || productTotal.checkLossCost==0) ? toThousands(productTotal.checkLossCost) : '--' }}</strong>,</span>
                   盈亏总数量: <strong>{{ productTotal&&(productTotal.totalCheckProfitLossQty || productTotal.totalCheckProfitLossQty==0) ? productTotal.totalCheckProfitLossQty : '--' }}</strong>,
                   <span v-if="basicInfoData&&basicInfoData.state=='FINISH'">盈亏总成本: <strong>{{ productTotal&&(productTotal.totalCheckProfitLossCost || productTotal.totalCheckProfitLossCost==0) ? toThousands(productTotal.totalCheckProfitLossCost) : '--' }}</strong>,</span>

+ 1 - 1
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -168,7 +168,7 @@ export default {
     ...mapActions(['getCartList']),
     // 查询
     searchForm () {
-      this.$refs.table.clearSelected() // 清空表格选中项
+      // this.$refs.table.clearSelected() // 清空表格选中项
       this.$refs.table.refresh(true)
     },
     //  重置