build

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/config/env.development.js

@@ -3,7 +3,7 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stock.api.caixiao365.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
   webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
@@ -23,7 +23,7 @@ module.exports = {
   // 结算平台url
   settlementPlatformUrl: 'http://fin.caixiao365.com/',
   // 工单管理系统url
-  GDUrl: 'http://localhost:8080/',
+  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

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/table6.vue

@@ -178,6 +178,7 @@ 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 },
@@ -236,6 +237,8 @@ export default {
     }
   },
   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()
   },
 
@@ -249,6 +252,18 @@ export default {
         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
 
@@ -277,6 +292,10 @@ export default {
         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,
@@ -314,6 +333,18 @@ export default {
       //   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;

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/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/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: "", //申请人部门