chenrui il y a 1 an
Parent
commit
a64f88542f

+ 3 - 3
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -133,7 +133,7 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [],
-      goodFlag:'',
+      goodFlag: '',
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -177,10 +177,10 @@ export default {
       this.queryParam.code = ''
       this.$refs.table.refresh(true)
     },
-    pageInit (buyerSn, warehouseSn, goodFlag) {
+    pageInit (buyerSn, warehouseName, goodFlag) {
       this.buyerSn = buyerSn
       this.goodFlag = goodFlag
-      // this.queryParam.warehouseSn = warehouseSn
+      this.queryParam.warehouseName = warehouseName
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },

+ 4 - 2
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -12,6 +12,9 @@
           <span style="margin: 0 10px;color: #666;">
             退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
+          <span style="color: #666;">
+            总部销退单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}
+          </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -166,7 +169,6 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { printFun, exportExcel } from '@/libs/JGPrint.js'
-import { removeEmptyStr } from '@/libs/tools'
 import ImportGuideModal from './importGuideModal.vue'
 import queryPart from './queryPart.vue'
 import commonModal from '@/views/common/commonModal.vue'
@@ -416,7 +418,7 @@ export default {
         }
         this.$refs.table.refresh(!flag)
         if (!flag) {
-          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseSn, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseName, this.goodFlag)
         }
       })
     },