瀏覽代碼

bug 修复

lilei 3 年之前
父節點
當前提交
34e49b5bc0

+ 6 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -133,7 +133,8 @@
         <!-- 销售单 -->
         <salesDetailModal v-if="fcBizType=='SELL'" :outBizSn="orderSn" />
         <!-- 采购退货 -->
-        <pushOrderDetailModal v-if="fcBizType=='PURCHASE_RETURN'" :outBizSn="orderSn" />
+        <pushOrderDetailModal v-if="fcBizType=='PURCHASE_RETURN'&&!$hasPermissions('M_purchaseReturn_outSnycList')" :outBizSn="orderSn" />
+        <pushOrderOutSyncDetailModal v-if="fcBizType=='PURCHASE_RETURN'&&$hasPermissions('M_purchaseReturn_outSnycList')" :outBizSn="orderSn"></pushOrderOutSyncDetailModal>
         <!-- 店内调出 -->
         <storeTransferOutDetailModal v-if="fcBizType=='STORE_CALL_OUT'" :outBizSn="orderSn"></storeTransferOutDetailModal>
         <!-- 连锁调出 -->
@@ -151,14 +152,17 @@ import { STable, VSelect } from '@/components'
 import detailModal from './detailModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import salesDetailModal from '@/views/salesManagement/salesQuery/detail.vue'
+// 同步采购退货单详情
 import pushOrderDetailModal from '@/views/purchasingManagement/purchaseReturn/detail.vue'
+// 不同步采购退货单
+import pushOrderOutSyncDetailModal from '@/views/purchasingManagement/purchaseReturnOutSync/detail.vue'
 import chainTransferOutDetailModal from '@/views/allocationManagement/chainTransferOut/detail.vue'
 import storeTransferOutDetailModal from '@/views/allocationManagement/storeTransferOut/detail.vue'
 import bulkReturnGoodsDetailModal from '@/views/bulkManagement/bulkReturnGoods/detailModal.vue'
 import { settleReceiptQuery, queryByTypeSum, settleReceiptMoney, settleReceiptQuerySum } from '@/api/settleReceipt'
 export default {
   name: 'FinancialCollectionList',
-  components: { STable, VSelect, detailModal, rangeDate, pushOrderDetailModal, salesDetailModal, chainTransferOutDetailModal, bulkReturnGoodsDetailModal, storeTransferOutDetailModal },
+  components: { STable, VSelect, detailModal, rangeDate, pushOrderDetailModal, pushOrderOutSyncDetailModal, salesDetailModal, chainTransferOutDetailModal, bulkReturnGoodsDetailModal, storeTransferOutDetailModal },
   mixins: [commonMixin],
   data () {
     return {

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

@@ -23,7 +23,7 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
-              <a-descriptions-item label="客户名称">{{ basicInfoData&&basicInfoData.returnTargetName || '--' }}</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.createDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="退货数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>

+ 9 - 1
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -295,7 +295,15 @@ export default {
       },
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
-        return purchaseReturnDetailList(Object.assign(parameter, this.chooseQueryParam, { purchaseReturnSn: this.$route.params.sn, orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc' })).then(res => {
+        return purchaseReturnDetailList(Object.assign(parameter,
+          {
+            dealerProductEntity: {
+              code: this.chooseQueryParam.productCode,
+              name: this.chooseQueryParam.productName
+            },
+            purchaseReturnSn: this.$route.params.sn,
+            orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc'
+          })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

+ 8 - 1
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -287,7 +287,14 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
-        return purchaseReturnDetailList(Object.assign(parameter, this.chooseQueryParam, { purchaseReturnSn: this.$route.params.sn, orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc' })).then(res => {
+        return purchaseReturnDetailList(Object.assign(parameter, {
+          dealerProductEntity: {
+            code: this.chooseQueryParam.productCode,
+            name: this.chooseQueryParam.productName
+          },
+          purchaseReturnSn: this.$route.params.sn,
+          orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc'
+        })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {