Parcourir la source

Merge branch 'develop_yh12' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh12

lilei il y a 2 ans
Parent
commit
c6ade516ba

+ 2 - 2
src/config/router.config.js

@@ -782,7 +782,7 @@ export const asyncRouterMap = [
                 name: 'purchaseReturnAdd',
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
                 meta: {
-                  title: '采购退货新增',
+                  title: '新增采购退货',
                   icon: 'gold',
                   hidden: true
                 }
@@ -792,7 +792,7 @@ export const asyncRouterMap = [
                 name: 'purchaseReturnEdit',
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
                 meta: {
-                  title: '采购退货编辑',
+                  title: '编辑采购退货',
                   icon: 'gold',
                   hidden: true
                 }

+ 3 - 3
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -106,13 +106,13 @@
             @click="handleSH(record)"
             v-if="record.state !='WAIT_SUBMIT'"
             id="allocateBillList-examine-btn">审核进度</a-button>
-          <a-button
+          <!-- <a-button
             size="small"
             type="link"
             v-if="record.state == 'FINISH'"
             @click="handleEdit(record)"
             class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">同步到ERP</a-button>
+            id="bulkWarehousingOrderList-edit-btn">同步到ERP</a-button> -->
           <a-button
             size="small"
             type="link"
@@ -180,7 +180,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购退货单号', scopedSlots: { customRender: 'sparePartsReturnNo' }, width: '15%', align: 'center' },
-        { title: '供应商名称', dataIndex: 'supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商名称', dataIndex: 'supplier.supplierName', align: 'center', width: '15%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'explainInfo', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货金额', dataIndex: 'totalCost', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? toFixedDecimal(text, 2) : '--') } },

+ 8 - 2
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -19,7 +19,7 @@
             </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.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="附件" :span="3">
@@ -157,6 +157,7 @@ export default {
       },
       sparePartsReturnSn: null,
       sparePartsReturnNo: null,
+      chooseList: [],
       columns: [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
         {
@@ -240,6 +241,7 @@ export default {
             }
             this.disabled = false
           }
+          this.chooseList = data.list
           return data
         })
       },
@@ -372,7 +374,11 @@ export default {
       })
     },
     beforeSubmit () {
-      this.openDepartUserModal = true
+      if (this.chooseList.length > 0) {
+        this.openDepartUserModal = true
+      } else {
+        this.$message.warning('请先添加要退货的产品!')
+      }
     },
     // 提交采购退货
     handleSubmit (data) {