Merge branch 'v3.0' into company

dist/static/js/1.js

@@ -1,5 +1,17 @@
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
 
+/***/ "./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js":
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js ***!
+  \*****************************************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectDestructuringEmpty; });\nfunction _objectDestructuringEmpty(obj) {\n  if (obj == null) throw new TypeError(\"Cannot destructure \" + obj);\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js?");
+
+/***/ }),
+
 /***/ "./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js":
 /*!****************************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js ***!
@@ -8,7 +20,7 @@
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutProperties; });\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ \"./node_modules/core-js/modules/es.symbol.js\");\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./objectWithoutPropertiesLoose.js */ \"./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js\");\n\n\nfunction _objectWithoutProperties(source, excluded) {\n  if (source == null) return {};\n  var target = Object(_objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"])(source, excluded);\n  var key, i;\n\n  if (Object.getOwnPropertySymbols) {\n    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);\n\n    for (i = 0; i < sourceSymbolKeys.length; i++) {\n      key = sourceSymbolKeys[i];\n      if (excluded.indexOf(key) >= 0) continue;\n      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;\n      target[key] = source[key];\n    }\n  }\n\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutProperties; });\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ \"./node_modules/core-js/modules/es.symbol.js\");\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./objectWithoutPropertiesLoose.js */ \"./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js\");\n\n\nfunction _objectWithoutProperties(source, excluded) {\n  if (source == null) return {};\n  var target = Object(_objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"])(source, excluded);\n  var key, i;\n  if (Object.getOwnPropertySymbols) {\n    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);\n    for (i = 0; i < sourceSymbolKeys.length; i++) {\n      key = sourceSymbolKeys[i];\n      if (excluded.indexOf(key) >= 0) continue;\n      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;\n      target[key] = source[key];\n    }\n  }\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js?");
 
 /***/ }),
 
@@ -20,7 +32,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutPropertiesLoose; });\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ \"./node_modules/core-js/modules/es.object.keys.js\");\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);\n\nfunction _objectWithoutPropertiesLoose(source, excluded) {\n  if (source == null) return {};\n  var target = {};\n  var sourceKeys = Object.keys(source);\n  var key, i;\n\n  for (i = 0; i < sourceKeys.length; i++) {\n    key = sourceKeys[i];\n    if (excluded.indexOf(key) >= 0) continue;\n    target[key] = source[key];\n  }\n\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutPropertiesLoose; });\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ \"./node_modules/core-js/modules/es.object.keys.js\");\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);\n\nfunction _objectWithoutPropertiesLoose(source, excluded) {\n  if (source == null) return {};\n  var target = {};\n  var sourceKeys = Object.keys(source);\n  var key, i;\n  for (i = 0; i < sourceKeys.length; i++) {\n    key = sourceKeys[i];\n    if (excluded.indexOf(key) >= 0) continue;\n    target[key] = source[key];\n  }\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js?");
 
 /***/ }),
 
@@ -83,17 +95,6 @@ eval("\nvar toIndexedObject = __webpack_require__(/*! ../internals/to-indexed-ob
 
 /***/ }),
 
-/***/ "./node_modules/core-js/internals/array-reduce.js":
-/*!********************************************************!*\
-  !*** ./node_modules/core-js/internals/array-reduce.js ***!
-  \********************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-eval("var aFunction = __webpack_require__(/*! ../internals/a-function */ \"./node_modules/core-js/internals/a-function.js\");\nvar toObject = __webpack_require__(/*! ../internals/to-object */ \"./node_modules/core-js/internals/to-object.js\");\nvar IndexedObject = __webpack_require__(/*! ../internals/indexed-object */ \"./node_modules/core-js/internals/indexed-object.js\");\nvar toLength = __webpack_require__(/*! ../internals/to-length */ \"./node_modules/core-js/internals/to-length.js\");\n\n// `Array.prototype.{ reduce, reduceRight }` methods implementation\nvar createMethod = function (IS_RIGHT) {\n  return function (that, callbackfn, argumentsLength, memo) {\n    aFunction(callbackfn);\n    var O = toObject(that);\n    var self = IndexedObject(O);\n    var length = toLength(O.length);\n    var index = IS_RIGHT ? length - 1 : 0;\n    var i = IS_RIGHT ? -1 : 1;\n    if (argumentsLength < 2) while (true) {\n      if (index in self) {\n        memo = self[index];\n        index += i;\n        break;\n      }\n      index += i;\n      if (IS_RIGHT ? index < 0 : length <= index) {\n        throw TypeError('Reduce of empty array with no initial value');\n      }\n    }\n    for (;IS_RIGHT ? index >= 0 : length > index; index += i) if (index in self) {\n      memo = callbackfn(memo, self[index], index, O);\n    }\n    return memo;\n  };\n};\n\nmodule.exports = {\n  // `Array.prototype.reduce` method\n  // https://tc39.github.io/ecma262/#sec-array.prototype.reduce\n  left: createMethod(false),\n  // `Array.prototype.reduceRight` method\n  // https://tc39.github.io/ecma262/#sec-array.prototype.reduceright\n  right: createMethod(true)\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-reduce.js?");
-
-/***/ }),
-
 /***/ "./node_modules/core-js/internals/ieee754.js":
 /*!***************************************************!*\
   !*** ./node_modules/core-js/internals/ieee754.js ***!

src/assets/js/btnList.js

@@ -95,7 +95,12 @@ const btnList = [
   { code: "094", name: "设置订单用途"},
   { code: "095", name: "设置是否合规" },
   { code: '096',name: '设置平台' },
-  { code: '097',name: '设置部门' }
+  { code: '097',name: '设置部门' },
+  // { code: '098',name: '采购单情况表' },
+  // { code: '099',name: '竞价单反馈情况表' },
+  // { code: '100',name: '当日库存销售情况表' },
+  // { code: '101',name: '待库管发货' },
+  // { code: '102',name: '无地址订单' }
 ];
-
+// 数据报表
 export default btnList;

src/config/env.development.js

@@ -6,7 +6,7 @@ module.exports = {
     baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -21,7 +21,7 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://fin.caixiao365.com/',
+  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
   // 工单管理系统url
   GDUrl: 'http://localhost:8080/',
   // token加密key

src/layout/components/Navbar.vue

@@ -37,17 +37,18 @@
           @click="onSwitchCompanyMode"
         />
       </el-tooltip>
-      <el-tooltip
+      <!-- <el-tooltip
         v-if="device !== 'mobile'"
         placement="bottom"
         content="登录工单管理系统"
       >
-        <i
-          class="el-icon-s-management right-menu-item hover-effect"
-          style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
+        <p
+          style="font-size:14px;color:#5a5e66;font-weight:500;line-height:54px;margin:0px 5px;cursor:pointer"
           @click="openSettlementSystem(GDurl)"
-        />
-      </el-tooltip>
+        >
+          工单
+        </p>
+      </el-tooltip> -->
       <el-tooltip
         v-if="device !== 'mobile'"
         placement="bottom"
@@ -191,11 +192,17 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="24" style="text-align: right">
-                  <el-checkbox v-model="checked" class="fl" style="padding-top: 5px"
-                    >我已知晓，后续不再提示！</el-checkbox
-                  >
-                  <el-button type="primary" plain :size="'mini'" @click="submit"
-                    >关闭
+                  <el-checkbox
+                    v-model="checked"
+                    class="fl"
+                    style="padding-top: 5px"
+                  >我已知晓，后续不再提示！</el-checkbox>
+                  <el-button
+                    type="primary"
+                    plain
+                    :size="'mini'"
+                    @click="submit"
+                  >关闭
                   </el-button>
                 </el-col>
               </el-row>
@@ -208,52 +215,52 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import asyncRequest from "@/apis/service/system/updates";
-import resToken from "@/mixins/resToken";
-import CompanySelect from "./company-select/index.vue";
-import PasswordModal from "@/layout/components/password-modal/index.vue";
-import config from "@/config/index";
+import { mapGetters } from 'vuex'
+import asyncRequest from '@/apis/service/system/updates'
+import resToken from '@/mixins/resToken'
+import CompanySelect from './company-select/index.vue'
+import PasswordModal from '@/layout/components/password-modal/index.vue'
+import config from '@/config/index'
 
 import {
   getNotice,
   setNotice,
   get_business_companyNo,
   get_business_company,
-  getToken,
-} from "@/utils/auth";
+  getToken
+} from '@/utils/auth'
 
-import CryptoJS from "crypto-js";
-import { userStoreActions } from "@/store/modules/user";
-import { accountLevels } from "@/assets/js/statusList";
-import { userInfo } from "os";
+import CryptoJS from 'crypto-js'
+import { userStoreActions } from '@/store/modules/user'
+import { accountLevels } from '@/assets/js/statusList'
+import { userInfo } from 'os'
 
 export default {
   computed: {
     ...mapGetters([
-      "sidebar",
-      "avatar",
-      "device",
-      "userInfo",
-      "currentLevel",
-      "navList",
-      "isSupertube",
+      'sidebar',
+      'avatar',
+      'device',
+      'userInfo',
+      'currentLevel',
+      'navList',
+      'isSupertube'
     ]),
     switchAccountModeText() {
-      return this.currentLevel === "3" ? "切换到业务公司" : "切换到供应商";
-    },
+      return this.currentLevel === '3' ? '切换到业务公司' : '切换到供应商'
+    }
   },
   components: {
     CompanySelect,
-    PasswordModal,
+    PasswordModal
   },
   mixins: [resToken],
   data() {
     return {
-      JSurl: config.settlementPlatformUrl + "/#/accept?t=",
-      GDurl: config.GDUrl + "#/demand/index?t=",
-      companyNo: "",
-      companyNoName: "",
+      JSurl: config.settlementPlatformUrl + '/#/accept?t=',
+      GDurl: config.GDUrl + '#/demand/index?t=',
+      companyNo: '',
+      companyNoName: '',
       showModel: false,
       loading: false,
       isShow: true,
@@ -263,56 +270,56 @@ export default {
       visible: false,
       lastNotice: null, // 最后一次提示时间
       parmValue: {
-        type: "",
+        type: '',
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
-      activeMsg: null, // 消息展示对象
-    };
+      activeMsg: null // 消息展示对象
+    }
   },
   mounted() {
-    this.companyNo = get_business_companyNo() || "";
-    this.companyNoName = get_business_company() || "";
-    this.openNotice(true);
+    this.companyNo = get_business_companyNo() || ''
+    this.companyNoName = get_business_company() || ''
+    this.openNotice(true)
   },
   methods: {
     getUserName(username) {
-      const chunks = username.split("");
-      return chunks[0] + chunks[1] + "...";
+      const chunks = username.split('')
+      return chunks[0] + chunks[1] + '...'
     },
-    openSettlementSystem: function (url) {
+    openSettlementSystem: function(url) {
       // 加密token
       const encJson = CryptoJS.AES.encrypt(
         JSON.stringify({ token: getToken() }),
         config.secretKey
-      );
-      const encData = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encJson));
+      )
+      const encData = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encJson))
       // 跳转至结算平台携带加密后的token
-      console.log(url + encData);
-      window.open(url + encData);
+      console.log(url + encData)
+      window.open(url + encData)
     },
     async openNotice(is) {
       if (getNotice() && getNotice().length > 0) {
-        this.lastNotice = JSON.parse(getNotice());
+        this.lastNotice = JSON.parse(getNotice())
       } else {
-        this.lastNotice = null;
+        this.lastNotice = null
       }
-      const { code, count, item, message } = await this.initData();
+      const { code, count, item, message } = await this.initData()
       if (code === 0) {
         if (count != 0) {
-          this.activeMsg = item;
+          this.activeMsg = item
           if (is) {
-            this.typeShow();
+            this.typeShow()
           } else {
-            this.showModel = true;
+            this.showModel = true
           }
         } else {
-          this.$message.warning("暂无系统消息！");
+          this.$message.warning('暂无系统消息！')
         }
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     business_companyNo_change(e) {
@@ -334,87 +341,87 @@ export default {
         code: 0,
         count: 0,
         item: {},
-        message: "",
-      };
-
-      this.loading = true;
-      const { code, data, message } = await asyncRequest.list(this.parmValue);
-      this.loading = false;
-      res.code = code;
-      res.message = message;
+        message: ''
+      }
+
+      this.loading = true
+      const { code, data, message } = await asyncRequest.list(this.parmValue)
+      this.loading = false
+      res.code = code
+      res.message = message
       if (code === 0) {
-        const { list, count } = data;
-        res.count = count;
+        const { list, count } = data
+        res.count = count
         if (count !== 0) {
-          res.item = JSON.parse(JSON.stringify(list[0]));
+          res.item = JSON.parse(JSON.stringify(list[0]))
         }
       }
-      return res;
+      return res
     },
     typeShow() {
-      const is = this.is_Tips();
+      const is = this.is_Tips()
       if (!is) {
-        return;
+        return
       }
-      if (this.lastNotice + "" === "null" && is) {
-        this.showModel = true;
+      if (this.lastNotice + '' === 'null' && is) {
+        this.showModel = true
       } else {
-        const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice;
-        const { sys_type, addtime } = this.activeMsg;
+        const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice
+        const { sys_type, addtime } = this.activeMsg
 
         if (laddtime === addtime && lsys_type === sys_type) {
-          if (ltype + "" === "1") {
-            this.showModel = false;
+          if (ltype + '' === '1') {
+            this.showModel = false
           } else {
-            this.showModel = true;
+            this.showModel = true
           }
         } else {
-          this.showModel = true;
+          this.showModel = true
         }
       }
     },
     is_Tips() {
-      const nowtime = new Date().valueOf();
-      const { sys_type, addtime } = this.activeMsg;
-      const timeV = new Date(addtime).valueOf();
-      if (sys_type === "VER") {
-        this.statsTime = timeV;
-        this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7;
+      const nowtime = new Date().valueOf()
+      const { sys_type, addtime } = this.activeMsg
+      const timeV = new Date(addtime).valueOf()
+      if (sys_type === 'VER') {
+        this.statsTime = timeV
+        this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7
         if (nowtime >= this.statsTime && nowtime <= this.endTime) {
-          return true;
+          return true
         } else {
-          return false;
+          return false
         }
       } else {
-        this.statsTime = 0;
-        this.endTime = timeV;
+        this.statsTime = 0
+        this.endTime = timeV
         if (nowtime <= this.endTime) {
-          return true;
+          return true
         } else {
-          return false;
+          return false
         }
       }
     },
     toggleSideBar() {
-      this.$store.dispatch("app/toggleSideBar");
+      this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch("user/logout");
-      this.$router.push(`/login?redirect=${this.$route.fullPath}`);
+      await this.$store.dispatch('user/logout')
+      this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     },
     submit() {
-      this.page_set_notice();
-      this.showModel = false;
+      this.page_set_notice()
+      this.showModel = false
     },
     // 保存提交结果
     page_set_notice() {
-      const { sys_type, addtime } = this.activeMsg;
+      const { sys_type, addtime } = this.activeMsg
       const model = {
-        type: this.checked ? "1" : "0",
+        type: this.checked ? '1' : '0',
         sys_type: sys_type,
-        addtime: addtime,
-      };
-      setNotice(JSON.stringify(model));
+        addtime: addtime
+      }
+      setNotice(JSON.stringify(model))
     },
 
     // 切换以供应商或业务公司视角
@@ -422,22 +429,22 @@ export default {
       const level =
         this.currentLevel === accountLevels.supplier
           ? accountLevels.super
-          : accountLevels.supplier;
-      this.$refs.companySelect && this.$refs.companySelect.selectAllCompany();
-      this.$store.commit(userStoreActions.setCompanyList, []);
-      this.$store.commit(userStoreActions.setCurrentLevel, level);
-      await this.$store.dispatch(userStoreActions.reloadMenu, level);
-
-      const parentRoute = this.navList[0];
-      if (!parentRoute) return;
-      const toRoute = parentRoute.children[0];
-      if (!toRoute) return;
-      const { url } = toRoute;
-
-      this.$router.replace("/reload?redirect=" + url.split("/index")[0]);
-    },
-  },
-};
+          : accountLevels.supplier
+      this.$refs.companySelect && this.$refs.companySelect.selectAllCompany()
+      this.$store.commit(userStoreActions.setCompanyList, [])
+      this.$store.commit(userStoreActions.setCurrentLevel, level)
+      await this.$store.dispatch(userStoreActions.reloadMenu, level)
+
+      const parentRoute = this.navList[0]
+      if (!parentRoute) return
+      const toRoute = parentRoute.children[0]
+      if (!toRoute) return
+      const { url } = toRoute
+
+      this.$router.replace('/reload?redirect=' + url.split('/index')[0])
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/dataReport/columns.js

@@ -0,0 +1,462 @@
+const table2 = [
+  // {
+  //   type: "selection",
+  //   fixed: "left",
+  //   _noset_: true
+  // },
+  {
+    prop: 'skuCode',
+    label: '商品上线编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'plat_code',
+    label: '平台商品编码',
+    minWidth: '155px'
+  },
+
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    minWidth: '155px'
+  },
+  {
+    prop: 'platform_name',
+    label: '上线平台',
+    minWidth: '155px'
+  },
+  {
+    prop: 'online_time',
+    label: '上线完成时间',
+    minWidth: '145px'
+  },
+  {
+    prop: 'moq',
+    label: '起订量',
+    minWidth: '110'
+  },
+  {
+    prop: 'nake_fee',
+    label: '成本单价',
+    minWidth: '110px'
+  },
+  {
+    prop: 'cost_fee',
+    label: '工艺费',
+    minWidth: '110px'
+  },
+  {
+    prop: 'delivery_fee',
+    label: '物流费',
+    minWidth: '110px'
+  },
+  {
+    prop: 'cert_fee',
+    label: '证书费',
+    minWidth: '110px'
+  },
+  {
+    prop: 'mark_fee',
+    label: '加标费',
+    minWidth: '110px'
+  },
+  {
+    prop: 'packing_fee',
+    label: '包装费',
+    minWidth: '110px'
+  },
+  {
+    prop: 'other_fee',
+    label: '其他费用',
+    minWidth: '110px'
+  },
+  {
+    prop: 'nake_total',
+    label: '成本合计',
+    minWidth: '110px'
+  },
+  {
+    prop: 'addtime',
+    label: '申请上线时间',
+    minWidth: '145px'
+  }
+]
+
+const table3 = [
+  // {
+  //   type: 'selection',
+  //   fixed: 'left',
+  //   _noset_: true
+  // },
+  {
+    prop: 'good_code',
+    label: '产品编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'good_name',
+    label: '产品名称',
+    minWidth: '155px'
+  },
+  {
+    prop: 'good_num',
+    label: '当日库存销售'
+  },
+  {
+    prop: 'send_num',
+    label: '当日库存发货',
+    minWidth: '100px'
+  },
+  {
+    prop: 'stock_num',
+    label: '当日剩余可用库存',
+    minWidth: '90px'
+  },
+  {
+    prop: 'supplierName',
+    label: '业务公司名称',
+    width: '190px'
+  },
+  {
+    prop: 'good_price',
+    label: '库存采购单'
+  },
+  {
+    prop: 'total_fee',
+    label: '当前库存消耗金额',
+    minWidth: '90px'
+  }
+]
+
+const table4 = [
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'orderCode',
+    label: '销售订单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'is_supplier',
+    label: '供应商端'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '110px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source'
+  },
+  {
+    prop: 'num',
+    label: '发货数量'
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160px'
+  },
+  {
+    prop: 'name',
+    label: '仓库名称',
+    width: '160px'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160px'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160px'
+  }, {
+    prop: 'good_name',
+    label: '商品名称',
+    width: '160px'
+  }, {
+    prop: 'companyNo',
+    label: '业务公司编码',
+    width: '160px'
+  }, {
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '160px'
+  }, {
+    prop: 'customer_code',
+    label: '客户编码',
+    width: '160px'
+  }, {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160px'
+  }, {
+    prop: 'supplierNo',
+    label: '供应商编码',
+    width: '160px'
+  }, {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160px'
+  }, {
+    prop: 'addtime',
+    label: '下单时间',
+    width: '110px'
+  },
+  {
+    prop: 'platform_type',
+    label: '对接类型',
+    _slot_: 'platform_type'
+  }, {
+    prop: 'post_name',
+    label: '物流公司'
+  }, {
+    prop: 'post_fee',
+    label: '物流费用'
+  }, {
+    prop: 'addr',
+    label: '收货地址'
+  }, {
+    prop: 'addr_contactor',
+    label: '收货联系人',
+    width: '90px'
+  }, {
+    prop: 'addr_mobile',
+    label: '联系方式'
+  }, {
+    prop: 'cgdNo',
+    label: '采购单号'
+  }, {
+    prop: 'remark',
+    label: '备注'
+  }, {
+    prop: 'report_sx',
+    label: '时效'
+  }, {
+    prop: 'depart',
+    label: '申请人部门',
+    width: '90px'
+  }, {
+    prop: 'person',
+    label: '供应商负责人',
+    width: '95px'
+  }, {
+    prop: 'contactor_name',
+    label: '仓库负责人',
+    width: '90px'
+  }
+]
+
+const table5 = [
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'cgdNo',
+    label: '采购单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'send_num',
+    label: '发货数量'
+  },
+  {
+    prop: 'platform_type',
+    label: '平台类型',
+    minWidth: '70px'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    minWidth: '90px'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    width: '100px'
+  },
+  {
+    prop: 'supName',
+    label: '供应商',
+    minWidth: '190px'
+  },
+  {
+    prop: 'cat_name',
+    label: '商品分类',
+    minWidth: '120px'
+  }, {
+    prop: 'good_code',
+    label: '商品编号',
+    minWidth: '160px'
+  }, {
+    prop: 'good_name',
+    label: '商品名称',
+    minWidth: '160px'
+  }, {
+    prop: 'customer_code',
+    label: '客户编码',
+    minWidth: '160px'
+  }, {
+    prop: 'customerName',
+    label: '客户名称',
+    minWidth: '160px'
+  }, {
+    prop: 'supplierNo',
+    label: '业务公司编码',
+    minWidth: '160px'
+  }, {
+    prop: 'supplierName',
+    label: '业务公司名称',
+    minWidth: '160px'
+  }, {
+    prop: 'contactor',
+    label: '联系人',
+    minWidth: '90px'
+  }, {
+    prop: 'mobile',
+    label: '联系电话',
+    minWidth: '110px'
+  }, {
+    prop: 'post_name',
+    label: '物流公司',
+    minWidth: '90px'
+  }, {
+    prop: 'post_code',
+    label: '物流单号',
+    minWidth: '90px'
+  }, {
+    prop: 'post_fee',
+    label: '物流费用',
+    minWidth: '90px'
+  }, {
+    prop: 'send_time',
+    label: '发货时间',
+    minWidth: '90px'
+  }, {
+    prop: 'apply_name',
+    label: '申请人',
+    minWidth: '90px'
+  }, {
+    prop: 'depart',
+    label: '申请人部门',
+    minWidth: '90px'
+  },
+  {
+    prop: 'addtime',
+    label: '添加时间',
+    minWidth: '110px'
+  },
+  {
+    prop: 'createdTime',
+    label: '下单时间',
+    minWidth: '110px'
+  },
+  {
+    prop: 'report_sx',
+    label: '时效',
+    minWidth: '90px'
+  },
+  {
+    prop: 'cgder',
+    label: '供应商负责人',
+    minWidth: '100px'
+  }
+]
+
+const table6 = [
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    width: '100px',
+    _slot_: 'order_type'
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    width: '110px',
+    _slot_: 'status'
+  },
+
+  {
+    prop: 'good_code',
+    label: '商品成本编号',
+    width: '160px'
+  },
+  {
+    prop: 'skuCode',
+    label: '上线商品编号',
+    width: '155px'
+  },
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    minWidth: '155px'
+  },
+  {
+    prop: 'good_num',
+    label: '购买数量',
+    width: '110px'
+  },
+  {
+    prop: 'send_num',
+    label: '已发数量',
+    width: '110px'
+  },
+  {
+    prop: 'wsend_num',
+    label: '未发数量',
+    width: '110px'
+  },
+  {
+    prop: 'not_addr_address_good_num',
+    label: '无地址数量',
+    width: '110px'
+  },
+
+  {
+    prop: 'nickname',
+    label: '申请人',
+    width: '70px'
+  },
+  {
+    prop: 'name',
+    label: '所属部门',
+    width: '90px'
+  },
+  {
+    prop: 'month',
+    label: '下单月份',
+    width: '90px'
+  }
+]
+
+export { table2, table3, table4, table5, table6 }

src/views/dataReport/period-date-picker-month/index.vue

@@ -0,0 +1,90 @@
+<template>
+  <div class="fl time">
+    <el-date-picker
+      v-model="value"
+      type="month"
+      :size="size"
+      placeholder="选择月"
+      value-format="yyyy-MM"
+      @change="timeChange"
+      :editable="false"
+      :clearable="true"
+      :disabled="isEdit"
+      :picker-options="pickerOptions"
+    >
+    </el-date-picker>
+  </div>
+</template>
+
+<script>
+// 选择时间段(只有日期)组件
+// timeReturned 返回值{startTime: Number,endTime: Number}
+export default {
+  name: "PeriodDatePicker",
+  props: ["month", "disabled", "size", "width", "type", "placeholder", "newTime"],
+  data() {
+    return {
+      value: this.month,
+      isEdit: this.disabled,
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().valueOf();
+        },
+      },
+    };
+  },
+  watch: {
+    disabled: function (val) {
+      this.isEdit = val;
+    },
+    month: function (val) {
+      this.value = val;
+    },
+    newTime: function (val) {
+      this.timeChange();
+    },
+  },
+  mounted() {},
+  methods: {
+    timeChange() {
+      if (this.value === null) {
+        this.value = "";
+        let model = {
+          startTime: "",
+          endTime: "",
+          value: this.value,
+        };
+        this.$emit("timeReturned", model);
+      } else {
+        let end = "";
+        let time = new Date(this.value);
+        let y = time.getFullYear();
+        let M = time.getMonth() + 1;
+        let timeTemplate = y + "-" + (M < 10 ? "0" + M : M) + "-";
+        if (M + "" === "12") {
+          end = timeTemplate + "31";
+        } else {
+          let M2 = parseInt(M) + 1;
+          let ti2 = y + "-" + (M < 10 ? "0" + M2 : M2) + "-01";
+          let timestamp = new Date(ti2).valueOf() - 1000 * 60 * 60 * 24;
+          let time2 = new Date(timestamp);
+          let D = time2.getDate();
+          end = timeTemplate + (D < 10 ? "0" + D : D);
+        }
+        let model = {
+          startTime: `${this.value}-01`,
+          endTime: end,
+          value: this.value,
+        };
+        this.$emit("timeReturned", model);
+      }
+      console.log(this.value);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.date-picker.el-input {
+  // width: 150px !important;
+}
+</style>

src/views/dataReport/period-date-picker/index.js

@@ -0,0 +1,2 @@
+import Main from './main.vue'
+export default Main

src/views/dataReport/period-date-picker/main.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="fl time">
+    <el-date-picker
+      v-model="startTime"
+      style="margin: 0"
+      class="date-picker"
+      type="date"
+      :size="size"
+      :style="{ width: width }"
+      :placeholder="(placeholder||'') + '开始日期'"
+      value-format="yyyy-MM-dd"
+      :picker-options="pickerOptions1"
+      :editable="false"
+      :clearable="true"
+      :disabled="isEdit"
+      @change="timeChange"
+    />
+    <samp style="padding: 0 3px; margin: 0">至</samp>
+    <el-date-picker
+      style="margin: 0"
+      :size="size"
+      v-model="endTime"
+      class="date-picker"
+      :style="{ width: width }"
+      type="date"
+      :placeholder="(placeholder||'') + '结束日期'"
+      :disabled="isEdit"
+      :picker-options="pickerOptions2"
+      :editable="false"
+      value-format="yyyy-MM-dd"
+      :clearable="true"
+      @change="timeChange"
+    />
+  </div>
+</template>
+
+<script>
+// 选择时间段(只有日期)组件
+// timeReturned 返回值{startTime: Number,endTime: Number}
+export default {
+  name: "PeriodDatePicker",
+  props: ["start", "end", "disabled", "size", "width", "type", "placeholder"],
+  data() {
+    return {
+      startTime: this.start,
+      endTime: this.end,
+      isEdit: this.disabled,
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.endTime != null && this.endTime != "" && time) {
+            return time.getTime() > new Date(this.endTime).valueOf();
+          }
+        },
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.startTime != null && this.startTime != "" && time) {
+            return time.getTime() < new Date(this.startTime).valueOf();
+          }
+        },
+      },
+    };
+  },
+  watch: {
+    disabled: function (val) {
+      this.isEdit = val;
+    },
+    start(val) {
+      this.startTime = val;
+    },
+    end(val) {
+      this.endTime = val;
+    },
+  },
+  mounted() {},
+  methods: {
+    timeChange() {
+      if (
+        this.startTime !== "" &&
+        this.startTime !== null &&
+        this.endTime !== "" &&
+        this.endTime !== null
+      ) {
+        if (this.type + "" === "1" && !this.setType(365)) {
+          this.showMessage("时间跨度不能超过一年！");
+          return;
+        } else if (this.type + "" === "2" && !this.setType(90)) {
+          this.showMessage("时间跨度不能超过90天！");
+          return;
+        }else if (this.type + "" === "3" && !this.setType(30)) {
+          this.showMessage("时间跨度不能超过30天！");
+          return;
+        } else if (
+          new Date(this.endTime).valueOf() < new Date(this.startTime).valueOf()
+        ) {
+          this.showMessage("结束时间不大于开始时间！");
+          return;
+        } else {
+          this.timeReturned();
+        }
+      } else {
+        this.timeReturned();
+      }
+    },
+    timeReturned() {
+      let s = this.startTime == null ? "" : this.startTime;
+      let e = this.endTime == null ? "" : this.endTime;
+      let model = {
+        startTime: s == "" ? "" : this.transformTime(s),
+        endTime: e == "" ? "" : this.transformTime(e),
+      };
+
+      this.$emit("timeReturned", model);
+    },
+
+    transformTime(tTime) {
+      let time = new Date(tTime);
+      let y = time.getFullYear();
+      let M = time.getMonth() + 1;
+      let d = time.getDate();
+      return y + "-" + (M < 10 ? "0" + M : M) + "-" + (d < 10 ? "0" + d : d);
+    },
+    showMessage(message) {
+      this.$message.error(message);
+      this.startTime = "";
+      this.endTime = "";
+      this.timeReturned();
+    },
+    setType(days) {
+      let step = 24 * 3600 * 1000;
+      let sDay = new Date(this.startTime).valueOf();
+      let eDay = new Date(this.endTime).valueOf();
+      let isok = true;
+      if (eDay - sDay > step * days) {
+        isok = false;
+      }
+
+      return isok;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.date-picker.el-input {
+  // width: 150px !important;
+}
+</style>

src/views/dataReport/table1.vue

@@ -0,0 +1,333 @@
+<template>
+  <div style="padding:10px">
+    <div v-if="powers.some((i) => i == '001')">
+      <div style="width: 100%">
+          <el-row style="width: 100%;margin-top: 10px;">
+            <el-col :span="6" style="width: 443px;">
+              <periodDatePickerActive
+                :start="parmValue.start_day"
+                :end="parmValue.end_day"
+                picker-type="month"
+                :width="'205px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+          
+            <el-col :span="4" style="width: 350px">
+              <search-supplier
+                :size="'mini'"
+                :value="parmValue.supplierNo"
+                :disabled="false"
+                :placeholder="'供应商名称'"
+                :names="parmValue.supplierName"
+                :is-detail="true"
+                :no-disabled="true"
+                @searchChange="supplierChange"
+              />
+            </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>
+            <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>
+        <el-table v-loading="loading" size="mini" :data="tableData" border style="margin-top:10px">
+          <el-table-column prop="supplier_name" label="供应商名称" width="180px" show-overflow-tooltip />
+          <el-table-column prop="is_supplier" label="是否开通供应商端" width="120px" />
+          <el-table-column prop="person" label="供应商负责人" width="95px" />
+          <el-table-column prop="total_fee" label="采购订单总金额" width="110px" />
+          <el-table-column prop="total_cgd" label="采购订单总量" width="95px" />
+        
+          <el-table-column label="待与供应商确认" align="center">
+            <el-table-column label="采购订单总金额" prop="dtotal_fee" min-width="105px" />
+            <el-table-column label="采购单数量" prop="dtotal_cgd" min-width="85px" />
+          </el-table-column>
+        
+          <el-table-column label="待入库" align="center">
+            <el-table-column label="采购订单总金额" prop="wtotal_fee" min-width="105px" />
+            <el-table-column label="采购单数量" prop="wtotal_cgd" min-width="85px" />
+          </el-table-column>
+        
+          <el-table-column label="按商品类型统计订单数量" align="center">
+            <el-table-column label="备库商品" prop="tag_1" min-width="85px" />
+            <el-table-column label="非库存商品" prop="tag_2" min-width="105px" />
+            <el-table-column label="采返商品" prop="tag_zx" min-width="85px" />
+          </el-table-column>
+        
+          <el-table-column label="平台类型" align="center">
+            <el-table-column label="ToC平台" prop="tag_c" />
+            <el-table-column label="ToB平台" prop="tag_b" />
+          </el-table-column>
+        </el-table>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { table1 } from './columns'
+import { mapGetters } from 'vuex'
+import { xs_order_type_options } from '@/assets/js/statusList'
+import * as dayjs from 'dayjs'
+
+export default {
+  name: 'PurchaseOrder',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableOne") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        supplierNo: [],
+        supplier_name: '',
+        start_day: dayjs(this.getStartDate()).format('YYYY-MM-DD'), // 起始时间
+        end_day: dayjs(new Date()).format('YYYY-MM-DD') // 结束时间
+      },
+      // 表格 - 数据集合
+      tableData: [],
+      xs_order_type_options,
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格表头 - 列参数
+      table1
+    }
+  },
+  mounted() {
+    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+    async supplierChange(e) {
+      const { code, label } = e
+      this.parmValue.supplierNo = code ? [code] : []
+      this.searchList()
+    },
+    // 初始化http请求
+    async searchList() {
+      if (!this.parmValue.start_day || !this.parmValue.end_day) {
+        this.$message.warning('请选择时间区间')
+        this.tableData = []
+        return
+      }
+      if (!this.diffDays(31)) {
+        this.$message.warning('时间区间不能超过31天')
+        return
+      }
+
+      this.loading = true
+      const { code, data, message } = await asyncRequest.pom({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      })
+      if (code === 0) {
+        // const { list, count } = data;
+        this.tableData = data
+      } else if (code >= 100 && code <= 104) {
+        await this.logout()
+      } else {
+        this.tableData = []
+      }
+      this.loading = false
+    },
+    getStartDate() {
+      const myDate = new Date()
+      myDate.setDate(myDate.getDate() - 29)
+      return myDate
+    },
+    diffDays(days) {
+      const step = 24 * 3600 * 1000
+      const sDay = new Date(this.parmValue.start_day).valueOf()
+      const eDay = new Date(this.parmValue.end_day).valueOf()
+      let isok = true
+
+      if (eDay - sDay > step * days) {
+        isok = false
+      }
+
+      return isok
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        supplier_name: '',
+        supplierNo: [],
+        start_day: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),
+        end_day: dayjs().subtract(-1, 'day').format('YYYY-MM-DD'),
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      }
+
+      this.searchList()
+    },
+    // 选中触发函数
+    selection_change(e) {
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+    },
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_day = e.startTime || ''
+      this.parmValue.end_day = e.endTime || ''
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+        (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      if (!this.diffDays(31)) {
+        this.$message.warning('时间区间不能超过31天')
+        return
+      }
+
+      await this.searchList()
+    },
+    // getTimeParam() {
+    //   const { start_day: start, end_day: end } = this.parmValue;
+
+    //   if (!start || !end) {
+    //     return {
+    //       start_day: "",
+    //       end_day: ""
+    //     };
+    //   }
+
+    //   const start_date_chunks = start.split("-");
+    //   const end_date_chunks = end.split("-");
+
+    //   start_date_chunks[2] = "01";
+
+    //   const [year, month] = end_date_chunks;
+    //   const end_last_day = new Date(year, month, 0).getDate();
+    //   end_date_chunks[2] = end_last_day;
+
+    //   return {
+    //     start_day: start_date_chunks.join("-"),
+    //     end_day: end_date_chunks.join("-")
+    //   };
+    // },
+    // 导出文件
+    async download() {
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+        (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      if (!this.diffDays(31)) {
+        this.$message.warning('时间区间不能超过31天')
+        return
+      }
+
+      const model = JSON.parse(
+        JSON.stringify(this.parmValue)
+      )
+
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/pome',
+          responseType: 'blob',
+          data: {
+            ...this.parmValue,
+            supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+          },
+          headers: {
+            Accept: httpType
+          }
+        })
+          .then(res => {
+            if (res && res.status == 200 && res.data) {
+              const url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: httpType
+                })
+              )
+              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)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch(error => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.purchaseOrder {
+  // text-align: right;
+}
+</style>

src/views/dataReport/table2.vue

@@ -0,0 +1,265 @@
+<template>
+  <div style="padding:10px">
+    <div v-if="powers.some((i) => i == '001')">
+      <el-row style="margin-top:10px">
+      <el-col :span="6" style="width: 363px;">
+        <periodDatePickerActive
+          :start="parmValue.start_day"
+          :end="parmValue.end_day"
+          :width="'165px'"
+          :size="searchSize"
+          @timeReturned="time"
+        />
+      </el-col>
+
+      <el-col :span="4" style="width: 350px">
+        <search-supplier
+          :size="'mini'"
+          :value="parmValue.supplierNo"
+          :disabled="false"
+          :placeholder="'供应商名称'"
+          :names="parmValue.supplierName"
+          :is-detail="true"
+          :no-disabled="true"
+          @searchChange="supplierChange"
+        />
+      </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>
+         <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>
+
+        <el-table v-loading="loading" :data="tableData" size="mini" style="margin-top:10px">
+         <el-table-column label="供应商" align="center">
+           <el-table-column label="供应商名称" prop="supplierName" show-overflow-tooltip />
+           <el-table-column label="是否开通供应商端" width="120px" prop="is_supplier" show-overflow-tooltip />
+           <el-table-column label="负责人" min-width="90px" prop="person" show-overflow-tooltip />
+         </el-table-column>
+
+         <el-table-column label="竞价反馈" align="center">
+           <el-table-column label="反馈单数量" prop="feed_num" show-overflow-tooltip />
+           <el-table-column label="反馈总金额" prop="total_price" show-overflow-tooltip />
+           <el-table-column label="反馈商品总数量" prop="good_num" show-overflow-tooltip />
+         </el-table-column>
+
+         <el-table-column label="平台类型订单总数" align="center">
+           <el-table-column label="Toc平台" prop="toc" show-overflow-tooltip />
+           <el-table-column label="Tob平台" prop="tob" show-overflow-tooltip />
+         </el-table-column>
+        </el-table>
+    </div>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { table2 } from './columns'
+import { mapGetters } from 'vuex'
+import { utils, writeFile } from 'xlsx'
+import dayjs from 'dayjs'
+
+export default {
+  name: 'SaleReport',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableTwo") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+    // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      mapTemplateProperty: {
+        供应商名称: 'supplierName',
+        是否开通供应商端: 'is_supplier',
+        负责人: 'person',
+        反馈单数量: 'feed_num',
+        反馈总金额: 'total_price',
+        反馈商品总数量: 'good_num',
+        Toc平台: 'toc',
+        Tob平台: 'tob'
+      },
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        supplierNo: '',
+        start_day: '', // 起始时间
+        end_day: '', // 结束时间
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+
+      },
+      // 表格 - 数据集合
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table2: table2
+    }
+  },
+  mounted() {
+    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+    getDiffDay(date_1, date_2) {
+      // 计算两个日期之间的差值
+      let totalDays, diffDate
+      const myDate_1 = Date.parse(date_1)
+      const myDate_2 = Date.parse(date_2)
+      // 将两个日期都转换为毫秒格式，然后做差
+      diffDate = Math.abs(myDate_1 - myDate_2) // 取相差毫秒数的绝对值
+      totalDays = Math.floor(diffDate / (1000 * 3600 * 24)) // 向下取整
+      return totalDays // 相差的天数
+    },
+    // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      const diffDays = this.getDiffDay(this.parmValue.start_day, this.parmValue.end_day)
+      if (Math.abs(diffDays) > 31) {
+        return this.$message.warning('数据时间间隔不能超过31天')
+      }
+
+      this.loading = true
+
+      const res = await asyncRequest.fbbs({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      })
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+        this.tableData = []
+        this.pageInfo.total = 0
+      }
+      this.loading = false
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        start_day: '', // 新建起始时间
+        end_day: '', // 新建结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      }
+      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_day = e.startTime || ''
+      this.parmValue.end_day = e.endTime || ''
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
+    },
+    async supplierChange(e) {
+      const { code, label } = e
+      this.parmValue.supplierNo = code ? [code] : []
+      this.searchList()
+    },
+    // 导出文件
+    async download() {
+      const template = Object.keys(this.mapTemplateProperty)
+      const data = this.tableData.map(tableItem => template.reduce((prev, currenKey) => ({
+        ...prev,
+        [currenKey]: tableItem[this.mapTemplateProperty[currenKey]]
+      }), {}))
+
+      const workBook = utils.book_new()
+      const workSheet = utils.json_to_sheet(data)
+
+      utils.book_append_sheet(workBook, workSheet, 'sheet')
+
+      writeFile(workBook, '竞价单情况表.xlsx', {
+        bookType: 'xlsx'
+      })
+    }
+  }
+}
+</script>
+ <style lang="scss" scoped>
+.purchaseOrder {
+// text-align: right;
+}
+</style>

src/views/dataReport/table3.vue

@@ -0,0 +1,320 @@
+<template>
+  <div style="padding:10px">
+    <ex-table
+      v-if="powers.some((i) => i == '001')"
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table3"
+      :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_day"
+                :end="parmValue.end_day"
+                :placeholder="'竞价'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+
+            <el-col :span="6">
+              <search-work-company
+                :value="parmValue.companyNo"
+                :placeholder="'业务公司名称'"
+                :disabled="false"
+                :size="'mini'"
+                :no-disabled="true"
+                @searchChange="company_idsearchChange"
+              />
+            </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>
+            <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 v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { table3 } from './columns'
+import { mapGetters } from 'vuex'
+import dayjs from 'dayjs'
+
+export default {
+  name: 'SaleReport',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableThree") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+    // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        companyNo: '',
+        start_day: '', // 起始时间
+        end_day: '', // 结束时间
+        // is_export:0,//是否导出0/1
+
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+
+      },
+      // 表格 - 数据集合
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table3: table3
+    }
+  },
+  mounted() {
+    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+  // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('筛选的时间区间不能超过31天')
+          return
+        }
+      }
+
+      this.loading = true
+
+      const res = await asyncRequest.salestock(this.parmValue)
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list
+
+        console.log(this.tableData)
+        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
+      }
+      this.loading = false
+    },
+
+    company_idsearchChange(e) {
+      const { code } = e
+      this.parmValue.companyNo = code || ''
+      this.searchList()
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        companyNo: '',
+        start_day: '', // 新建起始时间
+        end_day: '', // 新建结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      }
+      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_day = e.startTime || ''
+      this.parmValue.end_day = e.endTime || ''
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      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)) : []
+    },
+    // 导出文件
+    async download() {
+    // if(this.changeList.length<=0){
+    //   this.$message.warning("请选择有效数据")
+    //   return;
+    // }
+      const model = JSON.parse(JSON.stringify(this.parmValue))
+      delete model['page']
+      delete model['size']
+      // model.is_export = 1;
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过31天')
+          return
+        }
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
+      }
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/sse',
+          responseType: 'blob',
+          data: model,
+          headers: {
+            Accept: httpType
+          }
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              const url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: httpType
+                })
+              )
+              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)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+ <style lang="scss" scoped>
+.purchaseOrder {
+// text-align: right;
+}
+</style>
+

src/views/dataReport/table4.vue

@@ -0,0 +1,370 @@
+<template>
+  <div style="padding:10px">
+    <ex-table
+       v-if="powers.some((i) => i == '001')"
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table4"
+      :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_day"
+                :end="parmValue.end_day"
+                :placeholder="'竞价'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+
+            <el-col :span="4" style="width: 350px">
+              <search-supplier
+                :size="'mini'"
+                :value="parmValue.supplierNo"
+                :disabled="false"
+                :placeholder="'供应商名称'"
+                :names="parmValue.supplierName"
+                :is-detail="true"
+                :no-disabled="true"
+                @searchChange="supplierChange"
+              />
+            </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>
+            <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>
+
+          <el-row style="margin-top:10px;margin-left:70px">
+            <el-col :span="6" style="margin-left:10px;width:350px">
+              <search-work-company
+                :value="parmValue.companyNo"
+                :placeholder="'业务公司名称'"
+                :disabled="false"
+                :size="'mini'"
+                :no-disabled="true"
+                @searchChange="company_idsearchChange"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+      <template #order_type="{scope}">
+        {{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}
+      </template>
+
+      <template #order_source="{scope}">
+        {{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}
+      </template>
+
+      <template #status="{scope}">
+        {{ statusOptions.find(({id}) => id === String(scope.row.status)).label }}
+      </template>
+
+      <template #platform_type="{scope}">
+        {{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}
+      </template>
+    </ex-table>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { xs_order_type_options, xs_order_source_options } from '@/assets/js/statusList'
+import { table4 } from './columns'
+import { mapGetters } from 'vuex'
+import dayjs from 'dayjs'
+
+export default {
+  name: 'SaleReport',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableFour") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      xs_order_type_options,
+      xs_order_source_options,
+      // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        companyNo: '',
+        supplierNo: '',
+        start_day: '', // 起始时间
+        end_day: '', // 结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+
+      },
+      statusOptions: [
+        { id: '0', label: '待公司采购' },
+        { id: '1', label: '待库管发货' },
+        { id: '2', label: '已发货待收货' },
+        { id: '3', label: '已收货' },
+        { id: '4', label: '已全部退货' }
+      ],
+      // 表格 - 数据集合
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table4: table4
+    }
+  },
+  mounted() {
+    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+    company_idsearchChange(e) {
+      const { code } = e
+      this.parmValue.companyNo = code || ''
+      this.searchList()
+    },
+    // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+        (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('筛选的时间区间不能超过31天')
+          return
+        }
+      }
+
+      this.loading = true
+
+      const res = await asyncRequest.ocl({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      })
+      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
+      }
+      this.loading = false
+    },
+
+    async supplierChange(e) {
+      const { code, label } = e
+      this.parmValue.supplierNo = code ? [code] : []
+      this.searchList()
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        companyNo: '',
+        supplierNo: '',
+        start_day: '', // 新建起始时间
+        end_day: '', // 新建结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      }
+
+      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_day = e.startTime || ''
+      this.parmValue.end_day = e.endTime || ''
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      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)) : []
+    },
+    // 导出文件
+    async download() {
+    // if(this.changeList.length<=0){
+    //   this.$message.warning("请选择有效数据")
+    //   return;
+    // }
+      const model = JSON.parse(JSON.stringify({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      }))
+      delete model['page']
+      delete model['size']
+      // model.is_export = 1;
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过31天')
+          return
+        }
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
+      }
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/oce',
+          responseType: 'blob',
+          data: model,
+          headers: {
+            Accept: httpType
+          }
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              const url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: httpType
+                })
+              )
+              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)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+ <style lang="scss" scoped>
+.purchaseOrder {
+// text-align: right;
+}
+</style>
+

src/views/dataReport/table5.vue

@@ -0,0 +1,369 @@
+<template>
+  <div style="padding:10px">
+    <ex-table
+      v-if="powers.some((i) => i == '001')"
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table5"
+      :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_day"
+                :end="parmValue.end_day"
+                :placeholder="'竞价'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+
+            <el-col :span="4" style="width: 350px">
+              <search-supplier
+                :size="'mini'"
+                :value="parmValue.supplierNo"
+                :disabled="false"
+                :placeholder="'供应商名称'"
+                :names="parmValue.supplierName"
+                :is-detail="true"
+                :no-disabled="true"
+                @searchChange="supplierChange"
+              />
+            </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>
+            <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>
+
+          <el-row style="margin-top:10px;margin-left:70px">
+            <el-col :span="6" style="margin-left:10px;width:350px">
+              <search-work-company
+                :value="parmValue.companyNo"
+                :placeholder="'业务公司名称'"
+                :disabled="false"
+                :size="'mini'"
+                :no-disabled="true"
+                @searchChange="company_idsearchChange"
+              />
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+      <template #order_type="{scope}">
+        {{ xs_order_type_options.find(({id}) => id === String(scope.row.order_type)).label }}
+      </template>
+
+      <template #order_source="{scope}">
+        {{ xs_order_source_options.find(({id}) => id === String(scope.row.order_source)).label }}
+      </template>
+
+      <template #status="{scope}">
+        {{ statusOptions.find(({value}) => value === String(scope.row.status)).label }}
+      </template>
+
+      <template #platform_type="{scope}">
+        {{ String(scope.row.platform_type) === '1' ? 'ToB' : String(scope.row.platform_type) === '2' ? 'ToC' : '--' }}
+      </template>
+    </ex-table>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { xs_order_type_options, xs_order_source_options } from '@/assets/js/statusList'
+import { table5 } from './columns'
+import { mapGetters } from 'vuex'
+import dayjs from 'dayjs'
+
+export default {
+  name: 'SaleReport',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableFive") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      xs_order_type_options,
+      xs_order_source_options,
+      // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        supplierNo: [],
+        start_day: '', // 起始时间
+        end_day: '', // 结束时间
+        // is_export:0,//是否导出0/1
+
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+
+      },
+      statusOptions: [
+        { value: '0', label: '待发货' },
+        { value: '1', label: '待发货完成' },
+        { value: '2', label: '发货已完成' },
+        { value: '3', label: '订单已取消' }
+      ],
+      // 表格 - 数据集合
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table5: table5
+    }
+  },
+  mounted() {
+    this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+    async supplierChange(e) {
+      const { code, label } = e
+      this.parmValue.supplierNo = code ? [code] : []
+      this.searchList()
+    },
+    // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('筛选的时间区间不能超过31天')
+          return
+        }
+      }
+
+      this.loading = true
+
+      const res = await asyncRequest.orderoutbk({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      })
+      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
+      }
+      this.loading = false
+    },
+
+    company_idsearchChange(e) {
+      const { code } = e
+      this.parmValue.companyNo = code || ''
+      this.searchList()
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        supplierNo: '',
+        start_day: '', // 新建起始时间
+        end_day: '', // 新建结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      }
+
+      this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_day = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_day = e.startTime || ''
+      this.parmValue.end_day = e.endTime || ''
+      if (
+        (this.parmValue.start_day !== '' && this.parmValue.end_day === '') ||
+      (this.parmValue.start_day === '' && this.parmValue.end_day !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      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)) : []
+    },
+    // 导出文件
+    async download() {
+    // if(this.changeList.length<=0){
+    //   this.$message.warning("请选择有效数据")
+    //   return;
+    // }
+      const model = JSON.parse(JSON.stringify({
+        ...this.parmValue,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo
+      }))
+
+      delete model['page']
+      delete model['size']
+      // model.is_export = 1;
+      const start_day = new Date(this.parmValue.start_day).valueOf()
+      const end_day = new Date(this.parmValue.end_day).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过31天')
+          return
+        }
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
+      }
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/OrderOutExport',
+          responseType: 'blob',
+          data: model,
+          headers: {
+            Accept: httpType
+          }
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              const url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: httpType
+                })
+              )
+              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)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+ <style lang="scss" scoped>
+.purchaseOrder {
+// text-align: right;
+}
+</style>
+

src/views/dataReport/table6.vue

@@ -0,0 +1,420 @@
+<template>
+  <div style="padding:10px">
+    <ex-table
+       v-if="powers.some((i) => i == '001')"
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table6"
+      :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="width: 100%; padding: 0 0 0 80px">
+            <el-col :span="6" style="width: 200px">
+              <el-select
+                v-model="parmValue.status"
+                :size="searchSize"
+                filterable
+                clearable
+                placeholder="订单状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="(item, index) in statusOptions"
+                  :key="item.id + index"
+                  :label="item.label"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="6" style="width: 200px; padding: 0 0 0 10px">
+              <el-select
+                v-model="parmValue.order_type"
+                :size="searchSize"
+                filterable
+                clearable
+                placeholder="商品类型"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="(item, index) in xs_order_type_options"
+                  :key="item.id + index"
+                  :label="item.label"
+                  :value="item.id"
+                />
+              </el-select>
+            </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>
+          </el-row>
+          <el-row style="padding: 10px 0 0 0" gutter="10">
+            <el-col :span="6" style="width: 442px">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'下单'"
+                :width="'205px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </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>
+
+          <!--<el-col :span="6" style="width: 240px">
+              <el-input
+                clearable
+                placeholder="采购维护人"
+                v-model="parmValue.creater"
+                maxlength="40"
+                :size="searchSize"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+              </el-input>
+            </el-col>
+            <el-col :span="6" style="width: 240px">
+              <el-input
+                clearable
+                placeholder="供应商名称"
+                v-model="parmValue.supplier_name"
+                maxlength="40"
+                :size="searchSize"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+              </el-input>
+            </el-col>
+
+          </el-row> -->
+        </div>
+      </template>
+      <template #order_type="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          v-text="
+            (xs_order_type_options.find((item) => item.id == scope.row.order_type) || {})
+              .label || '--'
+          "
+        />
+      </template>
+      <template #status="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+          "
+        />
+      </template>
+    </ex-table>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </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/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { table6 } from './columns'
+import { mapGetters } from 'vuex'
+import { xs_order_type_options } from '@/assets/js/statusList'
+import dayjs from 'dayjs'
+export default {
+  name: 'PurchaseOrder',
+  components: { periodDatePickerActive },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "reportTableSix") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      statusOptions: [
+        { id: '0', label: '待发货' },
+        { id: '1', label: '待发货完成' },
+        { id: '2', label: '发货已完成' },
+        { id: '3', label: '订单已取消' }
+      ],
+      // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        supplier_name: '', // 要搜索的供应商名称
+        creater: '', // 要搜索的采购维护人
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
+        order_type: '',
+        status: '',
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      // 表格 - 数据集合
+      tableData: [],
+      xs_order_type_options,
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table6
+    }
+  },
+  mounted() {
+    this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+    this.parmValue.end_date = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+    this.searchList()
+  },
+
+  methods: {
+    // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+
+      const start_day = new Date(this.parmValue.start_date).valueOf()
+      const end_day = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('筛选的时间区间不能超过31天')
+          return
+        }
+      }
+
+      // return;
+      this.loading = true
+
+      const { code, data, message } = await asyncRequest.sna(this.parmValue)
+      if (code === 0) {
+        const { list, count } = data
+        this.tableData = list
+        this.pageInfo.total = Number(count)
+      } else if (code >= 100 && code <= 104) {
+        await this.logout()
+      } else {
+        this.tableData = []
+        this.pageInfo.total = 0
+      }
+      this.loading = false
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        supplier_name: '', // 要搜索的供应商名称
+        creater: '', // 要搜索的采购维护人
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        order_type: ''
+      }
+
+      this.parmValue.start_date = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
+      this.parmValue.end_date = dayjs().subtract(-1, 'day').format('YYYY-MM-DD')
+
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      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.$message.warning('时间区间不完整！')
+        return
+      }
+      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)) : []
+    },
+    // 导出文件
+    async download() {
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+
+      const start_day = new Date(this.parmValue.start_date).valueOf()
+      const end_day = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_day - start_day > 31 * 24 * 60 * 60 * 1000
+
+      if (this.parmValue.start_day != '' && this.parmValue.end_day != '') {
+        if (flag) {
+          this.$message.warning('筛选的时间区间不能超过31天')
+          return
+        }
+      }
+
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const 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;
+        // }
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
+      }
+      const model = JSON.parse(JSON.stringify(this.parmValue))
+      // model.is_export = 1;
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/snae',
+          responseType: 'blob',
+          data: model,
+          headers: {
+            // 'Content-Type': 'multipart/form-data',
+            // Accept: "application/vnd.ms-excel"
+            Accept: httpType
+          }
+        })
+          .then((res) => {
+            // console.log(res)
+            // console.log(this.fileUrl)
+            // return;
+            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
+                })
+              )
+              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)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.purchaseOrder {
+  // text-align: right;
+}
+</style>

src/views/purchaseIn/deliveryWorkOrder/index.vue

@@ -50,7 +50,7 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="3" style="width: 240px; padding: 0 0 0 10px">
+              <el-col :span="3" style="width: 200px; padding: 0 0 0 10px;margin-right:10px">
                 <search-customer
                   :value="parmValue.customer_code"
                   :size="'mini'"
@@ -63,6 +63,15 @@
                 />
               </el-col>
 
+              <el-col :span="4">
+                <el-input style="width:100%" clearable size="mini" placeholder="商品名称" v-model="parmValue.good_name"  
+                @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  " />
+              </el-col>
+
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
@@ -143,10 +152,10 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
+              <el-col :span="5" style="padding: 0 0 0 10px">
                 <search-supplier
                   :size="'mini'"
-                  style="width: 100%"
+                  style="width: 104%"
                   :value="parmValue.supplierNo"
                   :names="parmValue.supplierName"
                   :disabled="false"
@@ -393,6 +402,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        good_name:'',
         IsByMe:"1",
         supplierName:"",
         supplierNo:"",
@@ -564,6 +574,7 @@ export default {
       this.s_input = ""; //清除输入框内容
       this.select = "outChildCode"; //清除下拉框选中项
       this.parmValue = {
+        good_name:'',
         IsByMe:"1",
         order_type: "",
         company_name: "", //申请人部门

src/views/reportQuery/newReport/index.vue

@@ -33,10 +33,10 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 //标签页组件引入
-const table1 = () => import("./components/table1");
-const table2 = () => import("./components/table2");
-const table3 = () => import("./components/table3");
-const table4 = () => import("./components/table4");
+const table1 = () => import("./components/table1.vue");
+const table2 = () => import("./components/table2.vue");
+const table3 = () => import("./components/table3.vue");
+const table4 = () => import("./components/table4.vue");
 const table5 = () => import("./components/table5.vue");
 const table6 = () => import("./components/table6.vue");
 export default {

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

@@ -50,9 +50,9 @@
               <el-button
                 type="primary"
                 style="margin-left: 30px"
-                @click="download"
                 :size="searchSize"
                 class="fr"
+                @click="download"
               >
                 导出
               </el-button>
@@ -71,9 +71,9 @@
           <el-row style="padding: 10px 0 0 0">
             <el-col :span="6" style="width: 240px; margin-right: 10px">
               <el-input
+                v-model="parmValue.zxNo"
                 clearable
                 placeholder="竞价订单号"
-                v-model="parmValue.zxNo"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -81,15 +81,14 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </el-col>
 
             <el-col :span="6" style="width: 240px; margin-right: 10px">
               <el-input
+                v-model="parmValue.supplier"
                 clearable
                 placeholder="供应商"
-                v-model="parmValue.supplier"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -97,15 +96,14 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </el-col>
 
             <el-col :span="6" style="width: 240px">
               <el-input
+                v-model="parmValue.creater"
                 clearable
                 placeholder="采购员"
-                v-model="parmValue.creater"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -113,8 +111,7 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </el-col>
 
             <el-col :span="4" style="width: 66px; float: right">
@@ -123,48 +120,78 @@
               </el-button>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="6" style="width: 240px; margin-top: 10px;margin-right:10px">
+              <el-input
+                v-model="parmValue.good_name"
+                :size="searchSize"
+                placeholder="商品名称"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              />
+            </el-col>
+
+            <el-col :span="6" style="width: 240px; margin-top: 10px">
+              <el-input
+                v-model="parmValue.apply_name"
+                :size="searchSize"
+                placeholder="业务员"
+                @blur="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              />
+            </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/purchaseReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table5 } from "./columns";
-import { mapGetters } from "vuex";
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import periodDatePickerActive from '../period-date-picker/main.vue'
+import { table5 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  name: 'PurchaseOrder',
   components: {
-    periodDatePickerActive,
+    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: {
-        zxNo: "", //竞价订单号
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
-        cbaddtime_start_date: "", //采购回复起始时间
-        cbaddtime_end_date: "", //采购回复结束时间,
-        supplier: "", //供应商名称
-        creater: "", //采购员
+        apply_name: '',
+        good_name: '',
+        zxNo: '', // 竞价订单号
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
+        cbaddtime_start_date: '', // 采购回复起始时间
+        cbaddtime_end_date: '', // 采购回复结束时间,
+        supplier: '', // 供应商名称
+        creater: '', // 采购员
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
         // is_export:0//是否导出0/1
       },
       // 表格 - 数据集合
@@ -173,103 +200,105 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table5: table5,
-    };
+      table5: table5
+    }
   },
   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;
+      this.loading = true
 
-      const res = await asyncRequest.reportconsultinfobidssum(this.parmValue);
+      const res = await asyncRequest.reportconsultinfobidssum(this.parmValue)
       if (res && res.code === 0 && res.data) {
-        console.log(res);
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
+        console.log(res)
+        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.tableData = [];
-        this.pageInfo.total = 0;
-        this.$message.warning(res.message);
+        this.tableData = []
+        this.pageInfo.total = 0
+        this.$message.warning(res.message)
       }
-      this.loading = false;
+      this.loading = false
     },
 
-    //重置
+    // 重置
     restSearch() {
       this.parmValue = {
-        zxNo: "", //竞价订单号
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
+        zxNo: '', // 竞价订单号
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
+        apply_name: '',
+        good_name: ''
         // is_export:0//是否导出0/1
-      };
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
 
     // 时间函数
     async time(e, isPurchase = false) {
-      const startProp = isPurchase ? "cbaddtime_start_date" : "start_date";
-      const endProp = isPurchase ? "cbaddtime_end_date" : "end_date";
+      const startProp = isPurchase ? 'cbaddtime_start_date' : 'start_date'
+      const endProp = isPurchase ? 'cbaddtime_end_date' : 'end_date'
 
-      const baseName = isPurchase ? "采购回复" : "竞价";
+      const baseName = isPurchase ? '采购回复' : '竞价'
 
-      this.parmValue[startProp] = e.startTime || "";
-      this.parmValue[endProp] = e.endTime || "";
+      this.parmValue[startProp] = e.startTime || ''
+      this.parmValue[endProp] = e.endTime || ''
 
       if (
-        (this.parmValue[startProp] !== "" && this.parmValue[endProp] === "") ||
-        (this.parmValue[startProp] === "" && this.parmValue[endProp] !== "")
+        (this.parmValue[startProp] !== '' && this.parmValue[endProp] === '') ||
+        (this.parmValue[startProp] === '' && this.parmValue[endProp] !== '')
       ) {
-        this.$message.warning(`${baseName} 时间区间不完整！`);
-        return;
+        this.$message.warning(`${baseName} 时间区间不完整！`)
+        return
       }
 
       // 表格 - 分页
       // this.$set(this.pageInfo)
       // this.$set(this.pageInfo, 'curr', '2');
-      this.pageInfo.curr = 1;
+      this.pageInfo.curr = 1
       // console.log(this.pageInfo.curr)
-      this.parmValue.page = 1;
-      await this.searchList();
+      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() {
       // model.is_export = 1;
       if (!this.loading) {
@@ -277,94 +306,94 @@ export default {
           start_date,
           end_date,
           cbaddtime_start_date,
-          cbaddtime_end_date,
-        } = this.parmValue;
+          cbaddtime_end_date
+        } = this.parmValue
         if (
-          start_date == "" &&
-          end_date == "" &&
-          cbaddtime_start_date == "" &&
-          cbaddtime_end_date == ""
+          start_date == '' &&
+          end_date == '' &&
+          cbaddtime_start_date == '' &&
+          cbaddtime_end_date == ''
         ) {
-          this.$message.warning("请选择时间区间！");
-          return;
+          this.$message.warning('请选择时间区间！')
+          return
         }
         if (
-          (start_date == "" && end_date != "") ||
-          (start_date != "" && end_date == "") ||
-          (cbaddtime_start_date == "" && cbaddtime_end_date != "") ||
-          (cbaddtime_start_date != "" && cbaddtime_end_date == "")
+          (start_date == '' && end_date != '') ||
+          (start_date != '' && end_date == '') ||
+          (cbaddtime_start_date == '' && cbaddtime_end_date != '') ||
+          (cbaddtime_start_date != '' && cbaddtime_end_date == '')
         ) {
-          this.$message.warning("时间区间不完成！");
-          return;
+          this.$message.warning('时间区间不完成！')
+          return
         }
-        const num = 30 * 24 * 60 * 60 * 1000;
-        if (start_date != "" && end_date != "") {
+        const num = 30 * 24 * 60 * 60 * 1000
+        if (start_date != '' && end_date != '') {
           if (new Date(end_date).valueOf() - new Date(start_date).valueOf() > num) {
-            this.$message.warning("竞价时间区间不能超过30天");
-            return;
+            this.$message.warning('竞价时间区间不能超过30天')
+            return
           }
         }
-        if (cbaddtime_start_date != "" && cbaddtime_end_date != "") {
+        if (cbaddtime_start_date != '' && cbaddtime_end_date != '') {
           if (
             new Date(cbaddtime_end_date).valueOf() -
               new Date(cbaddtime_start_date).valueOf() >
             num
           ) {
-            this.$message.warning("回复时间区间不能超过30天");
-            return;
+            this.$message.warning('回复时间区间不能超过30天')
+            return
           }
         }
-        const model = JSON.parse(JSON.stringify(this.parmValue));
-        this.loading = true;
-        let httpType = `aplication/zip`;
+        const model = JSON.parse(JSON.stringify(this.parmValue))
+        this.loading = true
+        const httpType = `aplication/zip`
         axios({
-          method: "post",
-          url: this.fileUrl + "admin/reportconsultinfobidssumexport",
-          responseType: "blob",
+          method: 'post',
+          url: this.fileUrl + 'admin/reportconsultinfobidssumexport',
+          responseType: 'blob',
           data: model,
           headers: {
             // 'Content-Type': 'multipart/form-data',
             // Accept: "application/vnd.ms-excel"
-            Accept: httpType,
-          },
+            Accept: httpType
+          }
         })
           .then((res) => {
-            const { status, data } = res;
+            const { status, data } = res
             if (status && data) {
-              let url = window.URL.createObjectURL(
+              const url = window.URL.createObjectURL(
                 new Blob([data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
+                  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 {

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

@@ -39,9 +39,9 @@
             </el-col>
             <el-col :span="6" style="width: 240px">
               <el-input
+                v-model="parmValue.companyName"
                 clearable
                 placeholder="客户名称"
-                v-model="parmValue.companyName"
                 maxlength="40"
                 :size="searchSize"
                 @blur="
@@ -49,16 +49,15 @@
                   parmValue.page = 1;
                   searchList();
                 "
-              >
-              </el-input>
+              />
             </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"
+                @click="download"
               >
                 导出
               </el-button>
@@ -101,41 +100,41 @@
   </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/purchaseReport";
-import periodDatePickerActive from "../period-date-picker/main.vue";
-import { table6 } from "./columns";
-import { mapGetters } from "vuex";
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/purchaseReport'
+import periodDatePickerActive from '../period-date-picker/main.vue'
+import { table6 } from './columns'
+import { mapGetters } from 'vuex'
 
 export default {
-  name: "purchaseOrder",
-  mixins: [mixinPage, resToken],
+  name: 'PurchaseOrder',
   components: {
-    periodDatePickerActive,
+    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: {
-        companyName: "", //客户名称
-        start_date: "", //起始时间
-        end_date: "", // 结束时间
-        start_updatetime: "",
-        end_updatetime: "",
+        companyName: '', // 客户名称
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
+        start_updatetime: '',
+        end_updatetime: '',
         // is_export:0,//是否导出0/1
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
       // 表格 - 数据集合
       tableData: [],
@@ -143,178 +142,178 @@ export default {
       table: {
         stripe: true,
         border: true,
-        _defaultHeader_: ["setcol"],
+        _defaultHeader_: ['setcol']
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格表头 - 列参数
-      table6: table6,
-    };
+      table6: table6
+    }
   },
   mounted() {
     // alert("未采反信息：接口暂无数据，以此提示")
-    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;
+      this.loading = true
 
-      const res = await asyncRequest.reportconsultinfobidssumnot(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);
+        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.$message.warning(res.message)
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
 
-    //重置
+    // 重置
     restSearch() {
       this.parmValue = {
-        companyName: "", //客户名称
-        start_date: "", //新建起始时间
-        end_date: "", // 新建结束时间
+        companyName: '', // 客户名称
+        start_date: '', // 新建起始时间
+        end_date: '', // 新建结束时间
         page: 1, // 页码
         size: 15, // 每页显示条数
-        start_updatetime: "", //更新起始时间
-        end_updatetime: "", //更新结束时间
+        start_updatetime: '', // 更新起始时间
+        end_updatetime: '' // 更新结束时间
         // is_export:0//是否导出0/1
-      };
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      console.log(this.parmValue);
-      this.searchList();
+        total: 0
+      }
+      console.log(this.parmValue)
+      this.searchList()
     },
 
     // 时间函数
     async time(e, isUpdate) {
-      const startProp = isUpdate ? "start_updatetime" : "start_date";
-      const endProp = isUpdate ? "end_updatetime" : "end_date";
+      const startProp = isUpdate ? 'start_updatetime' : 'start_date'
+      const endProp = isUpdate ? 'end_updatetime' : 'end_date'
 
-      this.parmValue[startProp] = e.startTime || "";
-      this.parmValue[endProp] = e.endTime || "";
+      this.parmValue[startProp] = e.startTime || ''
+      this.parmValue[endProp] = e.endTime || ''
       if (
-        (this.parmValue[startProp] !== "" && this.parmValue[endProp] === "") ||
-        (this.parmValue[startProp] === "" && this.parmValue[endProp] !== "")
+        (this.parmValue[startProp] !== '' && this.parmValue[endProp] === '') ||
+        (this.parmValue[startProp] === '' && this.parmValue[endProp] !== '')
       ) {
-        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 start_updatetime = new Date(this.parmValue.start_updatetime).valueOf();
-      let end_updatetime = new Date(this.parmValue.end_updatetime).valueOf();
-      const delay = 30 * 24 * 60 * 60 * 1000;
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const start_updatetime = new Date(this.parmValue.start_updatetime).valueOf()
+      const end_updatetime = new Date(this.parmValue.end_updatetime).valueOf()
+      const delay = 30 * 24 * 60 * 60 * 1000
       const flag =
-        end_date - start_date > delay || end_updatetime - start_updatetime > delay;
+        end_date - start_date > delay || end_updatetime - start_updatetime > delay
 
       if (
-        (this.parmValue.start_date !== "" && this.parmValue.end_date !== "") ||
-        (this.parmValue.start_updatetime !== "" && this.parmValue.end_updatetime !== "")
+        (this.parmValue.start_date !== '' && this.parmValue.end_date !== '') ||
+        (this.parmValue.start_updatetime !== '' && this.parmValue.end_updatetime !== '')
       ) {
         if (flag) {
-          this.$message.warning("导出文件的时间区间不能超过30天");
-          return;
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
         }
       } else {
-        this.$message.warning("请选择导出文件的时间区间");
-        return;
+        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/reportconsultinfobidssumnotexport",
-          responseType: "blob",
+          method: 'post',
+          url: this.fileUrl + 'admin/reportconsultinfobidssumnotexport',
+          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(
+              const url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType,
+                  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 {

src/views/sellOut/filing/cpns/baseDetail.vue

@@ -267,16 +267,19 @@ export default {
     },
     async initData() {
       this.loading = true
+
       const { code, message, data } = await asyncRequest.detail({
         id: this.queryId
       })
 
+      // return
       this.eaxmList = []
       this.loading = false
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data))
         const { cat_info } = this.sitem
         let cat = ''
+
         if (cat_info && cat_info.length > 0) {
           cat_info.forEach((e, i) => {
             cat += i === 0 ? e.name : '_' + e.name
@@ -287,7 +290,7 @@ export default {
         this.status = status
 
         this.$emit('change-detail', data)
-        this.$emit('change-status', status)
+        // this.$emit('change-status', status)
         this.$emit('change-num', num)
         this.$emit('change-order-code', orderCode)
         this.getNewTime()

src/views/sellOut/filing/cpns/exam-form.vue

@@ -22,7 +22,7 @@
         /></el-form-item>
       </el-col>
       <el-col :span="12"
-        ><el-form-item label="服务费" prop="service_charge">
+        ><el-form-item label="服务费" prop="service_charge" style="padding-bottom:1px">
           <digital-input
             :values="ruleForm.service_charge"
             :placeholder="'服务费'"
@@ -53,7 +53,7 @@
       </el-col>
 
       <el-col :span="12"
-        ><el-form-item label="服务费比例" prop="service_proportion">
+        ><el-form-item label="服务费比例" prop="service_proportion" style="padding-bottom:1px">
           <digital-input
             :values="ruleForm.service_proportion"
             :placeholder="'服务费比例'"
@@ -196,15 +196,12 @@ export default {
             platform_name,
           } = this.sitem;
 
-
-          console.log(this.sitem)
-
-          
           this.cgd_charge = cgd_charge;
           this.price = price;
           const service = status + "" === "0" ? expect_service : service_charge;
           const proportion =
             status + "" === "0" ? expect_service_proportion : service_proportion;
+
           this.is_determine_price = is_determine_price;
           this.ruleForm = {
             id: id,
@@ -225,21 +222,21 @@ export default {
       const { code, label } = e;
       this.ruleForm.companyCode = code ? [code] : [];
       this.ruleForm.companyName = label ? label : "";
-      this.$refs.ruleForm.validateField("companyCode");
+       this.$refs.ruleForm && this.$refs.ruleForm.validateField("companyCode");
     },
     platform_codesearchChange(e) {
-      console.log(e);
       const { id, label } = e;
       this.ruleForm.platform_id = id;
       this.ruleForm.platform_name = label ? label : "";
-      this.$refs.ruleForm.validateField("platform_id");
+       this.$refs.ruleForm && this.$refs.ruleForm.validateField("platform_id");
     },
     async number_change(e, key) {
+      console.log(e,key)
       if(Number(this.ruleForm[key]) === e) {
         return
       }     
       this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField(key);
       await this.num(key);
     },
     async num(key) {
@@ -253,12 +250,14 @@ export default {
       } else {
         cgdAdd = this.cgd_charge * 1;
       }
+
       if (key === "service_charge") {
         serAdd = this.ruleForm.service_charge ?? "0" * 1;
       }
       if (key === "service_proportion") {
         rate = this.ruleForm.service_proportion ?? "0" * 1;
       }
+      
       if (is_sale && key === "service_charge") {
         if (qrdAdd <= serAdd) {
           this.$message.error("服务费不能大于等于销售单价！");
@@ -271,6 +270,7 @@ export default {
         rate = accMul(accSub(1, accDiv(cgdAdd, qrdAdd)), 100);
         await this.set_number_change("service_proportion", rate);
       }
+
       if (is_sale && key === "service_proportion") {
         if (rate === 100) {
           this.$message.error("服务费比例不能等于100！");
@@ -289,6 +289,7 @@ export default {
         await this.set_number_change("service_proportion", rate);
       }
 
+      return
       if (!is_sale && key === "service_proportion") {
         if (rate === 100) {
           this.$message.error("服务费比例不能等于100！");
@@ -304,7 +305,7 @@ export default {
     },
     async set_number_change(key, value) {
       this.ruleForm[key] = value + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+       this.$refs.ruleForm && this.$refs.ruleForm.validateField(key);
     },
     async submitForm() {
       console.log(this.ruleForm)

src/views/sellOut/filing/detail.vue

@@ -7,27 +7,24 @@
             <base-form :id="id" :type="type" />
           </el-collapse-item>
 
-          <template v-else>
-            <base-detail
-              ref="baseForm"
+          <base-detail
+            v-else
+            ref="baseForm"
+            :sitem="sitem"
+            @change-status="handleChangeStatus"
+            @change-num="handleChangeNum"
+            @change-order-code="handleChangeOrderCode"
+            @change-detail="(det) => {sitem = det;status = det.status}"
+          />
+
+          <el-collapse-item v-if="(status == '0' || status == '2') && !isSupertube" title="审批" name="2">
+            <exam-forms
+              v-if="newTime !== ''"
+              :new-time="newTime"
               :sitem="sitem"
-              @change-status="handleChangeStatus"
-              @change-num="handleChangeNum"
-              @change-order-code="handleChangeOrderCode"
-              @change-detail="(det) => (sitem = det)"
+              @searchChange="examFormSubmit($event, '')"
             />
-          </template>
-
-          <template v-if="(status == '0' || status == '2') && !isSupertube">
-            <el-collapse-item title="审批" name="2">
-              <exam-forms
-                v-if="newTime !== ''"
-                :new-time="newTime"
-                :sitem="sitem"
-                @searchChange="examFormSubmit($event, '')"
-              />
-            </el-collapse-item>
-          </template>
+          </el-collapse-item>
 
           <!-- <tempalte v-if="status === '2'">
             <el-collapse-item name="3" title="待转单">
@@ -35,11 +32,9 @@
             </el-collapse-item>
           </tempalte> -->
 
-          <template v-if="status === '3'">
-            <el-collapse-item name="4" title="发货单">
-              <shipment-request :order-code="orderCode" />
-            </el-collapse-item>
-          </template>
+          <el-collapse-item v-if="status === '3'" name="4" title="发货单">
+            <shipment-request :order-code="orderCode" />
+          </el-collapse-item>
         </el-collapse>
       </el-tab-pane>
     </el-tabs>
@@ -48,12 +43,12 @@
 
 <script>
 // import WaitTransferred from './cpns/wait-transferred.vue'
-import ShipmentRequest from "./cpns/shipment-request.vue";
-import baseDetail from "./cpns/baseDetail.vue";
-import BaseForm from "./cpns/baseForm.vue";
-import ExamForms from "./cpns/exam-form.vue";
-import asyncRequest from "@/apis/service/sellOut/filing";
-import { mapGetters } from "vuex";
+import ShipmentRequest from './cpns/shipment-request.vue'
+import baseDetail from './cpns/baseDetail.vue'
+import BaseForm from './cpns/baseForm.vue'
+import ExamForms from './cpns/exam-form.vue'
+import asyncRequest from '@/apis/service/sellOut/filing'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
@@ -61,64 +56,64 @@ export default {
     ExamForms,
     baseDetail,
     // WaitTransferred,
-    ShipmentRequest,
+    ShipmentRequest
   },
   data() {
     return {
       loading: false,
-      activeTabs: "1",
-      collapses: ["1", "2", "3", "4"],
-      status: "",
+      activeTabs: '1',
+      collapses: ['1', '2', '3', '4'],
+      status: '',
       sitem: {},
-      orderCode: "",
-      num: "0",
-    };
+      orderCode: '',
+      num: '0'
+    }
   },
   computed: {
-    ...mapGetters(["isSupertube"]),
+    ...mapGetters(['isSupertube']),
     title() {
-      return this.id && this.id !== "add" ? "报备单详情" : "新建报备单";
+      return this.id && this.id !== 'add' ? '报备单详情' : '新建报备单'
     },
     type() {
-      return this.id && this.id !== "add" ? "view" : "add";
+      return this.id && this.id !== 'add' ? 'view' : 'add'
     },
     id() {
-      return this.$route.query.id;
+      return this.$route.query.id
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
-    },
+      this.newTime = new Date().valueOf()
+    }
   },
   methods: {
     async examFormSubmit({ companyCode, ...rest } = {}) {
-      const { id } = this.$route.query;
-      this.loading = true;
+      const { id } = this.$route.query
+      this.loading = true
       await asyncRequest.status({
         ...rest,
         id,
-        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode,
-      });
-      await this.$refs.baseForm.initData();
-      this.loading = false;
-      console.log(this.loading);
+        companyCode: Array.isArray(companyCode) ? companyCode[0] : companyCode
+      })
+      await this.$refs.baseForm.initData()
+      this.loading = false
+      console.log(this.loading)
       // this.handleRefresh()
     },
     handleChangeStatus(status) {
-      this.status = status;
+      this.status = status
     },
     handleChangeOrderCode(orderCode) {
-      this.orderCode = orderCode;
+      this.orderCode = orderCode
     },
     async handleRefresh() {
-      this.loading = true;
-      this.$refs.baseForm.initData();
-      this.loading = false;
+      this.loading = true
+      this.$refs.baseForm.initData()
+      this.loading = false
     },
     handleChangeNum(num) {
-      this.num = num;
-    },
-  },
-};
+      this.num = num
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sellOut/zixunOrder/columns.js

@@ -660,7 +660,7 @@ const options = [
   { id: '3', label: '待业务下单' },
   // { id: "4", label: "已选商品待下单" },
   { id: '5', label: '已成功转单' },
-  { id: '6', label: '已取消转单' },
+  { id: '6', label: '超时已关闭' },
   { id: '7', label: '招标已暂停' }
 ]
 export { listCol, rules, edutRules, feedbackListCol, options }

src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/index.vue

@@ -50,7 +50,7 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="3" style="width: 240px; padding: 0 0 0 10px">
+              <el-col :span="3" style="width: 200px; padding: 0 0 0 10px;margin-right:10px">
                 <search-customer
                   :value="parmValue.customer_code"
                   :size="'mini'"
@@ -63,6 +63,15 @@
                 />
               </el-col>
 
+              <el-col :span="4">
+                <el-input style="140px" clearable size="mini" placeholder="商品名称" v-model="parmValue.good_name"  
+                @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  " />
+              </el-col>
+
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
@@ -143,7 +152,7 @@
                 </el-select>
               </el-col>
 
-              <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
+              <el-col :span="5" style="padding: 0 0 0 10px">
                 <search-work-company
                   :value="parmValue.companyNo"
                   :placeholder="'业务公司'"
@@ -214,7 +223,7 @@
               </el-col>
 
               <el-col :span="5">
-                <el-select size="mini" style="width:104%;margin-left: 10px;" placeholder=""  v-model="parmValue.IsByMe" @change="
+                <el-select size="mini" style="width:102%;margin-left: 10px;" placeholder=""  v-model="parmValue.IsByMe" @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
                       searchList();
@@ -388,6 +397,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        good_name:"",
         IsByMe:"1",
         status: "",
         companyNo: "",
@@ -554,6 +564,7 @@ export default {
       this.select = "outChildCode"; //清除下拉框选中项
 
       this.parmValue = {
+        good_name:'',
         IsByMe:"1",
         order_type: "",
         company_name: "", //申请人部门

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -50,7 +50,7 @@
                   @timeReturned="handleTime"
                 />
               </el-col>
-              <el-col :span="3" style="width: 240px; padding: 0 0 0 10px">
+              <el-col :span="3" style="width: 200px; padding: 0 0 0 10px">
                 <search-customer
                   :value="parmValue.customer_code"
                   :size="'mini'"
@@ -63,6 +63,15 @@
                 />
               </el-col>
 
+              <el-col :span="4">
+                <el-input style="140px" clearable size="mini" placeholder="商品名称" v-model="parmValue.good_name"  
+                @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  " />
+              </el-col>
+
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
@@ -388,6 +397,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        good_name:'',
         IsByMe:"1",
         status: "",
         companyNo: "",
@@ -553,6 +563,7 @@ export default {
       this.select = "outChildCode"; //清除下拉框选中项
 
       this.parmValue = {
+        good_name:'',
         IsByMe:"1",
         order_type: "",
         company_name: "", //申请人部门