lilei 2 éve
szülő
commit
cdbd73153a

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/creatPurchaseReutn.vue

@@ -56,7 +56,7 @@
             size="large"
             class="button-cancel"
             @click="isShow=false"
-            style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+            style="padding: 0 36px;margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 21 - 25
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -5,13 +5,6 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <a-button
-            v-if="isEdit"
-            type="primary"
-            size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
-            id="purchaseReturnDetail-edit-btn"
-            @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchaseReturnPrint')">
@@ -23,13 +16,12 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
+              <a-descriptions-item label="单据来源">{{ basicInfoData&&basicInfoData.billSourceDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="采购退货申请单号">{{ basicInfoData&&basicInfoData.purchaseReturnApplyNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="供应商">{{ basicInfoData&&basicInfoData.returnTargetName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="采退单号">{{ basicInfoData&&basicInfoData.purchaseReturnNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="业务状态">{{ basicInfoData&&basicInfoData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ basicInfoData&&basicInfoData.createDate || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="坏件数量">{{ basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty == 0) ? basicInfoData.totalBadQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="返库数量">{{ basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty == 0) ? basicInfoData.totalBackStockQty : '--' }}</a-descriptions-item>
-              <a-descriptions-item label="退货金额" v-if="$hasPermissions('M_ShowAllCost')">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount == 0) ? basicInfoData.totalAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="客服审核时间">{{ basicInfoData&&basicInfoData.auditTime || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -38,6 +30,17 @@
       <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="产品详情">
+            <!-- 总计 -->
+            <a-alert type="info" style="margin-bottom:10px">
+              <div slot="message">
+                申请退货数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong>;
+                总公司实收数量:<strong>{{ (basicInfoData&&(basicInfoData.totalReceiveQty || basicInfoData.totalReceiveQty==0)) ? basicInfoData.totalReceiveQty : '--' }}</strong>;
+                坏件数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty==0)) ? basicInfoData.totalBadQty : '--' }}</strong>;
+                良品数量:<strong>{{ (basicInfoData&&(basicInfoData.totalGoodQty || basicInfoData.totalGoodQty==0)) ? basicInfoData.totalGoodQty : '--' }}</strong>;
+                返库数量:<strong>{{ (basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty==0)) ? basicInfoData.totalBackStockQty : '--' }}</strong>;
+                退货金额:<strong>{{ (basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount==0)) ? basicInfoData.totalAmount : '--' }}</strong>;
+              </div>
+            </a-alert>
             <!-- 列表 -->
             <s-table
               class="sTable"
@@ -62,7 +65,7 @@ import { STable, VSelect } from '@/components'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import { getOperationalPrecision } from '@/libs/tools.js'
-import { purchaseReturnDetailSn, purchaseReturnDetailList, purchaseReturnDetailPrint, purchaseReturnDetailExport } from '@/api/purchaseReturn'
+import { purchaseReturnDetail, purchaseReturnDetailList, purchaseReturnDetailPrint, purchaseReturnDetailExport } from '@/api/purchaseReturnApply'
 export default {
   name: 'PurchaseReturnDetail',
   components: { STable, VSelect, Print },
@@ -100,9 +103,6 @@ export default {
     }
   },
   computed: {
-    isEdit () {
-      return ((this.basicInfoData && this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData && this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('B_purchaseReturnEdit')
-    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -125,6 +125,10 @@ export default {
     }
   },
   methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
+    },
     // 打印预览/快捷打印
     handlePrint (type, printerType) {
       const _this = this
@@ -140,23 +144,15 @@ export default {
         _this.spinning = false
       })
     },
-    //  返回列表
-    handleBack () {
-      this.$router.push({ path: '/purchasingManagement/purchaseReturn/list' })
-    },
     // 基本信息
     getDetail () {
-      purchaseReturnDetailSn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
+      purchaseReturnDetail({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
         } else {
           this.basicInfoData = null
         }
       })
-    },
-    //  编辑
-    handleEdit () {
-      this.$router.push({ path: `/purchasingManagement/purchaseReturn/edit/${this.basicInfoData.id}/${this.basicInfoData.purchaseReturnSn}/${this.basicInfoData.returnTargetName}` })
     }
   },
   mounted () {