lilei 2 年 前
コミット
23ba255584

+ 1 - 1
public/version.json

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

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

@@ -186,6 +186,8 @@ export default {
         productCode: '',
         productCode: '',
         productName: '',
         productName: '',
         targetName: '',
         targetName: '',
+        costTypeSn: undefined,
+        allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
         allocateReturnTypeSn: undefined,
         targetType: undefined,
         targetType: undefined,
         productBrandTypeSn: undefined,
         productBrandTypeSn: undefined,
@@ -278,8 +280,8 @@ export default {
   methods: {
   methods: {
     changeAllocatype (val, opts) {
     changeAllocatype (val, opts) {
       this.allocateTypeVal = val || []
       this.allocateTypeVal = val || []
-      // this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
-      // this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
+      this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
+      this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
       this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
       this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
     },
     },
     // 盘点库存日期
     // 盘点库存日期
@@ -332,6 +334,8 @@ export default {
       this.queryParam.productCode = ''
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.productName = ''
       this.queryParam.targetName = ''
       this.queryParam.targetName = ''
+      this.queryParam.costTypeSn = undefined
+      this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.allocateTypeVal = []
       this.allocateTypeVal = []
       this.queryParam.targetType = undefined
       this.queryParam.targetType = undefined

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

@@ -141,6 +141,8 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         endDate: getDate.getCurrMonthDays().endtime,
         allocateReturnNo: '',
         allocateReturnNo: '',
         targetName: '',
         targetName: '',
+        costTypeSn: undefined,
+        allocateSortSn: undefined,
         allocateReturnTypeSn: undefined,
         allocateReturnTypeSn: undefined,
         targetType: undefined,
         targetType: undefined,
         subareaSn: undefined
         subareaSn: undefined
@@ -198,8 +200,8 @@ export default {
   methods: {
   methods: {
     changeAllocatype (val, opts) {
     changeAllocatype (val, opts) {
       this.allocateTypeVal = val || []
       this.allocateTypeVal = val || []
-      // this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
-      // this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
+      this.queryParam.costTypeSn = val && val[0] ? val[0] : ''
+      this.queryParam.allocateSortSn = val && val[1] ? val[1] : ''
       this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
       this.queryParam.allocateReturnTypeSn = val && val[2] ? val[2] : ''
     },
     },
     //  导出
     //  导出
@@ -266,6 +268,8 @@ export default {
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.allocateReturnNo = ''
       this.queryParam.allocateReturnNo = ''
       this.queryParam.targetName = ''
       this.queryParam.targetName = ''
+      this.queryParam.costTypeSn = undefined
+      this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.targetType = undefined
       this.queryParam.targetType = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaSn = undefined