chenrui 2 роки тому
батько
коміт
9077c67789

+ 4 - 1
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -170,7 +170,10 @@ export default {
         this.$emit('close')
         this.attachList = []
         this.supplierName = null
-        this.$refs.ruleForm.resetFields()
+        this.$nextTick(() => {
+          this.$refs.attachList.setFileList('')
+          this.$refs.ruleForm.resetFields()
+        })
       } else {
         if (this.itemSn) {
           this.getDetail()

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -14,7 +14,7 @@
         <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="出库时间">{{ detailsData&&detailsData.updateDate || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="出库时间">{{ detailsData&&detailsData.submitDate || '--' }}</a-descriptions-item>
         <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="附件" :span="3">

+ 10 - 4
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -42,8 +42,10 @@
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
-            <span>申请退货数量:{{ statisticsObj&&(statisticsObj.qty || statisticsObj.qty == 0 )? statisticsObj.qty : '--' }};</span>
-            <span>退货金额:{{ statisticsObj&&statisticsObj.totalCost }}元;</span>
+            <div>
+              <span>申请退货数量:{{ statisticsObj&&(statisticsObj.qty || statisticsObj.qty == 0 )? statisticsObj.qty : '--' }};</span>
+              <span>退货金额:{{ statisticsObj&&statisticsObj.totalCost }}元;</span>
+            </div>
           </div>
         </a-alert>
         <div class="table-page-search-wrapper" style="display:flex;align-items: center;justify-content: space-between;">
@@ -420,8 +422,12 @@ export default {
     getStatisticsData () {
       queryPageCount({ sparePartsReturnSn: this.sparePartsReturnSn }).then(res => {
         if (res.status == 200) {
-          res.data.totalCost = (res.data && (res.data.totalCost || res.data.totalCost == 0)) ? toFixedDecimal(res.data.totalCost, 2) : '--'
-          this.statisticsObj = res.data
+          if (res.data) {
+            res.data.totalCost = (res.data && (res.data.totalCost || res.data.totalCost == 0)) ? toFixedDecimal(res.data.totalCost, 2) : '--'
+            this.statisticsObj = res.data
+          } else {
+            this.statisticsObj = null
+          }
         } else {
           this.statisticsObj = null
         }