瀏覽代碼

修改bug

chenrui 2 年之前
父節點
當前提交
afb0a6a390

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

@@ -11,11 +11,11 @@
     <div>
       <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
         <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplierName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReason || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.returnReason || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="出库时间">{{ detailsData&&detailsData.returnReason || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.returnReason || '--' }}</a-descriptions-item>
+        <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.stateDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
         <a-descriptions-item label="附件" :span="3">
           <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">

+ 1 - 0
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -221,6 +221,7 @@ export default {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
+      _this.queryParam.showCostFlag = this.$hasPermissions('B_isShowCost') ? 1 : 0
       hdExportExcel(sparePartsReturnExportDetail, _this.queryParam, '采购退货', function () {
         _this.exportLoading = false
         _this.spinning = false

+ 1 - 0
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -292,6 +292,7 @@ export default {
     resetSearchForm (flag) {
       this.productForm.productName = ''
       this.productForm.productCode = ''
+      this.productForm.sparePartsNo = ''
       this.$refs.table.refresh(!!flag)
       this.$refs.partQuery.refreshTable()
     },

+ 5 - 0
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -160,6 +160,7 @@ export default {
     resetSearchForm () {
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
+      this.queryParam.sparePartsNo = ''
       this.warehousingDate = []
       this.$refs.rangeDate.resetDate(this.warehousingDate)
       this.$refs.chooseTable.refresh(true)
@@ -189,6 +190,10 @@ export default {
     },
     // 批量添加
     handleBatchAdd () {
+      if (!this.selectArr) {
+        this.$message.warning('请先选择要添加的产品!')
+        return
+      }
       this.$emit('bachAdd', this.selectArr)
     }
   }