Merge remote-tracking branch 'origin/dev' into dev

src/views/business/spd/target/MonthSaleGoal.vue

@@ -1353,12 +1353,16 @@
       //查询该时间范围内对应客户的物料数据
       getMaterialList() {
         this.loading = true;
-        let data = {
-          customCode: this.form.customCode,
-          type: this.materialRange
+        let params = [];
+        params[0] = this.form.customCode;
+        params[1] = this.materialRange;
+        if (this.isDept && !this.isJiwei) {
+          params[2] = 'HUNAN';
+        } else {
+          params[2] = 'JIWEI_OR_PUTONG'
         }
-        console.log(data, 'data')
-        getMaterialRangeList(data).then((res) => {
+        console.log(params, 'params')
+        getMaterialRangeList(params).then((res) => {
           console.log(res, 'res')
           this.monthSaleGoalDetailsList = res;
           for (const item of this.monthSaleGoalDetailsList) {