chenrui 3 anni fa
parent
commit
4e4fefc7b8

+ 5 - 9
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -11,13 +11,9 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-card size="small" :bordered="false" class="bulkReturnGoodsDetail-cont">
         <a-descriptions size="small">
-          <a-descriptions-item label="散件退货单号" :span="3">
-            {{ (basicInfoData&&basicInfoData.sparePartsReturnNo) || '--' }}
-            <div style="display: inline-block;margin-left: 10px;">
-              <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>
-              <a-tag color="orange" v-if="basicInfoData&&basicInfoData.settleStateDictValue">{{ basicInfoData.settleStateDictValue }}</a-tag>
-            </div>
-          </a-descriptions-item>
+          <a-descriptions-item label="散件退货单号">{{ (basicInfoData&&basicInfoData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="财务状态">{{ (basicInfoData&&basicInfoData.settleStateDictValue) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.isGrabDictValue) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
@@ -115,10 +111,10 @@ export default {
           { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
           { title: '退货单价', dataIndex: 'purchaseCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '退货金额', dataIndex: 'purchaseAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         ]
       }
       return arr