Home Explore Help
Register Sign In
xiaodai2022
/
order-ui-pc
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

build

snow 1 year ago
parent
4a2e24b18d
commit
6dd8c729e8
48 changed files with 119 additions and 676 deletions
Split View Show Diff Stats
  1. BIN
      dist/favicon.ico
  2. 0 63
      dist/index.html
  3. BIN
      dist/static/C端订单导入模板.xlsx
  4. 0 1
      dist/static/axios@0.21.0.min.js
  5. 0 0
      dist/static/dingtalk.open.2.10.3.js
  6. BIN
      dist/static/fonts/element-icons.535877f5.woff
  7. BIN
      dist/static/fonts/element-icons.732389de.ttf
  8. BIN
      dist/static/img/1.41566374.jpeg
  9. BIN
      dist/static/img/401.089007e7.gif
  10. BIN
      dist/static/img/404.a57b6f31.png
  11. BIN
      dist/static/img/404_cloud.0f4bc32b.png
  12. BIN
      dist/static/img/afterSale.c4b8f35d.jpg
  13. BIN
      dist/static/img/avatar.ecba1844.gif
  14. BIN
      dist/static/img/beforeSale.db214ded.jpg
  15. BIN
      dist/static/img/bg-pad.5b4eedcf.jpg
  16. BIN
      dist/static/img/bg-pc.3f2bd743.jpg
  17. BIN
      dist/static/img/bg-phone.e07669d9.jpg
  18. BIN
      dist/static/img/developing.750f7ed1.jpg
  19. BIN
      dist/static/img/loading.190c78aa.gif
  20. BIN
      dist/static/img/loginbg.51c61d67.png
  21. BIN
      dist/static/img/logo.66bee2dc.gif
  22. BIN
      dist/static/img/pageBg.f9f9dcd5.png
  23. BIN
      dist/static/img/search-not.29ce7ea9.png
  24. BIN
      dist/static/img/welcome2.faeb0a63.jpg
  25. 0 10
      dist/static/js/0.js
  26. 0 57
      dist/static/js/1.js
  27. 0 10
      dist/static/js/app.js
  28. 0 20
      dist/static/js/chunk-elementUI.js
  29. 0 160
      dist/static/js/chunk-libs.js
  30. 0 223
      dist/static/js/runtime.js
  31. BIN
      dist/static/loading.gif
  32. 0 0
      dist/static/reset.min.css
  33. 0 10
      dist/static/vue-router.min.js
  34. 0 5
      dist/static/vue.min.js
  35. BIN
      dist/static/收货地址模板.xlsx
  36. 13 9
      src/components/globalComponents/search-supplier/main.vue
  37. 1 1
      src/views/sellOut/bargainList/index.vue
  38. 1 1
      src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue
  39. 12 8
      src/views/sellOut/beforeReturnGoodWorkOrder/index.vue
  40. 14 9
      src/views/sellOut/deliveryWorkOrder/index.vue
  41. 8 4
      src/views/sellOut/returnGoodWorkOrder/index.vue
  42. 1 26
      src/views/sellOut/salesOrder/index.vue
  43. 18 13
      src/views/sellOut/sellAfterApply/index.vue
  44. 0 7
      src/views/sellOut/sellOutOrder/detail.vue
  45. 18 17
      src/views/sellOut/sellOutOrder/index.vue
  46. 14 11
      src/views/sellOut/sellReturn/index.vue
  47. 3 0
      src/views/sellOut/stockApply/index.vue
  48. 16 11
      src/views/sellOut/zxDiffOrder/index.vue

BIN
dist/favicon.ico
View File


+ 0 - 63
dist/index.html
View File 

@@ -1,63 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-
 
-<head>
 
-  <meta charset="utf-8">
 
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-  <meta name="renderer" content="webkit">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-  <!--钉钉监控-->
 
-  <meta name="wpk-bid" content="dta_1_1184953963">
 
-  <script>
 
-    !(function (c, i, e, b) {
 
-      var h = i.createElement("script");
 
-      var f = i.getElementsByTagName("script")[0];
 
-      h.type = "text/javascript";
 
-      h.crossorigin = true;
 
-      h.onload = function () {
 
-        c[b] || (c[b] = new c.wpkReporter({ bid: "dta_1_1184953963" }));
 
-        c[b].installAll()
 
-      };
 
-      f.parentNode.insertBefore(h, f);
 
-      h.src = e
 
-    })(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");
 
-  </script>
 
-  <!--钉钉监控end-->
 
-  <!-- <link rel="icon" href="/favicon.ico"> -->
 
-  <title>采销bate 3.0公测版</title>
 
-  <style>
 
-    [v-cloak] {
 
-      display: none;
 
-    }
 
-  </style>
 
-  <script src="./static/vue.min.js" rel="preload" as="script"></script>
 
-  <script src="./static/vue-router.min.js" rel="preload" as="script"></script>
 
-  <script src="./static/axios@0.21.0.min.js" rel="preload" as="script"></script>
 
-  <script src="./static/dingtalk.open.2.10.3.js" rel="preload" as="script"></script>
 
-  <meta name="wpk-bid" content="dta_1_1184953963">
 
-  <script>
 
-    !(function (c, i, e, b) {
 
-      var h = i.createElement("script");
 
-      var f = i.getElementsByTagName("script")[0];
 
-      h.type = "text/javascript";
 
-      h.crossorigin = true;
 
-      h.onload = function () {
 
-        c[b] || (c[b] = new c.wpkReporter({ bid: "dta_1_1184953963" }));
 
-        c[b].installAll()
 
-      };
 
-      f.parentNode.insertBefore(h, f);
 
-      h.src = e
 
-    })(window, document, "https://g.alicdn.com/woodpeckerx/jssdk??wpkReporter.js", "__wpk");
 
-  </script>
 
-<link href="/static/js/app.js" rel="preload" as="script"><link href="/static/js/chunk-elementUI.js" rel="preload" as="script"><link href="/static/js/chunk-libs.js" rel="preload" as="script"><link href="/static/js/runtime.js" rel="preload" as="script"></head>
 
-
 
-<body>
 
-  <div id="app">
 
-    <div style="width: 152px;margin: 0 auto;padding-top: 100px;">
 
-      <img style="width: 100%;" src="./static/loading.gif" alt="">
 
-      <!-- <p style="width: 100%;text-align: center;color: #606266;">努力加载中...</p> -->
 
-    </div>
 
-  </div>
 
-<script type="text/javascript" src="/static/js/runtime.js"></script><script type="text/javascript" src="/static/js/chunk-elementUI.js"></script><script type="text/javascript" src="/static/js/chunk-libs.js"></script><script type="text/javascript" src="/static/js/app.js"></script></body>
 
-
 
-</html>

BIN
dist/static/C端订单导入模板.xlsx
View File


File diff suppressed because it is too large
+ 0 - 1
dist/static/axios@0.21.0.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/dingtalk.open.2.10.3.js


BIN
dist/static/fonts/element-icons.535877f5.woff
View File


BIN
dist/static/fonts/element-icons.732389de.ttf
View File


BIN
dist/static/img/1.41566374.jpeg
View File


BIN
dist/static/img/401.089007e7.gif
View File


BIN
dist/static/img/404.a57b6f31.png
View File


BIN
dist/static/img/404_cloud.0f4bc32b.png
View File


BIN
dist/static/img/afterSale.c4b8f35d.jpg
View File


BIN
dist/static/img/avatar.ecba1844.gif
View File


BIN
dist/static/img/beforeSale.db214ded.jpg
View File


BIN
dist/static/img/bg-pad.5b4eedcf.jpg
View File


BIN
dist/static/img/bg-pc.3f2bd743.jpg
View File


BIN
dist/static/img/bg-phone.e07669d9.jpg
View File


BIN
dist/static/img/developing.750f7ed1.jpg
View File


BIN
dist/static/img/loading.190c78aa.gif
View File


BIN
dist/static/img/loginbg.51c61d67.png
View File


BIN
dist/static/img/logo.66bee2dc.gif
View File


BIN
dist/static/img/pageBg.f9f9dcd5.png
View File


BIN
dist/static/img/search-not.29ce7ea9.png
View File


BIN
dist/static/img/welcome2.faeb0a63.jpg
View File


File diff suppressed because it is too large
+ 0 - 10
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 57
dist/static/js/1.js


File diff suppressed because it is too large
+ 0 - 10
dist/static/js/app.js


File diff suppressed because it is too large
+ 0 - 20
dist/static/js/chunk-elementUI.js


File diff suppressed because it is too large
+ 0 - 160
dist/static/js/chunk-libs.js


+ 0 - 223
dist/static/js/runtime.js
View File 

@@ -1,223 +0,0 @@
 
-/******/ (function(modules) { // webpackBootstrap
 
-/******/ 	// install a JSONP callback for chunk loading
 
-/******/ 	function webpackJsonpCallback(data) {
 
-/******/ 		var chunkIds = data[0];
 
-/******/ 		var moreModules = data[1];
 
-/******/ 		var executeModules = data[2];
 
-/******/
 
-/******/ 		// add "moreModules" to the modules object,
 
-/******/ 		// then flag all "chunkIds" as loaded and fire callback
 
-/******/ 		var moduleId, chunkId, i = 0, resolves = [];
 
-/******/ 		for(;i < chunkIds.length; i++) {
 
-/******/ 			chunkId = chunkIds[i];
 
-/******/ 			if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
 
-/******/ 				resolves.push(installedChunks[chunkId][0]);
 
-/******/ 			}
 
-/******/ 			installedChunks[chunkId] = 0;
 
-/******/ 		}
 
-/******/ 		for(moduleId in moreModules) {
 
-/******/ 			if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
 
-/******/ 				modules[moduleId] = moreModules[moduleId];
 
-/******/ 			}
 
-/******/ 		}
 
-/******/ 		if(parentJsonpFunction) parentJsonpFunction(data);
 
-/******/
 
-/******/ 		while(resolves.length) {
 
-/******/ 			resolves.shift()();
 
-/******/ 		}
 
-/******/
 
-/******/ 		// add entry modules from loaded chunk to deferred list
 
-/******/ 		deferredModules.push.apply(deferredModules, executeModules || []);
 
-/******/
 
-/******/ 		// run deferred modules when all chunks ready
 
-/******/ 		return checkDeferredModules();
 
-/******/ 	};
 
-/******/ 	function checkDeferredModules() {
 
-/******/ 		var result;
 
-/******/ 		for(var i = 0; i < deferredModules.length; i++) {
 
-/******/ 			var deferredModule = deferredModules[i];
 
-/******/ 			var fulfilled = true;
 
-/******/ 			for(var j = 1; j < deferredModule.length; j++) {
 
-/******/ 				var depId = deferredModule[j];
 
-/******/ 				if(installedChunks[depId] !== 0) fulfilled = false;
 
-/******/ 			}
 
-/******/ 			if(fulfilled) {
 
-/******/ 				deferredModules.splice(i--, 1);
 
-/******/ 				result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
 
-/******/ 			}
 
-/******/ 		}
 
-/******/
 
-/******/ 		return result;
 
-/******/ 	}
 
-/******/
 
-/******/ 	// The module cache
 
-/******/ 	var installedModules = {};
 
-/******/
 
-/******/ 	// object to store loaded and loading chunks
 
-/******/ 	// undefined = chunk not loaded, null = chunk preloaded/prefetched
 
-/******/ 	// Promise = chunk loading, 0 = chunk loaded
 
-/******/ 	var installedChunks = {
 
-/******/ 		"runtime": 0
 
-/******/ 	};
 
-/******/
 
-/******/ 	var deferredModules = [];
 
-/******/
 
-/******/ 	// script path function
 
-/******/ 	function jsonpScriptSrc(chunkId) {
 
-/******/ 		return __webpack_require__.p + "static/js/" + ({}[chunkId]||chunkId) + ".js"
 
-/******/ 	}
 
-/******/
 
-/******/ 	// The require function
 
-/******/ 	function __webpack_require__(moduleId) {
 
-/******/
 
-/******/ 		// Check if module is in cache
 
-/******/ 		if(installedModules[moduleId]) {
 
-/******/ 			return installedModules[moduleId].exports;
 
-/******/ 		}
 
-/******/ 		// Create a new module (and put it into the cache)
 
-/******/ 		var module = installedModules[moduleId] = {
 
-/******/ 			i: moduleId,
 
-/******/ 			l: false,
 
-/******/ 			exports: {}
 
-/******/ 		};
 
-/******/
 
-/******/ 		// Execute the module function
 
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
 
-/******/
 
-/******/ 		// Flag the module as loaded
 
-/******/ 		module.l = true;
 
-/******/
 
-/******/ 		// Return the exports of the module
 
-/******/ 		return module.exports;
 
-/******/ 	}
 
-/******/
 
-/******/ 	// This file contains only the entry chunk.
 
-/******/ 	// The chunk loading function for additional chunks
 
-/******/ 	__webpack_require__.e = function requireEnsure(chunkId) {
 
-/******/ 		var promises = [];
 
-/******/
 
-/******/
 
-/******/ 		// JSONP chunk loading for javascript
 
-/******/
 
-/******/ 		var installedChunkData = installedChunks[chunkId];
 
-/******/ 		if(installedChunkData !== 0) { // 0 means "already installed".
 
-/******/
 
-/******/ 			// a Promise means "currently loading".
 
-/******/ 			if(installedChunkData) {
 
-/******/ 				promises.push(installedChunkData[2]);
 
-/******/ 			} else {
 
-/******/ 				// setup Promise in chunk cache
 
-/******/ 				var promise = new Promise(function(resolve, reject) {
 
-/******/ 					installedChunkData = installedChunks[chunkId] = [resolve, reject];
 
-/******/ 				});
 
-/******/ 				promises.push(installedChunkData[2] = promise);
 
-/******/
 
-/******/ 				// start chunk loading
 
-/******/ 				var script = document.createElement('script');
 
-/******/ 				var onScriptComplete;
 
-/******/
 
-/******/ 				script.charset = 'utf-8';
 
-/******/ 				script.timeout = 120;
 
-/******/ 				if (__webpack_require__.nc) {
 
-/******/ 					script.setAttribute("nonce", __webpack_require__.nc);
 
-/******/ 				}
 
-/******/ 				script.src = jsonpScriptSrc(chunkId);
 
-/******/
 
-/******/ 				// create error before stack unwound to get useful stacktrace later
 
-/******/ 				var error = new Error();
 
-/******/ 				onScriptComplete = function (event) {
 
-/******/ 					// avoid mem leaks in IE.
 
-/******/ 					script.onerror = script.onload = null;
 
-/******/ 					clearTimeout(timeout);
 
-/******/ 					var chunk = installedChunks[chunkId];
 
-/******/ 					if(chunk !== 0) {
 
-/******/ 						if(chunk) {
 
-/******/ 							var errorType = event && (event.type === 'load' ? 'missing' : event.type);
 
-/******/ 							var realSrc = event && event.target && event.target.src;
 
-/******/ 							error.message = 'Loading chunk ' + chunkId + ' failed.\n(' + errorType + ': ' + realSrc + ')';
 
-/******/ 							error.name = 'ChunkLoadError';
 
-/******/ 							error.type = errorType;
 
-/******/ 							error.request = realSrc;
 
-/******/ 							chunk[1](error);
 
-/******/ 						}
 
-/******/ 						installedChunks[chunkId] = undefined;
 
-/******/ 					}
 
-/******/ 				};
 
-/******/ 				var timeout = setTimeout(function(){
 
-/******/ 					onScriptComplete({ type: 'timeout', target: script });
 
-/******/ 				}, 120000);
 
-/******/ 				script.onerror = script.onload = onScriptComplete;
 
-/******/ 				document.head.appendChild(script);
 
-/******/ 			}
 
-/******/ 		}
 
-/******/ 		return Promise.all(promises);
 
-/******/ 	};
 
-/******/
 
-/******/ 	// expose the modules object (__webpack_modules__)
 
-/******/ 	__webpack_require__.m = modules;
 
-/******/
 
-/******/ 	// expose the module cache
 
-/******/ 	__webpack_require__.c = installedModules;
 
-/******/
 
-/******/ 	// define getter function for harmony exports
 
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
 
-/******/ 		if(!__webpack_require__.o(exports, name)) {
 
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
 
-/******/ 		}
 
-/******/ 	};
 
-/******/
 
-/******/ 	// define __esModule on exports
 
-/******/ 	__webpack_require__.r = function(exports) {
 
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
 
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-/******/ 		}
 
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
 
-/******/ 	};
 
-/******/
 
-/******/ 	// create a fake namespace object
 
-/******/ 	// mode & 1: value is a module id, require it
 
-/******/ 	// mode & 2: merge all properties of value into the ns
 
-/******/ 	// mode & 4: return value when already ns object
 
-/******/ 	// mode & 8|1: behave like require
 
-/******/ 	__webpack_require__.t = function(value, mode) {
 
-/******/ 		if(mode & 1) value = __webpack_require__(value);
 
-/******/ 		if(mode & 8) return value;
 
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
 
-/******/ 		var ns = Object.create(null);
 
-/******/ 		__webpack_require__.r(ns);
 
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
 
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
 
-/******/ 		return ns;
 
-/******/ 	};
 
-/******/
 
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
 
-/******/ 	__webpack_require__.n = function(module) {
 
-/******/ 		var getter = module && module.__esModule ?
 
-/******/ 			function getDefault() { return module['default']; } :
 
-/******/ 			function getModuleExports() { return module; };
 
-/******/ 		__webpack_require__.d(getter, 'a', getter);
 
-/******/ 		return getter;
 
-/******/ 	};
 
-/******/
 
-/******/ 	// Object.prototype.hasOwnProperty.call
 
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
 
-/******/
 
-/******/ 	// __webpack_public_path__
 
-/******/ 	__webpack_require__.p = "/";
 
-/******/
 
-/******/ 	// on error function for async loading
 
-/******/ 	__webpack_require__.oe = function(err) { console.error(err); throw err; };
 
-/******/
 
-/******/ 	var jsonpArray = window["webpackJsonp"] = window["webpackJsonp"] || [];
 
-/******/ 	var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
 
-/******/ 	jsonpArray.push = webpackJsonpCallback;
 
-/******/ 	jsonpArray = jsonpArray.slice();
 
-/******/ 	for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
 
-/******/ 	var parentJsonpFunction = oldJsonpFunction;
 
-/******/
 
-/******/
 
-/******/ 	// run deferred modules from other chunks
 
-/******/ 	checkDeferredModules();
 
-/******/ })
 
-/************************************************************************/
 
-/******/ ([]);

BIN
dist/static/loading.gif
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/reset.min.css


File diff suppressed because it is too large
+ 0 - 10
dist/static/vue-router.min.js


File diff suppressed because it is too large
+ 0 - 5
dist/static/vue.min.js


BIN
dist/static/收货地址模板.xlsx
View File


+ 13 - 9
src/components/globalComponents/search-supplier/main.vue
View File 

@@ -55,17 +55,21 @@ export default {
 
     }
 
   },
 
   watch: {
 
-    names: function(val, old) {
 
+    names: {
 
+      handler: function(val, old) {
 
       // console.log(val, old, this.isDetail, "1");
 
-      this.searchName = val
 
-      if (this.isDetail && this.searchName) {
 
-        this.remoteMethod(this.searchName, this.isp)
 
-      }
 
+        this.searchName = val
 
+        if (this.isDetail && this.searchName) {
 
+          this.remoteMethod(this.searchName, this.isp)
 
+        }
 
+      },
 
+      immediate: true
 
     },
 
-    isDetail: function(val, old) {
 
-      // console.log(val, old, this.isDetail, "2");
 
-      if (val && this.searchName) {
 
-        this.remoteMethod(this.searchName, this.isp)
 
+    isDetail: {
 
+      handler: function(val, old) {
 
+        if (val && this.searchName) {
 
+          this.remoteMethod(this.searchName, this.isp)
 
+        }
 
       }
 
     }
 
   },

+ 1 - 1
src/views/sellOut/bargainList/index.vue
View File 

@@ -449,7 +449,7 @@ export default {
 
     async customerChange(e) {
 
       const { code } = e;
 
       this.parmValue.customer_code = code ? [code] : [];
 
-      // this.parmValue.supplierName = e.label;
 
+      this.parmValue.supplierName = e.label;
 
       this.pageInfo.curr = 1;
 
       this.parmValue.page = 1;
 
       await this.searchList();

+ 1 - 1
src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue
View File 

@@ -114,7 +114,7 @@
 
           <process-time-line
 
             v-if="newTime !== ''"
 
             :newTime="newTime"
 
-            :type="'THGD'"
 
+            :type="'THG'"
 
             :orderCode="sitem.returnCode"
 
           />
 
         </el-tab-pane>

+ 12 - 8
src/views/sellOut/beforeReturnGoodWorkOrder/index.vue
View File 

@@ -94,11 +94,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :is-detail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -333,6 +333,8 @@ export default {
 
       modelId: 0,
 
       parmValue: {
 
         order_type: "",
 
+        supplierName:"",
 
+        supplierNo:"",
 
         saleReturnChildCode: "",
 
         status: "",
 
         page: 1, // 页码
 
@@ -387,7 +389,8 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label
 
       this.searchList();
 
     },
 
     customer_code_change(e) {
 
@@ -415,9 +418,9 @@ export default {
 
             customer_code: Array.isArray(this.parmValue.customer_code)
 
               ? this.parmValue.customer_code[0]
 
               : this.parmValue.customer_code,
 
-            supplierNo: Array.isArray(this.supplierNo)
 
-              ? this.supplierNo[0]
 
-              : this.supplierNo,
 
+            supplierNo: Array.isArray(this.parmValue.supplierNo)
 
+              ? this.parmValue.supplierNo[0]
 
+              : this.parmValue.supplierNo,
 
             needRela: true,
 
           },
 
           headers: {
 
@@ -550,6 +553,7 @@ export default {
 
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       delete model["s_input"];
 
+      delete model["supplierName"];
 
 
       const res = await asyncRequest.list({
 
         ...model,
 
@@ -558,7 +562,7 @@ export default {
 
         customer_code: Array.isArray(this.parmValue.customer_code)
 
           ? this.parmValue.customer_code[0]
 
           : this.parmValue.customer_code,
 
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
 
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
 
         companyNo: this.currentCompany,
 
         noRelation: true,
 
       });

+ 14 - 9
src/views/sellOut/deliveryWorkOrder/index.vue
View File 

@@ -62,7 +62,7 @@
 
                   :value="parmValue.customer_code"
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :names="companyName"
 
+                  :names="parmValue.customerName"
 
                   :placeholder="'企业客户'"
 
                   :disabled="false"
 
                   :is-detail="true"
 
@@ -154,8 +154,8 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
-                  :names="supplierName"
 
+                  :value="parmValue.supplierNo"
 
+                  :names="parmValue.supplierName"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
                   :isDetail="true"
 
@@ -386,6 +386,9 @@ export default {
 
       isDetail: false,
 
       modelId: 0,
 
       parmValue: {
 
+        supplierName:"",
 
+        supplierNo:"",
 
+        customerName:"",
 
         status: "",
 
         has_account: "",
 
         customer_code: [],
 
@@ -455,15 +458,17 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
-      this.supplierName = label;
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label;
 
       this.searchList();
 
     },
 
     customer_code_change(e) {
 
       if (e && e.code) {
 
         this.parmValue.customer_code = [e.code];
 
+        this.parmValue.customerName = e.label
 
       } else {
 
         this.parmValue.customer_code = [];
 
+        this.parmValue.customerName = ""
 
       }
 
       this.searchList();
 
     },
 
@@ -484,9 +489,9 @@ export default {
 
             customer_code: Array.isArray(this.parmValue.customer_code)
 
               ? this.parmValue.customer_code[0]
 
               : this.parmValue.customer_code,
 
-            supplierNo: Array.isArray(this.supplierNo)
 
-              ? this.supplierNo[0]
 
-              : this.supplierNo,
 
+            supplierNo: Array.isArray(this.parmValue.supplierNo)
 
+              ? this.parmValue.supplierNo[0]
 
+              : this.parmValue.supplierNo,
 
             needRela: true,
 
           },
 
           headers: {
 
@@ -618,7 +623,7 @@ export default {
 
       }
 
       this.loading = true;
 
 
-      let model = JSON.parse(JSON.stringify(this.parmValue));
 
+      let {supplierName,customerName,...model} = JSON.parse(JSON.stringify(this.parmValue));
 
       delete model["s_input"];
 
 
       const res = await asyncRequest.list({

+ 8 - 4
src/views/sellOut/returnGoodWorkOrder/index.vue
View File 

@@ -94,11 +94,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :isDetail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -367,6 +367,8 @@ export default {
 
       isDetail: false,
 
       modelId: 0,
 
       parmValue: {
 
+        supplierNo:"",
 
+        supplierName:"",
 
         use_type: "1",
 
         type: "",
 
         order_type: "",
 
@@ -432,7 +434,8 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label
 
       this.searchList();
 
     },
 
     customer_code_change(e) {
 
@@ -597,6 +600,7 @@ export default {
 
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       delete model["s_input"];
 
+      delete model['supplierNo']
 
 
       const res = await asyncRequest.list({
 
         ...model,

+ 1 - 26
src/views/sellOut/salesOrder/index.vue
View File 

@@ -78,19 +78,6 @@
 
                 </el-select>
 
               </el-col>
 
 
-              <!-- 客户公司 -->
 
-              <!-- <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
 
-                <search-work-company
 
-                  :type="'1'"
 
-                  :value="parmValue.supplierNo"
 
-                  :size="'mini'"
 
-                  :placeholder="'销售方公司'"
 
-                  :disabled="false"
 
-                  :isDetail="false"                  
-                  @searchChange="supplierChange"
 
-                />
 
-              </el-col> -->
 
-
 
               <el-col :span="3" style="width: 66px; float: right">
 
                 <el-button
 
                   :size="searchSize"
 
@@ -215,18 +202,6 @@
 
                     @change="searchList"
 
                   >
 
                     <el-option label="订单编号" value="orderCode"></el-option>
 
-                    <!-- <el-option
 
-                      label="商品属性编号"
 
-                      value="good_code"
 
-                    ></el-option> -->
 
-                    <!-- <el-option
 
-                      label="供应商编号"
 
-                      value="supplierNo"
 
-                    ></el-option> -->
 
-                    <!-- <el-option
 
-                      label="客户编号"
 
-                      value="customer_code"
 
-                    ></el-option> -->
 
                     <el-option label="商品名称" value="good_name"></el-option>
 
                     <el-option label="创建人" value="apply_name"></el-option>
 
                     <el-option label="创建人部门" value="company_name"></el-option>
 
@@ -595,7 +570,7 @@ export default {
 
     async customerChange(e) {
 
       if (e && e.id) {
 
         this.customerCode = [e.code];
 
-        // this.parmValue.supplierName = e.label;
 
+        this.parmValue.supplierName = e.label;
 
         this.parmValue.customer_code = e.code;
 
       } else {
 
         this.customerCode = [];

+ 18 - 13
src/views/sellOut/sellAfterApply/index.vue
View File 

@@ -58,7 +58,9 @@
 
               <!-- 客户公司 -->
 
               <el-col :span="4" style="width: 240px; padding: 0px 0 0 10px">
 
                 <search-customer
 
-                  :value="customerCode"
 
+                  :value="parmValue.customer_code"
 
+                  :names="parmValue.customerName"
 
+                  :is-detail="true"
 
                   :size="searchSize"
 
                   style="width: 100%"
 
                   :placeholder="'客户公司名称'"
 
@@ -150,11 +152,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :isDetail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -386,6 +388,10 @@ export default {
 
       isDetail: false,
 
       modelId: 0,
 
       parmValue: {
 
+        customerCode:"",
 
+        customerName:"",
 
+        supplierNo:"",
 
+        supplierName:"",
 
         use_type: "1",
 
         has_account: "",
 
         order_source: "",
 
@@ -482,7 +488,8 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label
 
       this.searchList();
 
     },
 
     handleExport() {
 
@@ -643,9 +650,12 @@ export default {
 
       this.parmValue.company_name = this.select === "company_name" ? this.s_input : ""; // 申请人部门
 
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
+      delete model['supplierName']
 
+      delete model['customerName']
 
       const res = await asyncRequest.list({
 
         ...model,
 
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
 
+        customer_code:Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
 
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
 
         needRela: true,
 
       });
 
 
@@ -711,13 +721,8 @@ export default {
 
     },
 
     // 客户选择
 
     async customerChange(e) {
 
-      if (e && e.id) {
 
-        this.customerCode = [e.code];
 
-        this.parmValue.customer_code = e.code;
 
-      } else {
 
-        this.customerCode = [];
 
-        this.parmValue.customer_code = "";
 
-      }
 
+      this.parmValue.customer_code = [e.code];
 
+      this.parmValue.customerName = e.label;
 
       this.parmValue.page = 1;
 
       await this.searchList();
 
     },

+ 0 - 7
src/views/sellOut/sellOutOrder/detail.vue
View File 

@@ -39,13 +39,6 @@
 
           >分享
 
         </el-button>
 
       </div>
 
-      <!-- 
-      <status-bar
 
-        v-if="newTime !== ''"
 
-        :newTime="newTime"
 
-        :options="statusOptions"
 
-        :status="status"
 
-      /> -->
 
       <el-tabs v-model="activeTabs">
 
         <el-tab-pane label="业务详情" name="1">
 
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">

+ 18 - 17
src/views/sellOut/sellOutOrder/index.vue
View File 

@@ -52,10 +52,10 @@
 
 
               <el-col :span="4" style="width: 230px; padding: 0 0 0 2px">
 
                 <search-customer
 
-                  :value="customerCode"
 
+                  :value="parmValue.customerCode"
 
                   :size="searchSize"
 
                   :placeholder="'客户公司名称'"
 
-                  :names="parmValue.supplierName"
 
+                  :names="parmValue.customerName"
 
                   :is-detail="true"
 
                   @searchChange="customerChange"
 
                 />
 
@@ -159,11 +159,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :isDetail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -446,12 +446,11 @@ export default {
 
     const { back } = this.$route.query;
 
     if (back) {
 
       this.parmValue = JSON.parse(back);
 
-      console.log(this.parmValue);
 
+      console.log( this.parmValue);
 
       const { page, size } = this.parmValue;
 
-      // this.parmValue.start = start || last_start;
 
-      // this.parmValue.end = end || last_end;
 
-      if (this.parmValue.companyNo.length > 0) {
 
-        this.customerCode = [this.parmValue.companyNo];
 
+
 
+      if (this.parmValue.customerCode.length > 0) {
 
+        this.customerCode = [this.parmValue.customerCode];
 
       }
 
 
       this.pageInfo = {
 
@@ -473,7 +472,9 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      // this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : []
 
+      this.parmValue.supplierName = label
 
       this.pageInfo.curr = 1;
 
       this.parmValue.page = 1;
 
       this.searchList();
 
@@ -667,11 +668,12 @@ export default {
 
         return;
 
       }
 
       this.loading = true;
 
-      let { start, end, ...rest } = JSON.parse(JSON.stringify(this.parmValue));
 
+      let { start, end,supplierNo, customerCode ,supplierName,customerName ,...rest } = JSON.parse(JSON.stringify(this.parmValue));
 
 
       const res = await asyncRequest.list({
 
         ...rest,
 
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
 
+        supplierNo: Array.isArray(supplierNo) ? supplierNo[0] : supplierNo,
 
+        customerCode: Array.isArray(customerCode) ? customerCode[0] : customerCode,
 
         [startProp]: start,
 
         [endProp]: end,
 
         needRela: true,
 
@@ -749,12 +751,11 @@ export default {
 
     async customerChange(e) {
 
       if (e && e.id) {
 
         this.customerCode = [e.code];
 
-        this.parmValue.supplierName = e.label;
 
-        this.parmValue.companyNo = e.code;
 
+        this.parmValue.customerName = e.label;
 
+        this.parmValue.customerCode = e.code ? [e.code] : ""
 
       } else {
 
         this.customerCode = [];
 
-        this.parmValue.supplierName = "";
 
-        this.parmValue.companyNo = "";
 
+        this.parmValue.customerName = "";
 
       }
 
       this.pageInfo.curr = 1;
 
       this.parmValue.page = 1;

+ 14 - 11
src/views/sellOut/sellReturn/index.vue
View File 

@@ -63,7 +63,7 @@
 
                   :value="parmValue.customer_code"
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :names="companyName"
 
+                  :names="parmValue.customerName"
 
                   :placeholder="'企业客户'"
 
                   :disabled="false"
 
                   :is-detail="true"
 
@@ -155,11 +155,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="width: 100%"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :isDetail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -384,6 +384,9 @@ export default {
 
       isDetail: false,
 
       modelId: 0,
 
       parmValue: {
 
+        supplierNo: "",
 
+        supplierName: "",
 
+        customerName:"",
 
         has_account: "",
 
         customer_code: [],
 
         returnCode: "", //销售退货code
 
@@ -461,15 +464,13 @@ export default {
 
     },
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label;
 
       this.searchList();
 
     },
 
     customer_code_change(e) {
 
-      if (e && e.code) {
 
-        this.parmValue.customer_code = [e.code];
 
-      } else {
 
-        this.parmValue.customer_code = [];
 
-      }
 
+      this.parmValue.customer_code = [e.code];
 
+      this.parmValue.customerName = e.label
 
       this.searchList();
 
     },
 
     handleExport() {
 
@@ -553,6 +554,8 @@ export default {
 
       this.s_input = ""; //清除输入框内容
 
       this.select = ""; //清除下拉框选中项
 
       this.parmValue = {
 
+        supplierName:"",
 
+        supplierNo:"",
 
         order_type: "",
 
         company_name: "", //申请人部门
 
         good_code: "",
 
@@ -632,7 +635,7 @@ export default {
 
         customer_code: Array.isArray(this.parmValue.customer_code)
 
           ? this.parmValue.customer_code[0]
 
           : this.parmValue.customer_code,
 
-        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
 
+        supplierNo: Array.isArray(model.supplierNo) ? model.supplierNo[0] : model.supplierNo,
 
         needRela: true,
 
       });

+ 3 - 0
src/views/sellOut/stockApply/index.vue
View File 

@@ -96,6 +96,8 @@
 
                   :size="searchSize"
 
                   :value="parmValue.supplierNo"
 
                   :placeholder="'供应商名称'"
 
+                  :names="parmValue.supplierName"
 
+                  :is-detail="true"
 
                   @searchChange="supplierChange"
 
                   />
 
               </el-col>
 
@@ -328,6 +330,7 @@ export default {
 
     async supplierChange(e) {
 
       const {code} = e;
 
       this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = e.label
 
       this.searchList()
 
     },
 
     getRouter(toRouter, queryId){

+ 16 - 11
src/views/sellOut/zxDiffOrder/index.vue
View File 

@@ -80,11 +80,11 @@
 
                 
                 <el-col :span="4" style="margin-left: 10px">
 
                   <search-customer
 
-                    :value="customerCode"
 
+                    :value="parmValue.customer_code"
 
+                    :names="parmValue.customerName"
 
                     :size="searchSize"
 
                     :placeholder="'企业客户'"
 
                     @searchChange="customerChange"
 
-                    :names="parmValue.supplierName"
 
                     :is-detail="true"
 
                   />
 
                 </el-col>
 
@@ -165,11 +165,11 @@
 
                 <search-supplier
 
                   :size="'mini'"
 
                   style="margin-left: 10px"
 
-                  :value="supplierNo"
 
+                  :value="parmValue.supplierNo"
 
                   :disabled="false"
 
                   :placeholder="'供应商名称'"
 
-                  :names="''"
 
-                  :isDetail="false"
 
+                  :names="parmValue.supplierName"
 
+                  :isDetail="true"
 
                   :noDisabled="true"
 
                   @searchChange="supplierChange"
 
                 />
 
@@ -319,6 +319,7 @@ export default {
 
       isDetail: false,
 
       modelId: 0,
 
       parmValue: {
 
+        customerName: "",
 
         is_stock: "",
 
         order_source: "",
 
         zxNo: "", // 竞价单编码
 
@@ -385,7 +386,8 @@ export default {
 
   methods: {
 
     async supplierChange(e) {
 
       const { code, label } = e;
 
-      this.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierNo = code ? [code] : [];
 
+      this.parmValue.supplierName = label
 
       this.searchList()
 
     },
 
     getRouter(toRouter, queryId){
 
@@ -453,11 +455,11 @@ export default {
 
     },
 
     async customerChange(e) {
 
       if (e && e.id) {
 
-        this.customerCode = [e.code];
 
-        this.parmValue.customer_code = e.code;
 
+        this.parmValue.customer_code = [e.code];
 
+        this.parmValue.customerName = e.label
 
       } else {
 
-        this.customerCode = [];
 
-        this.parmValue.customer_code = "";
 
+        this.parmValue.customer_code = [];
 
+        this.parmValue.customerName = ""
 
       }
 
       this.parmValue.page = 1;
 
       await this.searchList();
 
@@ -515,7 +517,10 @@ export default {
 
      
       const res = await asyncRequest.list({
 
         ...this.parmValue,
 
-        supplierNo:Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
 
+        supplierName:undefined,
 
+        customerName:undefined,
 
+        supplierNo:Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
 
+        customer_code:Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customerCode,
 
         needRela: true
 
       });

Some files were not shown because too many files changed in this diff