Merge branch 'sit'

src/apis/service/reportQuery/purchaseReport/index.js

@@ -21,7 +21,12 @@ export default {
    reportconsultbidssum: (data, params) => http(api + "reportconsultbidssum", data, "post", params),
    //采购员订单金额
    reportpurcheaseordersumbyuser: (data, params) => http(api + "reportpurcheaseordersumbyuser", data, "post", params),
+
    //已采反报价信息
    reportconsultinfobidssum: (data, params) => http(api + "reportconsultinfobidssum", data, "post", params),
+   //未采反信息
+   reportconsultinfobidssumnot: (data, params) => http(api + "reportconsultinfobidssumnot", data, "post", params),
+   //订单明细
+   reportorderlistdetailed: (data, params) => http(api + "reportorderlistdetailed", data, "post", params),
    
 };

src/views/bigScreen/datavScr/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pagePadding box">
-    <div id="index" ref="appRef">
+    <div id="index" ref="appRef" v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
       <div class="bg">
         <dv-loading v-if="loading">Loading...</dv-loading>
         <div v-else class="host-body">
@@ -94,11 +94,16 @@
         </div>
       </div>
     </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
   </div>
 </template>
 
 <script>
 // import drawMixin from "../drawMixin";
+import { mapGetters } from "vuex";
+import resToken from "@/mixins/resToken";
 import { formatTime } from "../index.js";
 import centerLeft1 from "./centerLeft1";
 import centerLeft2 from "./centerLeft2";
@@ -109,7 +114,21 @@ import bottomLeft from "./bottomLeft";
 import bottomRight from "./bottomRight";
 
 export default {
-  // mixins: [ drawMixin ],
+  mixins: [ resToken ],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "datavScr"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
   data() {
     return {
       timing: null,

src/views/reportQuery/purchaseReport/components/columns.js

@@ -305,72 +305,77 @@ const table7 = [
     _noset_: true
   },
   {
-    prop: "date",
+    prop: "cgdNo",
     label: "采购单编号",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "addtime",
     label: "创建时间",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "supplierNo",
     label: "供应商编号",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "supplier_name",
     label: "供应商名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "good_name",
     label: "产品名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "good_num",
     label: "购买数量",
     minWidth: "110px",
   },
   {
-    prop: "total",
+    prop: "nake_fee",
     label: "裸价",
     minWidth: "100px",
   },
   {
-    prop: "total",
+    prop: "total_fee",
     label: "成本合计",
     minWidth: "110px",
   },
   {
-    prop: "total",
+    prop: "status",
     label: "单据状态",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "send_status",
+    label: "发货状态",
+    minWidth: "110px",
+  },
+  {
+    prop: "wsend_num",
     label: "未发货数量",
     minWidth: "110px",
   },
   {
-    prop: "total",
+    prop: "creater",
     label: "创建人",
     minWidth: "110px",
   },
   {
-    prop: "total",
+    prop: "company",
     label: "客户名称",
     minWidth: "155px",
   },
   {
-    prop: "total",
+    prop: "cgder",
     label: "采购员",
     minWidth: "110px",
   },
   {
-    prop: "total",
+    prop: "send_time",
     label: "发货时间",
     minWidth: "155px",
   },

src/views/reportQuery/purchaseReport/components/table5.vue

@@ -123,7 +123,7 @@ export default {
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        is_export:0//是否导出
+        is_export:0//是否导出0/1
        
       },
       // 表格 - 数据集合
@@ -185,7 +185,7 @@ export default {
         end_date: "", // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        is_export:0//是否导出
+        is_export:0//是否导出0/1
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -211,26 +211,18 @@ export default {
     },
     //导出文件 
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
-        return;
-      }
-      let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
-      });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
-
-
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      let model = JSON.parse(JSON.stringify(this.parmValue))
+      model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
+          url: this.fileUrl + "admin/reportconsultinfobidssum",
           responseType: "blob",
           data: model,
           headers: {
@@ -253,7 +245,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "采购单.zip";
+              let excelName = "已采反报价.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/reportQuery/purchaseReport/components/table6.vue

@@ -57,7 +57,7 @@
                 <el-input
                   clearable
                   placeholder="客户名称"
-                  v-model="parmValue.xiugai1"
+                  v-model="parmValue.companyName"
                   maxlength="40"
                   :size="searchSize"
                   @blur="
@@ -118,10 +118,10 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        xiugai1:"", //客户名称
+        companyName:"", //客户名称
         start_date: "", //起始时间
         end_date: "", // 结束时间
-
+        is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
        
@@ -145,7 +145,7 @@ export default {
     };
   },
   mounted() {
-
+    alert("未采反信息：接口暂无数据，以此提示")
     this.searchList();
   },
 
@@ -162,13 +162,14 @@ export default {
       return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportconsultinfobidssumnot(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
+        this.$message.warning(res.message)
         this.tableData = [];
         this.pageInfo.total = 0;
       }
@@ -178,10 +179,12 @@ export default {
     //重置
     restSearch() {
       this.parmValue = {
+        companyName:"", //客户名称
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_export:0//是否导出0/1
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -207,26 +210,18 @@ export default {
     },
     //导出文件 
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
-        return;
-      }
-      let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
-      });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
-
-
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      let model = JSON.parse(JSON.stringify(this.parmValue))
+      model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
+          url: this.fileUrl + "admin/reportconsultinfobidssumnot",
           responseType: "blob",
           data: model,
           headers: {
@@ -249,7 +244,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "采购单.zip";
+              let excelName = "已采反报价.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();

src/views/reportQuery/purchaseReport/components/table7.vue

@@ -140,6 +140,7 @@ export default {
         
         start_date: "", //起始时间
         end_date: "", // 结束时间
+        is_export:0,//是否导出0/1
 
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -178,16 +179,16 @@ export default {
         this.$message.warning("时间区间不完整！");
         return;
       }
-      return;
       this.loading = true;
       
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.reportorderlistdetailed(this.parmValue);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
+        this.$message.warning(res.message)
         this.tableData = [];
         this.pageInfo.total = 0;
       }
@@ -199,6 +200,7 @@ export default {
       this.parmValue = {
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
+        is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -226,26 +228,18 @@ export default {
     },
     //导出文件 
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
-        return;
-      }
-      let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
-      });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
-
-
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      let model = JSON.parse(JSON.stringify(this.parmValue))
+      model.is_export = 1;
       if (!this.loading) {
         this.loading = true;
         let httpType = `aplication/zip`;
         axios({
           method: "post",
-          url: this.fileUrl + "admin/exportcgdlist",
+          url: this.fileUrl + "admin/reportorderlistdetailed",
           responseType: "blob",
           data: model,
           headers: {
@@ -268,7 +262,7 @@ export default {
               let link = document.createElement("a");
               link.style.display = "none";
               link.href = url;
-              let excelName = "采购单.zip";
+              let excelName = "已采反报价.zip";
               link.setAttribute("download", excelName);
               document.body.appendChild(link);
               link.click();