snow hai 1 ano
pai
achega
9bb4ecbdea

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/businessReportQuery/businessFinanceReport/index.vue

@@ -57,7 +57,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "financeReport"
+          (item) => item.menu_route == "businessFinanceReport"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 1 - 1
src/views/businessReportQuery/businessProductReport/index.vue

@@ -46,7 +46,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "productReport") || {};
+        this.$store.getters.btnList.find((i) => i.menu_route == "businessProductReport") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },

+ 1 - 1
src/views/businessReportQuery/businessPurchaseReport/index.vue

@@ -103,7 +103,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find((item) => item.menu_route == "purchaseReport") ||
+        this.$store.getters.btnList.find((item) => item.menu_route == "businessPurchaseReport") ||
         {};
       const { action } = tran ?? {};
       return action ?? [];

+ 3 - 4
src/views/businessReportQuery/businessSaleReport/components/table12.vue

@@ -44,7 +44,7 @@
               <el-button
                 :size="searchSize"
                 type="primary"
-                style="float: right; margin-left: 5px"
+                style="float:right;margin-left:5px"
                 @click="searchList"
               >
                 刷新
@@ -53,8 +53,7 @@
 
           </el-row>
           <el-row style="padding: 10px 0 0 0">
-            <el-col :span="6" style="width: 150px">
-
+            <!-- <el-col :span="6" style="width: 150px">
               <el-select
                 v-model="parmValue.status"
                 :size="searchSize"
@@ -77,7 +76,7 @@
                 <el-option label="采购已驳回" value="7" />
                 <el-option label="申请已取消" value="8" />
               </el-select>
-            </el-col>
+            </el-col> -->
 
             <el-col :span="4" style="width: 66px; float: right">
               <el-button

+ 0 - 2
src/views/businessReportQuery/businessSaleReport/components/table14.vue

@@ -24,7 +24,6 @@
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
-
             <el-col :span="6" style="width: 363px;">
               <periodDatePickerActive
                 :start="parmValue.start_date"
@@ -166,7 +165,6 @@ export default {
   mounted() {
     this.searchList()
   },
-
   methods: {
     // 初始化http请求
     async searchList() {

+ 1 - 1
src/views/businessReportQuery/businessSaleReport/index.vue

@@ -171,7 +171,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          item => item.menu_route == "saleReport"
+          item => item.menu_route == "businessSaleReport"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 1 - 1
src/views/businessReportQuery/businessSaleReportOrder/index.vue

@@ -57,7 +57,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "saleReportOrder"
+          (item) => item.menu_route == "businessSaleReportOrder"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 1 - 1
src/views/businessReportQuery/businessStockReport/index.vue

@@ -57,7 +57,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "stockReport"
+          (item) => item.menu_route == "businessStockReport"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 5 - 0
src/views/purchaseIn/wsmInOrder/columns.js

@@ -180,6 +180,11 @@ const columns = [
   //   label: "申请人部门",
   //   minWidth: "150px",
   // },
+  // {
+  //   prop: 'apply_name',
+  //   label: '申请人',
+  //   width: '95'
+  // },
   {
     prop: 'cgder',
     label: '供应商负责人',

+ 201 - 211
src/views/reportQuery/saleReport/components/table12.vue

@@ -1,141 +1,137 @@
 <template>
-    <div>
-      <ex-table
-        v-loading="loading"
-        :table="table"
-        :data="tableData"
-        :columns="table12"
-        :page="pageInfo"
-        :size="size"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @screen-submit="
-          pageInfo.curr = 1;
-          parmValue.page = 1;
-          searchList();
-        "
-        @selection="selection_change"
-      >
-        <template #table-header="{}">
-          <div style="width: 100%">
-            <el-row style="padding: 0 0 0 80px">
-             
-               <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'退货'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              
-            </el-row>
-           <el-row style="padding: 10px 0 0 0">
-              <el-col :span="6" style="width: 150px">
-                
+  <div>
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table12"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
 
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  placeholder="退货单状态"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                    <el-option label="待业务审批" value="1"></el-option>
-                    <el-option label="待采购审核" value="2"></el-option>
-                    <el-option label="待设置仓库" value="3"></el-option>
-                    <el-option label="待客户退货" value="4"></el-option>
-                    <el-option label="售后已完成" value="5"></el-option>
-                    <el-option label="业务已驳回" value="6"></el-option>
-                    <el-option label="采购已驳回" value="7"></el-option>
-                    <el-option label="申请已取消" value="8"></el-option>
-                </el-select>
-              </el-col>
-              
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>     
-            </el-row>
-          </div>
-       </template>
+            <el-col :span="6" style="width: 363px;">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'退货'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
+                导出
+              </el-button>
+            </el-col>
+            <el-col :span="3" style="width: 66px; float: right">
+              <el-button
+                :size="searchSize"
+                type="primary"
+                style="float: right; margin-left: 5px"
+                @click="searchList"
+              >
+                刷新
+              </el-button>
+            </el-col>
 
-        
-      </ex-table>
-    </div>
+          </el-row>
+          <el-row style="padding: 10px 0 0 0">
+            <!-- <el-col :span="6" style="width: 150px">
+              <el-select
+                v-model="parmValue.status"
+                :size="searchSize"
+                filterable
+                clearable
+                placeholder="退货单状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option label="待业务审批" value="1" />
+                <el-option label="待采购审核" value="2" />
+                <el-option label="待设置仓库" value="3" />
+                <el-option label="待客户退货" value="4" />
+                <el-option label="售后已完成" value="5" />
+                <el-option label="业务已驳回" value="6" />
+                <el-option label="采购已驳回" value="7" />
+                <el-option label="申请已取消" value="8" />
+              </el-select>
+            </el-col> -->
+
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button
+                type="warning"
+                class="fr"
+                :size="searchSize"
+                @click="restSearch"
+              >
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+    </ex-table>
+  </div>
 
-  
 </template>
-   <script>
-import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
-import urlConfig from "@/apis/url-config";
-import asyncRequest from "@/apis/service/reportQuery/saleReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table12} from "./columns";
-import { mapGetters } from "vuex";
+<script>
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/saleReport'
+import periodDatePickerActive from '../period-date-picker/main.vue'
+import { table12 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "saleReport",
-  mixins: [mixinPage, resToken],
+  name: 'SaleReport',
   components: {
     periodDatePickerActive
   },
+  mixins: [mixinPage, resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+
   },
   data() {
     return {
-      //选中数组
+      // 选中数组
       changeList: [],
-      //全局url
+      // 全局url
       fileUrl: urlConfig.baseURL,
-      //loading
+      // loading
       loading: false,
-      //请求参数集合
+      // 请求参数集合
       parmValue: {
-        status:"", //处理状态
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+        status: '', // 处理状态
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         // is_export:0,//是否导出0/1
         page: 1, // 页码
-        size: 15, // 每页显示条数
-       
+        size: 15 // 每页显示条数
+
       },
       // 表格 - 数据集合
       tableData: [],
@@ -143,168 +139,162 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table12: table12,
-    };
+      table12: table12
+    }
   },
   mounted() {
-    
-    this.searchList();
+    this.searchList()
   },
 
   methods: {
-    //初始化http请求
+    // 初始化http请求
     async searchList() {
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整!");
-        return;
+        this.$message.warning('时间区间不完整!')
+        return
       }
-      // return;
-      this.loading = true;
-      
-      const res = await asyncRequest.saleexportthdata(this.parmValue);
+      this.loading = true
+
+      const res = await asyncRequest.saleexportthdata(this.parmValue)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        this.tableData = res.data.list
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
         this.$message.warning(res.message)
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
-   
-    //重置
+
+    // 重置
     restSearch() {
       this.parmValue = {
-        status:"", //处理状态
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        status: '', // 处理状态
+        start_date: '', // 新建起始时间
+        end_date: '', // 新建结束时间
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
         // is_export:0//是否导出0/1
-      };
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
-    
+
     // 时间函数
     async time(e) {
-      this.parmValue.start_date = e.startTime || "";
-      this.parmValue.end_date = e.endTime || "";
+      this.parmValue.start_date = e.startTime || ''
+      this.parmValue.end_date = e.endTime || ''
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date === "") ||
-        (this.parmValue.start_date === "" && this.parmValue.end_date !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
       ) {
-        this.$message.warning("时间区间不完整!");
-        return;
+        this.$message.warning('时间区间不完整!')
+        return
       }
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
 
-     //选中触发函数
+    // 选中触发函数
     selection_change(e) {
-      const { list } = e;
-      //选中的数组集合
-      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
     },
-    //导出文件 
+    // 导出文件
     async download() {
       // if(this.changeList.length<=0){
       //   this.$message.warning("请选择有效数据")
       //   return;
       // }
-      let start_date = new Date(this.parmValue.start_date).valueOf();
-      let end_date = new Date(this.parmValue.end_date).valueOf();
-      let flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000;
-      if(this.parmValue.start_date != "" && this.parmValue.end_date != ""){
-        if(flag){
-          this.$message.warning("导出文件的时间区间不能超过30天")
-          return;
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_date != '' && this.parmValue.end_date != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
         }
-      }else{
-        this.$message.warning("请选择导出文件的时间区间")
-        return;
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
       }
-      let model = JSON.parse(JSON.stringify(this.parmValue))
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       // model.is_export = 1;
       if (!this.loading) {
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/saleexportthdataexport",
-          responseType: "blob",
+          method: 'post',
+          url: this.fileUrl + 'admin/saleexportthdataexport',
+          responseType: 'blob',
           data: model,
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
-            if (res && res.status == 200 && res.data) {
-              let url = window.URL.createObjectURL(
+            if (res && res.status === 200 && res.data) {
+              const url = window.URL.createObjectURL(
                 new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
                   type: httpType
                 })
-              );
-              let link = document.createElement("a");
-              link.style.display = "none";
-              link.href = url;
-              let excelName = "退货明细表.zip";
-              link.setAttribute("download", excelName);
-              document.body.appendChild(link);
-              link.click();
-              link.remove();
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-              this.$message.success(`导出成功!`);
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const excelName = '退货明细表.zip'
+              link.setAttribute('download', excelName)
+              document.body.appendChild(link)
+              link.click()
+              link.remove()
+              window.URL.revokeObjectURL(url) // 释放掉blob对象
+              this.$message.success(`导出成功!`)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             } else {
-              this.$message.error(res.data.message);
+              this.$message.error(res.data.message)
               setTimeout(() => {
-                this.loading = false;
-              }, 500);
+                this.loading = false
+              }, 500)
             }
           })
           .catch((error) => {
-            console.log(error);
-            this.loading = false;
-          });
+            console.log(error)
+            this.loading = false
+          })
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
    <style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
 </style>
-   
+

+ 2 - 2
src/views/reportQuery/saleReport/components/table24.vue

@@ -161,8 +161,8 @@ export default {
       if (code === 0) {
         // const { list, count } = data;
         const list = Object.keys(data).reduce((prev, currentKey) => ([...prev, data[currentKey]]), [])
-        const totalItem = list.shift()
-        list.push(totalItem)
+        // const totalItem = list.shift()
+        // list.push(totalItem)
         this.tableData = list
       } else if (code >= 100 && code <= 104) {
         await this.logout()

+ 3 - 2
src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -597,8 +597,9 @@ export default {
       this.loading = true;
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
+      console.log(model)
       delete model["s_input"];
-      delete model['supplierNo']
+      // delete model['supplierNo']
 
       const res = await asyncRequest.list({
         ...model,
@@ -606,7 +607,7 @@ export default {
         [this.select]: this.s_input,
         [this.queryKey]: this.queryValue,
         companyNo: this.currentCompany,
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
+        supplierNo: Array.isArray(model.supplierNo) ? model.supplierNo[0] : model.supplierNo,
         customer_code: Array.isArray(this.parmValue.customer_code)
           ? this.parmValue.customer_code[0]
           : this.parmValue.customer_code,

+ 5 - 1
src/views/stock/stockCount/components/dataWeido/index.vue

@@ -223,10 +223,14 @@ export default {
     };
   },
   mounted() {
+    this.onCompanyChange()
     this.searchList();
   },
-
   methods: {
+    onCompanyChange(){
+      console.log(this.currentCompany)
+      this.parmValue.companyNo = this.currentCompany
+    },
     //业务公司选择
     async supplierChange(e) {
       const { code } = e;

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio