chenrui 6 mēneši atpakaļ
vecāks
revīzija
3c19c809c7

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -81,7 +81,7 @@
           ,已退金额
           <strong>{{ totalData&&(totalData.refundedAmount || totalData.refundedAmount==0) ? toThousands(totalData.refundedAmount) : '--' }}</strong>
           <a-tooltip placement="bottom" title="实收金额=已收金额-退款中金额-已退金额">,<span style="color:#ED1c24;">实收金额</span><a-icon type="question-circle" style="margin:0 10px 0 5px;color:#ED1c24;"/></a-tooltip>
-          <strong style="color:#ED1c24;" v-if="receivedPriceFlag">{{ receivedPrice }}</strong>
+          <strong style="color:#ED1c24;" v-if="receivedPriceFlag">{{ toThousands(receivedPrice) }}</strong>
           <span style="color:#ED1c24;" v-else>--</span>
         </div>
       </a-alert>

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

@@ -64,7 +64,7 @@
             <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="采购单号" v-if="detailData&&detailData.sourceType!='SALES'">{{ detailData.purchaseBillNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='XPRH_PURCHASE'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='TEMPORARY_DISPATCHING'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
         <a-card size="small" :bordered="false" class="pages-wrap">

+ 6 - 6
src/views/salesManagement/salesQuery/detail.vue

@@ -45,7 +45,7 @@
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购单号" v-if="detailData&&detailData.sourceType!='SALES'">{{ detailData.purchaseBillNo || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='XPRH_PURCHASE'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='TEMPORARY_DISPATCHING'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -213,7 +213,7 @@ export default {
         // { 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: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       // 实际总成本
       if (this.showCost) {
@@ -222,14 +222,14 @@ export default {
         arr.splice(11, 1)
       }
       if (this.detailData && this.detailData.sourceType && this.detailData.sourceType === 'XPRH_PURCHASE') {
-        arr.splice(11, 1, { 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.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) : '--') } })
       }
       // 下级创建,不显示仓库仓位
       if (!this.isOwerEdit) {
-        arr.splice(this.showCost ? 12 : 11, 0, { title: '库存数量', dataIndex: 'currentStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(this.showCost ? 12 : 11, 0, { title: '库存数量', dataIndex: 'currentStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       } else {
-        arr.splice(this.showCost ? 12 : 11, 0, { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
-        arr.splice(this.showCost ? 13 : 12, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(this.showCost ? 12 : 11, 0, { title: '仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(this.showCost ? 13 : 12, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 2 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -55,7 +55,7 @@
             <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="采购单号" v-if="detailData&&detailData.sourceType!='SALES'">{{ detailData.purchaseBillNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='XPRH_PURCHASE'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货状态" v-if="detailData&&detailData.sourceType!='TEMPORARY_DISPATCHING'&&detailData.sourceType!='SALES'&&detailData.billStatus=='FINISH'">{{ detailData.receiptStatusDictValue || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-card>
         <a-card size="small" :bordered="false" class="pages-wrap">
@@ -233,7 +233,7 @@ export default {
         arr.splice(12, 1)
       }
       if (this.detailData && this.detailData.sourceType && this.detailData.sourceType === 'XPRH_PURCHASE') {
-        arr.splice(11, 1, { 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.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) : '--') } })
       }
       // 下级创建,不显示仓库仓位
       if (!this.isOwerEdit) {