Ver Fonte

修改bug

chenrui há 6 meses atrás
pai
commit
26cd7740b7

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1734511158046
+  "version": 1735798124217
 }

+ 1 - 1
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -71,7 +71,7 @@
           收入金额:<strong>{{ detailData&&(detailData.skAmount || detailData.skAmount==0) ? toThousands(detailData.skAmount) : '--' }}</strong>,
           其中到账金额:<strong>{{ detailData&&(detailData.skdzAmount || detailData.skdzAmount==0) ? toThousands(detailData.skdzAmount) : '--' }}</strong>,
           在途金额:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>;
-          已退款:<strong>{{ detailData&&(detailData.skztAmount || detailData.skztAmount==0) ? toThousands(detailData.skztAmount) : '--' }}</strong>;
+          已退款:<strong>{{ detailData&&(detailData.skytkAmount || detailData.skytkAmount ==0) ? toThousands(detailData.skytkAmount) : '--' }}</strong>;
           支出金额:<strong>{{ detailData&&(detailData.kkAmount || detailData.kkAmount==0) ? toThousands(detailData.kkAmount) : '--' }}</strong>,
           其中退款金额:<strong>{{ detailData&&(detailData.tkAmount || detailData.tkAmount==0) ? toThousands(detailData.tkAmount) : '--' }}</strong>,
           提现金额:<strong>{{ detailData&&(detailData.txAmount || detailData.txAmount==0) ? toThousands(detailData.txAmount) : '--' }}</strong>,

+ 12 - 2
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -20,8 +20,8 @@
       <div style="margin:10px 0">
         <div style="margin:10px 0">
           <p>可提现金额:<strong style="color:#ed1c24;">{{ pageInfo&&(pageInfo.activeAmount||pageInfo.activeAmount==0)?toThousands(pageInfo.activeAmount):'--' }}</strong></p>
-          <p>账户总金额:{{ pageInfo&&(pageInfo.totalAmount||pageInfo.totalAmount==0)?toThousands(pageInfo.totalAmount):'--' }}(包含到账金额:<span>{{ pageInfo&&(pageInfo.activeAmount||pageInfo.activeAmount==0)?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:{{ pageInfo&&(pageInfo.floatAmount||pageInfo.floatAmount==0)?toThousands(pageInfo.floatAmount):'--' }})</p>
-          <p>保证金:{{ pageInfo&&(pageInfo.freezeAmount||freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }}(已冻结金额:{{ pageInfo&&(pageInfo.freezeAmount||freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }})</p>
+          <p>账户总金额:{{ (totalAmount||totalAmount==0)?toThousands(totalAmount):'--' }}(包含到账金额:<span>{{ (accountAmount||accountAmount==0)?toThousands(accountAmount):'--' }}</span>,在途金额:{{ pageInfo&&(pageInfo.floatAmount||pageInfo.floatAmount==0)?toThousands(pageInfo.floatAmount):'--' }})</p>
+          <p v-if="pageInfo&&(pageInfo.freezeRuleAmount||freezeRuleAmount==0)">保证金:{{ toThousands(pageInfo.freezeRuleAmount) }}(已冻结金额:{{ pageInfo&&(pageInfo.freezeAmount||freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }})</p>
           <p style="margin-top:10px;">(①提现手续费为0.5元/笔;②资金到账周期:线上支付订单出库后自然日+10天;③订单被审核不通过或修理厂取消订单后,将在1-3个工作日原路返回对应金额)</p>
         </div>
         <a-button
@@ -116,6 +116,16 @@ export default {
       }
     }
   },
+  computed: {
+    totalAmount () {
+      const totalNum = this.pageInfo ? this.pageInfo.activeAmount + this.pageInfo.freezeAmount + this.pageInfo.floatAmount : 0
+      return totalNum
+    },
+    accountAmount () {
+      const accountNum = this.pageInfo ? this.pageInfo.activeAmount + this.pageInfo.freezeAmount : 0
+      return accountNum
+    }
+  },
   methods: {
     // 时间改变
     dateChange (date) {

+ 8 - 12
src/views/salesManagement/salesQueryNew/detail.vue

@@ -220,28 +220,24 @@ export default {
         { title: '单位', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折后小计', dataIndex: 'discountedAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        // { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '仓位', dataIndex: 'warehouseLocationName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '是否急件', dataIndex: 'oosFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
+        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       // 实际总成本
       if (this.showCost) {
-        arr.splice(12, 0, { slots: { title: 'costTitle' }, dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      } else {
-        arr.splice(12, 1)
+        arr.push({ slots: { title: 'costTitle' }, dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.detailData && this.detailData.sourceType && this.detailData.sourceType === 'XPRH_PURCHASE') {
-        arr.splice(11, 0, { title: <a-tooltip placement="bottom" title='返券金额以销售单完结时的活动规则为准'>返券金额&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'giveAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.push({ title: <a-tooltip placement="bottom" title='返券金额以销售单完结时的活动规则为准'>返券金额&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'giveAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       // 下级创建,不显示仓库仓位
       if (!this.isOwerEdit) {
-        arr.splice(this.showCost ? 13 : 12, 0, { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.push({ title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       } else {
-        arr.splice(this.showCost ? 13 : 12, 0, { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
-        arr.splice(this.showCost ? 14 : 13, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '仓位', dataIndex: 'warehouseLocationName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
       }
+      arr.push({ title: '是否急件', dataIndex: 'oosFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+      arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' })
       return arr
     }
   },