Przeglądaj źródła

Merge branch 'develop_yh6' of jianguan-web/jg-ocs-html into pre-release

李磊 2 lat temu
rodzic
commit
6906f4cfbf

+ 1 - 1
public/version.json

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

+ 10 - 2
src/views/reportData/transferReturnDetailReport/list.vue

@@ -29,7 +29,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="调拨退货类型">
-                <AllocateType id="allocateReturnDetailReport-allocateReturnTypeSn" v-model="queryParam.allocateReturnTypeSn"></AllocateType>
+                <AllocateType id="allocateReturnDetailReport-allocateReturnTypeSn" v-model="allocateTypeVal" @change="changeAllocatype"></AllocateType>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -232,7 +232,8 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      productTypeList: [] //  分类下拉数据
+      productTypeList: [], //  分类下拉数据
+      allocateTypeVal: []
     }
   },
   computed: {
@@ -265,6 +266,12 @@ export default {
     }
   },
   methods: {
+    changeAllocatype (val, opts) {
+      this.allocateTypeVal = val || []
+      // this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
+      // this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
+      this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
+    },
     // 盘点库存日期
     handleStock () {
       this.$message.info('无盘点区间的起始/终止时间,请自行选择日期区间查询!')
@@ -316,6 +323,7 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.targetName = ''
       this.queryParam.allocateReturnTypeSn = undefined
+      this.allocateTypeVal = []
       this.queryParam.targetType = undefined
       this.queryParam.productBrandTypeSn = undefined
       this.queryParam.productBrandSn = undefined

+ 10 - 2
src/views/reportData/transferReturnReport/list.vue

@@ -30,7 +30,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="调拨退货类型">
-                  <AllocateType id="transferReturnReportList-allocateReturnTypeSn" v-model="queryParam.allocateReturnTypeSn"></AllocateType>
+                  <AllocateType id="transferReturnReportList-allocateReturnTypeSn" v-model="allocateTypeVal" @change="changeAllocatype"></AllocateType>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -161,7 +161,8 @@ export default {
           return data
         })
       },
-      totalData: null
+      totalData: null,
+      allocateTypeVal: []
     }
   },
   computed: {
@@ -185,6 +186,12 @@ export default {
     }
   },
   methods: {
+    changeAllocatype (val, opts) {
+      this.allocateTypeVal = val || []
+      // this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
+      // this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
+      this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
+    },
     //  导出
     handleExport () {
       const _this = this
@@ -253,6 +260,7 @@ export default {
       this.queryParam.targetType = undefined
       this.queryParam.subareaSn = undefined
       this.totalData = null
+      this.allocateTypeVal = []
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },