销售出库统计增加仓库检索

src/views/purchaseIssue/index.vue

@@ -912,13 +912,6 @@ export default {
           disabled: false,
         },
         {
-          type: "primary",
-          size: "mini",
-          icon: "el-icon-edit-outline",
-          name: "请核",
-          disabled: false,
-        },
-        {
           type: "success",
           size: "mini",
           icon: "el-icon-edit",
@@ -971,6 +964,13 @@ export default {
           name: "申请发票",
           disabled: false,
         },
+        {
+          type: "primary",
+          size: "mini",
+          icon: "el-icon-edit-outline",
+          name: "请核",
+          disabled: false,
+        },
       ],
       formOption: [
         {
@@ -1197,7 +1197,6 @@ export default {
     this.dataList.isKp.push({label: '否', value: 1})
     this.dataList.isKp.push({label: '是', value: 2})
     productName().then((res) => {
-      console.log(res);
       if (res.code === 200) {
         for (let item in res.rows) {
           this.dataList.fFeeid.push({
@@ -1490,7 +1489,6 @@ export default {
     //查询公司
     fCompany(name) {
       company(name).then((res) => {
-        console.log(res);
         if (name == 3) {
           this.dataList.fCorpid = [];
           for (let item in res.data) {
@@ -1515,8 +1513,6 @@ export default {
       listQuery(data).then((res) => {
         this.tableData = res.rows;
         this.tableData.forEach((item) => {
-          console.log(item.fPrint);
-          console.log(item.fPrintLog);
           if (item.fPrint && item.fPrintLog) {
             item.fPrintLog = item.fPrint + "," + item.fPrintLog;
           } else if (item.fPrint || item.fPrintLog == null) {
@@ -1529,7 +1525,6 @@ export default {
           // item.fPrintLog = item.fPrint == null && item.fPrintLog == null ? '' :
           //   item.fPrint && item.fPrintLog == null? item.fPrint : item.fPrint && item.fPrintLog? item.fPrint + ',' + item.fPrintLog :item.fPrintLog
         });
-        console.log(this.tableData);
         this.total = res.total;
       });
     },

src/views/reportAnalysis/salesStatistics.vue

@@ -51,6 +51,7 @@
 
 <script>
 import { queryItem, productName,queryData,listExport } from '@/api/reportAnalysis/salesStatistics'
+import {warehouse} from "@/api/purchaseIssue/index";
 import Cookies from 'js-cookie'
 import { select } from '@/api/system/set'
 import { company } from '@/api/purchaseRequest'
@@ -65,6 +66,7 @@ export default {
         fSbu: [],
         fFeeTypeList:[],
         fFeeid:[],
+        fWarehouseid:[],
         groupDate:[{label:'是',value:0},{label: '否',value: 1}],
         fBillstatus:[{label:'全部',value:''},{label:'暂存',value:'2'},{label:'审核中',value:'5'},{label:'审核通过',value:'6'},]
       },
@@ -88,7 +90,7 @@ export default {
           disabled: false,
           hasPermi:['anpin:stockControl:salesOfOutboundExcePorrt']
         }],
-      inDex: 4,
+      inDex: 5,
       total:0,
       formDataList:{
         pageSize:10,
@@ -173,6 +175,14 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
+        },
+        {
+          surface: '12',
+          label: 'fWarehouseName',
+          name: '仓库',
+          checked: 0,
+          width: 100,
+          onabort: ''
         }
         ],
       formOption:[
@@ -212,6 +222,14 @@ export default {
           rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
+          label: "fWarehouseid",
+          name: "仓库",
+          inputType: 1,
+          width: 200,
+          labelSize: "80",
+          rules: [{ required: false, message: " " }],
+        },{
+          span: 6,
           label: 'fFeeid',
           name: '物资名称',
           inputType: 1,
@@ -252,6 +270,15 @@ export default {
         })
       }
     })
+    // 仓库数据
+    warehouse().then((res) => {
+      for (let item in res.rows) {
+        this.dataList.fWarehouseid.push({
+          label: res.rows[item].fName,
+          value: res.rows[item].fId,
+        });
+      }
+    });
     this.getDicts("data_cost_attribute").then((response) => {
       for(let item in response.data){
         this.dataList.fFeeTypeList.push({
@@ -304,7 +331,7 @@ export default {
         }
         this.isItHidden = true
         // this.inDex = this.formOption.length
-        this.inDex = 4
+        this.inDex = 5
         if (list == 'S'){
           this.$set(this.$refs.avatar.form,'groupDate',1)
         }
@@ -347,10 +374,10 @@ export default {
     feedback(res) {
       console.log(res)
       if (res == '展开') {
-        if (this.inDex == 4) {
+        if (this.inDex == 5) {
           this.inDex = this.formOption.length
         } else {
-          this.inDex = 4
+          this.inDex = 5
         }
       } else if (res == '搜索') {
         this.formDataList = this.$refs.avatar.form