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

1

xiaodai2022 2 years ago
parent
0975386dd8
commit
ad168a8a7a
39 changed files with 502 additions and 94 deletions
Split View Show Diff Stats
  1. BIN
      dist/favicon.ico
  2. 64 0
      dist/index.html
  3. 1 0
      dist/static/axios@0.21.0.min.js
  4. 0 0
      dist/static/dingtalk.open.2.10.3.js
  5. BIN
      dist/static/fonts/element-icons.535877f5.woff
  6. BIN
      dist/static/fonts/element-icons.732389de.ttf
  7. BIN
      dist/static/img/401.089007e7.gif
  8. BIN
      dist/static/img/404.a57b6f31.png
  9. BIN
      dist/static/img/404_cloud.0f4bc32b.png
  10. BIN
      dist/static/img/avatar.ecba1844.gif
  11. BIN
      dist/static/img/developing.750f7ed1.jpg
  12. BIN
      dist/static/img/loading.190c78aa.gif
  13. BIN
      dist/static/img/loginbg.51c61d67.png
  14. BIN
      dist/static/img/loginlan.1ecbd4ab.png
  15. BIN
      dist/static/img/logo.66bee2dc.gif
  16. BIN
      dist/static/img/search-not.29ce7ea9.png
  17. BIN
      dist/static/img/welcome.6cf0f25b.gif
  18. 10 0
      dist/static/js/0.js
  19. 10 0
      dist/static/js/app.js
  20. 20 0
      dist/static/js/chunk-elementUI.js
  21. 58 0
      dist/static/js/chunk-libs.js
  22. 223 0
      dist/static/js/runtime.js
  23. BIN
      dist/static/loading.gif
  24. 0 0
      dist/static/reset.min.css
  25. 10 0
      dist/static/vue-router.min.js
  26. 5 0
      dist/static/vue.min.js
  27. BIN
      dist/static/收货地址模板.xlsx
  28. 2 2
      src/apis/service/goodStore/goodsRepertory/index.js
  29. 0 1
      src/views/goodStore/active/detail.vue
  30. 10 10
      src/views/goodStore/dealGoodsPool/columns.js
  31. 26 32
      src/views/goodStore/dealGoodsPool/index.vue
  32. 6 1
      src/views/goodStore/goodsOnline/columns.js
  33. 5 1
      src/views/goodStore/goodsOnline/index.vue
  34. 2 2
      src/views/goodStore/goodsRepertory/columns.js
  35. 50 36
      src/views/goodStore/goodsRepertory/index.vue
  36. 0 2
      src/views/sellOut/sellAfterApply/detail.vue
  37. 0 1
      src/views/sellOut/sellOutOrder/detail.vue
  38. 0 5
      src/views/sellOut/stockApply/detail.vue
  39. 0 1
      src/views/sellOut/zixunOrder/components/feedbackList.vue

BIN
dist/favicon.ico
View File


+ 64 - 0
dist/index.html
View File 

@@ -0,0 +1,64 @@
 
+<!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>采销平台</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>
 
+  <!-- built files will be auto injected -->
 
+<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>

File diff suppressed because it is too large
+ 1 - 0
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/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/avatar.ecba1844.gif
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/loginlan.1ecbd4ab.png
View File


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


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


BIN
dist/static/img/welcome.6cf0f25b.gif
View File


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


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


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


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


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

@@ -0,0 +1,223 @@
 
+/******/ (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
+ 10 - 0
dist/static/vue-router.min.js


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


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


+ 2 - 2
src/apis/service/goodStore/goodsRepertory/index.js
View File 

@@ -3,6 +3,6 @@ import http from "@/apis/axios";
 
 const api = "admin/";
 
 export default {
 
   // 分页查询
 
-  list: (data, params) => http(api + "goodlist", data, "post", params),
 
-  //getgoodlistbyladder
 
+  list: (data, params) => http(api + "getgoodlistbyladder", data, "post", params),
 
+  //goodlist
 
 };

+ 0 - 1
src/views/goodStore/active/detail.vue
View File 

@@ -1,6 +1,5 @@
 
 <template>
 
   <div class="activeDetail">
 
-    <!-- <div>{{ powers }},{{ status }}</div> -->
 
     <div
 
       class="activeDetail-main"
 
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"

+ 10 - 10
src/views/goodStore/dealGoodsPool/columns.js
View File 

@@ -72,16 +72,16 @@ const listCol = [
 
   //   _slot_: "status",
 
   //   width: "118px",
 
   // },
 
-  {
 
-    prop: "supplierNo",
 
-    label: "供应商编号",
 
-    width: "110px",
 
-  },
 
-  {
 
-    prop: "supplier_name",
 
-    label: "供应商名称",
 
-    width: "110px",
 
-  },
 
+  // {
 
+  //   prop: "supplierNo",
 
+  //   label: "供应商编号",
 
+  //   width: "110px",
 
+  // },
 
+  // {
 
+  //   prop: "supplier_name",
 
+  //   label: "供应商名称",
 
+  //   width: "110px",
 
+  // },
 
   {
 
     prop: "companyNo",
 
     label: "业务公司编号",

+ 26 - 32
src/views/goodStore/dealGoodsPool/index.vue
View File 

@@ -23,7 +23,7 @@
 
     >
 
       <template #table-header="{}">
 
         <div style="width: 100%">
 
-          <el-row style="padding: 0 0 10px 80px">
 
+          <el-row style="padding: 0 0 0 80px">
 
             <el-col :span="6" style="width: 293px">
 
               <period-date-picker
 
                 :type="1"
 
@@ -34,22 +34,22 @@
 
                 @timeReturned="handleTime"
 
               />
 
             </el-col>
 
-            <el-col :span="6" style="width: 270px; padding: 0 0 0 10px">
 
+            <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
 
               <el-input
 
                 :size="searchSize"
 
                 style="100%"
 
-                v-model="parmValue.supplier_name"
 
+                v-model="parmValue.good_code"
 
                 :maxlength="40"
 
-                placeholder="商品名称"
 
+                placeholder="商品编码"
 
               ></el-input>
 
             </el-col>
 
-            <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
 
+            <el-col :span="6" style="width: 280px; padding: 0 0 0 10px">
 
               <el-input
 
                 :size="searchSize"
 
                 style="100%"
 
-                v-model="parmValue.good_code"
 
+                v-model="parmValue.supplier_name"
 
                 :maxlength="40"
 
-                placeholder="商品编码"
 
+                placeholder="商品名称"
 
               ></el-input>
 
             </el-col>
 
 
@@ -62,9 +62,18 @@
 
                 刷新
 
               </el-button>
 
             </el-col>
 
+            <el-col
 
+              :span="3"
 
+              class="fr"
 
+              style="width: 66px; padding: 0 0 0 10px"
 
+            >
 
+              <el-button type="warning" :size="searchSize" @click="restSearch">
 
+                重置
 
+              </el-button>
 
+            </el-col>
 
           </el-row>
 
-          <el-row>
 
-            <el-col :span="4" style="width: 518px">
 
+          <!-- <el-row> -->
 
+          <!-- <el-col :span="4" style="width: 518px">
 
               <el-input
 
                 :size="searchSize"
 
                 v-model="sinput"
 
@@ -88,17 +97,9 @@
 
                   <el-option label="供应商名称" value="4" />
 
                 </el-select>
 
               </el-input>
 
-            </el-col>
 
-            <el-col
 
-              :span="3"
 
-              class="fr"
 
-              style="width: 66px; padding: 0 0 0 10px"
 
-            >
 
-              <el-button type="warning" :size="searchSize" @click="restSearch">
 
-                重置
 
-              </el-button>
 
-            </el-col>
 
-          </el-row>
 
+            </el-col> -->
 
+
 
+          <!-- </el-row> -->
 
         </div></template
 
       >
 
 
@@ -281,12 +282,8 @@ export default {
 
     //供应商选择
 
     async supplierNosearchChange(e) {
 
       console.log(e);
 
-      const { id, code, label } = e;
 
-      if (id) {
 
-        this.supplierNo = [code];
 
-      } else {
 
-        this.supplierNo = [code];
 
-      }
 
+      const { code } = e;
 
+      this.supplierNo = code ? [code] : [];
 
       this.parmValue.supplierNo = this.supplierNo.toString();
 
       this.pageInfo.curr = 1;
 
       this.parmValue.page = 1;
 
@@ -294,12 +291,9 @@ export default {
 
     },
 
     //业务企业选择
 
     async company_idsearchChange(e) {
 
-      const { id, code, label } = e;
 
-      if (id) {
 
-        this.parmValue.company_id = code;
 
-      } else {
 
-        this.parmValue.company_id = "";
 
-      }
 
+      const { code } = e;
 
+
 
+      this.parmValue.company_id = code ? code : "";
 
       this.pageInfo.curr = 1;
 
       this.parmValue.page = 1;
 
       await this.searchList();

+ 6 - 1
src/views/goodStore/goodsOnline/columns.js
View File 

@@ -49,10 +49,15 @@ const options8 = [
 
 const listCol = [
 
   {
 
     prop: "skuCode",
 
-    label: "编号",
 
+    label: "上线商品编号",
 
     fixed: "left",
 
     width: "160px",
 
   },
 
+  {
 
+    prop: "spuCode",
 
+    label: "成本商品编号",
 
+    width: "160px",
 
+  },
 
   {
 
     prop: "good_thumb_img",
 
     label: "图片",

+ 5 - 1
src/views/goodStore/goodsOnline/index.vue
View File 

@@ -147,7 +147,8 @@
 
                   placeholder="关键字类型"
 
                 >
 
                   <el-option label="商品名称" value="1" />
 
-                  <el-option label="商品编号" value="2" />
 
+                  <el-option label="成本商品编号" value="2" />
 
+                    <el-option label="上线商品编号" value="8" />
 
                   <!-- <el-option label="平台编号" value="3" /> -->
 
                   <!-- <el-option label="供应商编号" value="4" /> -->
 
                   <el-option label="业务企业编号" value="5" />
 
@@ -303,6 +304,7 @@ export default {
 
       parmValue: {
 
         good_name: "", //商品名称
 
         spucode: "", //商品编号
 
+         skucode: "", //商品编号
 
         cat_id: "", //商品分类
 
         start: "", //开始日期
 
         end: "", //结束日期
 
@@ -359,6 +361,7 @@ export default {
 
       this.parmValue = {
 
         good_name: "", //商品名称
 
         spucode: "", //商品编号
 
+         skucode: "", //商品编号
 
         cat_id: "", //商品分类
 
         start: "", //开始日期
 
         end: "", //结束日期
 
@@ -549,6 +552,7 @@ export default {
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       model.good_name = this.select === "1" ? this.sinput : ""; //商品名称
 
       model.spucode = this.select === "2" ? this.sinput : ""; //商品编号
 
+      model.skucode = this.select === "8" ? this.sinput : ""; //商品编号
 
       // model.platform_code = this.select === "1" ? this.sinput : ""; //平台编码
 
       // model.supplierNo = this.select === "1" ? this.sinput : ""; //供应商编号
 
       model.companyNo = this.select === "5" ? this.sinput : ""; //业务企业编号

+ 2 - 2
src/views/goodStore/goodsRepertory/columns.js
View File 

@@ -1,8 +1,8 @@
 
 
 //是否定制
 
 const options1 = [
 
-  { id: "0", name: "否" },
 
-  { id: "1", name: "是" },
 
+  { id: "0", name: "非定制" },
 
+  { id: "1", name: "定制" },
 
 ]
 
 //专属类型
 
 const options2 = [

+ 50 - 36
src/views/goodStore/goodsRepertory/index.vue
View File 

@@ -24,13 +24,13 @@
 
       <template #table-header="{}">
 
         <div style="width: 100%">
 
           <el-row style="padding: 0 0 10px 80px">
 
-            <el-col :span="4" style="width: 120px">
 
+            <el-col :span="4" style="width: 110px">
 
               <el-select
 
                 v-model="parmValue.good_type"
 
                 filterable
 
                 clearable
 
                 :size="searchSize"
 
-                placeholder="是否定制"
 
+                placeholder="定制类型"
 
                 style="width: 100%"
 
                 @change="
 
                   pageInfo.curr = 1;
 
@@ -46,23 +46,23 @@
 
                 />
 
               </el-select>
 
             </el-col>
 
-            <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
 
+            <el-col :span="6" style="width: 290px; padding: 0 0 0 10px">
 
               <period-date-picker
 
                 :type="1"
 
-                :width="'135px'"
 
+                :width="'129px'"
 
                 :size="searchSize"
 
                 :start="parmValue.start"
 
                 :end="parmValue.end"
 
                 @timeReturned="handleTime"
 
               />
 
             </el-col>
 
-            <el-col style="width: 140px; padding: 0 0 0 10px">
 
+            <el-col style="width: 120px; padding: 0 0 0 10px">
 
               <el-select
 
                 v-model="parmValue.is_stock"
 
                 filterable
 
                 clearable
 
                 :size="searchSize"
 
-                placeholder="是否库存品"
 
+                placeholder="库存类型"
 
                 style="width: 100%"
 
                 @change="
 
                   pageInfo.curr = 1;
 
@@ -71,14 +71,14 @@
 
                 "
 
               >
 
                 <el-option
 
-                  v-for="item in options1"
 
+                  v-for="item in options4"
 
                   :key="'good_type' + item.id"
 
                   :label="item.name"
 
                   :value="item.id"
 
                 />
 
               </el-select>
 
             </el-col>
 
-            <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
 
+            <el-col :span="6" style="width: 310px; padding: 0 0 0 10px">
 
               <good-class
 
                 :value="parmValue.cat_id"
 
                 @handleChange="goods_class_change"
 
@@ -89,15 +89,6 @@
 
               />
 
             </el-col>
 
 
-            <el-col
 
-              :span="3"
 
-              class="fr"
 
-              style="width: 66px; padding: 0 0 0 10px"
 
-            >
 
-              <el-button type="primary" :size="searchSize" @click="searchList">
 
-                刷新
 
-              </el-button>
 
-            </el-col>
 
             <el-col
 
               :span="3"
 
               class="fr"
 
@@ -132,7 +123,7 @@
 
                 />
 
               </el-select>
 
             </el-col> -->
 
-            <el-col :span="4" style="width: 200px">
 
+            <el-col :span="4" style="width: 190px">
 
               <search-brand
 
                 :value="brandid"
 
                 :disabled="type === 'view' || type === 'editCoin'"
 
@@ -143,20 +134,25 @@
 
                 @searchChange="brandidsearchChange"
 
               />
 
             </el-col>
 
-            <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
 
+            <el-col :span="6" style="width: 290px; padding: 0 0 0 10px">
 
               <number-range
 
                 :lower="parmValue.min_price"
 
                 :online="parmValue.max_price"
 
                 :title="'售价'"
 
-                :width="'135px'"
 
+                :width="'129px'"
 
                 :size="searchSize"
 
                 @numReturned="numReturned"
 
               />
 
             </el-col>
 
-            <el-col style="width: 140px; padding: 0 0 0 10px">
 
-              <el-input v-model="parmValue.moq" placeholder="最低起订量" type="number"></el-input>
 
+            <el-col style="width: 120px; padding: 0 0 0 10px">
 
+              <el-input
 
+                v-model="parmValue.moq"
 
+                placeholder="最低起订量"
 
+                @blur="moq_change"
 
+                type="number"
 
+              ></el-input>
 
             </el-col>
 
-            <el-col :span="4" style="width: 380px; padding: 0 0 0 10px">
 
+            <el-col :span="4" style="width: 310px; padding: 0 0 0 10px">
 
               <el-input
 
                 :size="searchSize"
 
                 v-model="sinput"
 
@@ -171,7 +167,7 @@
 
                   v-model="select"
 
                   slot="prepend"
 
                   :size="searchSize"
 
-                  style="width: 123px"
 
+                  style="width: 120px"
 
                   @change="
 
                     pageInfo.curr = 1;
 
                     parmValue.page = 1;
 
@@ -188,8 +184,18 @@
 
                   <el-option label="创建人" value="7" /> </el-select
 
               ></el-input>
 
             </el-col>
 
-          </el-row></div
 
-      ></template>
 
+            <el-col
 
+              :span="3"
 
+              class="fr"
 
+              style="width: 66px; padding: 0 0 0 10px"
 
+            >
 
+              <el-button type="primary" :size="searchSize" @click="searchList">
 
+                刷新
 
+              </el-button>
 
+            </el-col>
 
+          </el-row>
 
+        </div></template
 
+      >
 
       <template #good_thumb_img="{ scope }">
 
         <div
 
           v-if="scope.row.good_thumb_img"
 
@@ -232,13 +238,8 @@
 
       </template>
 
 
       <template #operation="{ scope }">
 
-         <!-- v-if="powers.some((item) => item == '007')" -->
 
-        <el-tooltip
 
-         
-          effect="dark"
 
-          content="详情"
 
-          placement="top"
 
-        >
 
+        <!-- v-if="powers.some((item) => item == '007')" -->
 
+        <el-tooltip effect="dark" content="详情" placement="top">
 
           <i class="el-icon-view tb-icon" @click="openDilog(scope.row)"></i>
 
         </el-tooltip>
 
         <!-- <el-tooltip
 
@@ -275,8 +276,8 @@ import asyncRequest from "@/apis/service/goodStore/goodsRepertory";
 
 import mixinPage from "@/mixins/elPaginationHandle";
 
 import { mapGetters } from "vuex";
 
 import resToken from "@/mixins/resToken";
 
-import { listCol, options1, options8 } from "./columns";
 
-import {} from "@/components/show-goods-data-table-modal"
 
+import { listCol, options1, options4, options8 } from "./columns";
 
+import {} from "@/components/show-goods-data-table-modal";
 
 export default {
 
   name: "goodsRepertory",
 
   mixins: [mixinPage, resToken],
 
@@ -300,6 +301,7 @@ export default {
 
       row: {},
 
       visible: false,
 
       options1: options1,
 
+      options4: options4,
 
       options8: options8,
 
       loading: false,
 
       parmValue: {
 
@@ -312,7 +314,7 @@ export default {
 
         is_stock: "", //是否库存品
 
         min_price: "", //价格区间最小值
 
         max_price: "", //价格区间最大值
 
-        moq: 0, //最小起订量
 
+        moq: "", //最小起订量
 
         page: 1, // 页码
 
         size: 15, // 每页显示条数
 
         supplierNo: "", //供应商编号
 
@@ -390,6 +392,18 @@ export default {
 
       };
 
       this.searchList();
 
     },
 
+    async moq_change() {
 
+      const { moq } = this.parmValue;
 
+      let moq_num = parseInt(moq * 1);
 
+      if (moq_num == NaN) {
 
+        this.parmValue.moq = "";
 
+      } else {
 
+        this.parmValue.moq = moq_num;
 
+      }
 
+      this.pageInfo.curr = 1;
 
+      this.parmValue.page = 1;
 
+      await this.searchList();
 
+    },
 
     //商品品牌选择
 
     async brandidsearchChange(e) {
 
       const { id, code, label } = e;

+ 0 - 2
src/views/sellOut/sellAfterApply/detail.vue
View File 

@@ -4,8 +4,6 @@
 
       style="width: 100%"
 
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
 
     >
 
-      <p>{{ status }}---{{ powers }}</p>
 
-
 
       <el-tabs v-model="activeTabs">
 
         <el-tab-pane label="业务详情" name="1">
 
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">

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

@@ -4,7 +4,6 @@
 
       style="width: 100%"
 
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
 
     >
 
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
 
       <div
 
         v-if="status === '2' && powers.some((item) => item == '049')"
 
         class="detail-page-title"

+ 0 - 5
src/views/sellOut/stockApply/detail.vue
View File 

@@ -3,11 +3,6 @@
 
     <div
 
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
 
     >
 
-      <!-- <p>
 
-        {{ status }}---{{ powers }}---{{ queryType }}---{{ activeTabs }}---{{
 
-          activeNames
 
-        }}
 
-      </p> -->
 
       <!-- <status-bar
 
         v-if="newTime !== '' && queryType === 'view'"
 
         :newTime="newTime"

+ 0 - 1
src/views/sellOut/zixunOrder/components/feedbackList.vue
View File 

@@ -84,7 +84,6 @@
 
           ></i>
 
         </el-tooltip>
 
 
-        <!-- {{ status }}-- {{ scope.row.status }} -->
 
         <el-tooltip
 
           v-if="
 
             powers &&

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