瀏覽代碼

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

chenrui 1 年之前
父節點
當前提交
bb8ad9cfff

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.62",
+    "version": "2.2.26",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 0
src/views/salesReturnManagement/custConfirm/list.vue

@@ -201,6 +201,7 @@
       ref="chooseProduct"
       :openModal="openProductModal"
       :buyerSn="$route.params.buyerSn"
+      :warehouseSn="ordeDetail?ordeDetail.warehouseSn:''"
       @close="openProductModal=false"
       @addProduct="addProduct"></chooseProductsModal>
     <!-- 批量设置退货原因 -->

+ 5 - 1
src/views/salesReturnManagement/receiveCheck/chooseProductsModal.vue

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: ''
     },
+    warehouseSn: {
+      type: String,
+      default: ''
+    },
     isShowPrice: { //  弹框显示状态
       type: Boolean,
       default: true
@@ -117,7 +121,7 @@ export default {
           this.returnReasonlist = [...this.$store.state.app.goodReturnReason, ...this.$store.state.app.defectiveReturnReason]
         }
         this.$nextTick(() => {
-          this.$refs.partQuery.pageInit(this.buyerSn, 0, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.warehouseSn, this.goodFlag)
         })
       }
     }

+ 1 - 0
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -126,6 +126,7 @@
       :goodFlag="goodFlag"
       :isShowPrice="false"
       :openModal="openModal"
+      :warehouseSn="ordeDetail?ordeDetail.warehouseSn:''"
       :buyerSn="$route.params.buyerSn"
       @close="openModal=false"
       @addProduct="addProduct"></chooseProductsModal>

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

@@ -177,10 +177,10 @@ export default {
       this.queryParam.code = ''
       this.$refs.table.refresh(true)
     },
-    pageInit (buyerSn, warehouseName, goodFlag) {
+    pageInit (buyerSn, warehouseSn, goodFlag) {
       this.buyerSn = buyerSn
       this.goodFlag = goodFlag
-      this.queryParam.warehouseName = warehouseName
+      this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -418,7 +418,7 @@ export default {
         }
         this.$refs.table.refresh(!flag)
         if (!flag) {
-          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseName, this.goodFlag)
+          this.$refs.partQuery.pageInit(this.buyerSn, this.ordeDetail.warehouseSn, this.goodFlag)
         }
       })
     },