Merge branch 'sit'

dist/static/css/chunk-09413a44.68d53367.css

@@ -1 +0,0 @@
-.change-password{background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password .change{padding:0 18% 0 0}.change-password .change .title{border-width:0;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.change-password[data-v-47333433]{min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2}.change-password .login-form[data-v-47333433]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.change-password .login-form .el-form-item__label[data-v-47333433]{height:49px;line-height:49px}

dist/static/css/chunk-1abecf4c.41b5526a.css

@@ -1 +0,0 @@
-.dashboard-container[data-v-6bdd809c]{padding:0 0 0 0;position:relative;width:100%;min-height:calc(100vh - 50px);display:inline-block;background-color:#e3e3e3}.emptyGif[data-v-6bdd809c]{display:block;width:100%;margin:0 auto}.dashboard-editor-container[data-v-6bdd809c]{position:relative;min-height:100%;width:100%;padding:0 6% 0 0;text-align:center}.dashboard-editor-container .info-container[data-v-6bdd809c]{display:block;width:60%;text-align:center;margin:0 auto;padding:10vh 0 0 0}.dashboard-editor-container .info-container .welcome-title[data-v-6bdd809c]{vertical-align:top;padding:0;margin:0 0 0 18px;color:#97a8be;display:inline-block;height:130px;line-height:130px;font-size:45px}.dashboard-editor-container img[data-v-6bdd809c]{display:block;-webkit-box-flex:1;-ms-flex:1;flex:1}

dist/static/css/chunk-2a52459a.149d0cab.css

@@ -1 +0,0 @@
-.change{padding:0 18% 0 0;background:#f2f2f2;min-height:100%;height:100%;overflow:hidden;position:absolute;z-index:2}.change,.change .title{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.change .title{border-width:0;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px}.change-mobile{background:#f2f2f2}@supports (-webkit-mask:none) and (not (cater-color:#fff)){.change-mobile .el-input input{color:#fff}}.change-mobile .el-input input{color:#000}.change-mobile .el-form-item{border:1px solid hsla(0,0%,100%,.1);color:#454545}.change-mobile[data-v-64208de8]{min-height:100%;width:100%;height:100%;background-color:#f2f2f2;overflow:hidden;position:absolute;z-index:2;background:#fff}.change-mobile .login-form[data-v-64208de8]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.change-mobile .login-form .el-form-item__label[data-v-64208de8]{height:49px;line-height:49px}.change-mobile .login-form .el-form-item__content[data-v-64208de8]:after,.change-mobile .login-form .el-form-item__content[data-v-64208de8]:before{content:"";display:block;clear:both}.change-mobile .tips[data-v-64208de8]{font-size:14px;color:#fff;margin-bottom:10px}.change-mobile .tips span[data-v-64208de8]:first-of-type{margin-right:16px}.change-mobile .svg-container[data-v-64208de8]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.change-mobile .show-pwd[data-v-64208de8]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.change-mobile .thirdparty-button[data-v-64208de8]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.change-mobile .thirdparty-button[data-v-64208de8]{display:none}}

dist/static/css/chunk-3bc89c67.15c23872.css

@@ -1 +0,0 @@
-.my-messagge-page{text-align:center;background:#f2f2f2;min-height:100%;width:100%;height:100%;overflow:hidden;position:absolute;z-index:2;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change{padding:0 8% 0 0}.my-messagge-page .change .title{border-width:0;height:170px;display:-webkit-box;display:-ms-flexbox;display:flex;font-weight:400;font-style:normal;font-size:22px;text-align:left;padding:0;padding:60px 0 0 100px;width:100%;-webkit-box-sizing:border-box;box-sizing:border-box}.my-messagge-page .change-main{width:370px;margin:0 auto;text-align:left}.my-messagge-page .infor{padding:0 0 40px 0}.my-messagge-page .infor .tr{text-align:right;padding:0 15px 0 0}@supports (-webkit-mask:none) and (not (cater-color:#fff)){.my-messagge .el-input input{color:#fff}}.my-messagge[data-v-27685a3c]{min-height:100%;width:100%;height:100%;background-color:#f2f2f2;overflow:hidden;position:absolute;z-index:2;background:#fff}.my-messagge .login-form[data-v-27685a3c]{position:relative;width:415px;max-width:100%;height:100%;padding:50px 35px 150px 35px;margin:0 auto;overflow:hidden}.my-messagge .login-form .el-form-item__label[data-v-27685a3c]{height:49px;line-height:49px}.my-messagge .tips[data-v-27685a3c]{font-size:14px;color:#fff;margin-bottom:10px}.my-messagge .tips span[data-v-27685a3c]:first-of-type{margin-right:16px}.my-messagge .svg-container[data-v-27685a3c]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.my-messagge .show-pwd[data-v-27685a3c]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.my-messagge .thirdparty-button[data-v-27685a3c]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.my-messagge .thirdparty-button[data-v-27685a3c]{display:none}}

dist/static/css/chunk-bbbb90b4.11a605cd.css

@@ -1 +0,0 @@
-.dingLoading[data-v-17af7bec]{text-align:center;width:100%}.dingLoading img[data-v-17af7bec]{display:inline-block;width:152px;margin:0 auto;padding-top:100px}

dist/static/css/chunk-elementUI.6e808e7d.css

@@ -1 +0,0 @@
-@media only screen and (max-width:767px){.hidden-xs-only{display:none!important}}@media only screen and (min-width:768px){.hidden-sm-and-up{display:none!important}}@media only screen and (min-width:768px) and (max-width:991px){.hidden-sm-only{display:none!important}}@media only screen and (max-width:991px){.hidden-sm-and-down{display:none!important}}@media only screen and (min-width:992px){.hidden-md-and-up{display:none!important}}@media only screen and (min-width:992px) and (max-width:1199px){.hidden-md-only{display:none!important}}@media only screen and (max-width:1199px){.hidden-md-and-down{display:none!important}}@media only screen and (min-width:1200px){.hidden-lg-and-up{display:none!important}}@media only screen and (min-width:1200px) and (max-width:1919px){.hidden-lg-only{display:none!important}}@media only screen and (max-width:1919px){.hidden-lg-and-down{display:none!important}}@media only screen and (min-width:1920px){.hidden-xl-only{display:none!important}}

dist/static/js/chunk-1abecf4c.d1614ea4.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-1abecf4c"],{9406:function(t,a,i){"use strict";i.r(a);var e=i("5530"),n=i("2f62");e={name:"dashboard",data:function(){return{emptyGif:i("ff1f")}},computed:Object(e.a)({},Object(n.b)(["avatar"])),mounted:function(){}},i("9d69"),n=i("2877"),e=Object(n.a)(e,(function(){var t=this,a=t.$createElement;a=t._self._c||a;return a("div",{staticClass:"dashboard-container"},[a("div",{staticClass:"dashboard-editor-container"},[a("div",{staticClass:"info-container clearfix"},[a("pan-thumb",{attrs:{image:t.avatar,width:"130px",height:"130px"}}),a("span",{staticClass:"welcome-title"},[t._v("欢迎登录采销平台")])],1),a("img",{staticStyle:{width:"60%",margin:"-30px auto 0 auto"},attrs:{src:t.emptyGif}})])])}),[],!1,null,"6bdd809c",null);a.default=e.exports},"9d69":function(t,a,i){"use strict";i("a7f4")},a7f4:function(t,a,i){},ff1f:function(t,a,i){t.exports=i.p+"static/img/welcome.6cf0f25b.gif"}}]);

dist/static/js/chunk-95806aaa.754ea454.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-95806aaa"],{"1db4":function(t,s,i){"use strict";i.r(s);var c=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"pic-404"},[t("img",{staticClass:"pic-404__parent",attrs:{src:i("a36b"),alt:"404"}}),t("img",{staticClass:"pic-404__child left",attrs:{src:i("26fc"),alt:"404"}}),t("img",{staticClass:"pic-404__child mid",attrs:{src:i("26fc"),alt:"404"}}),t("img",{staticClass:"pic-404__child right",attrs:{src:i("26fc"),alt:"404"}})])}],a={name:"Page404",computed:{message:function(){return"访问的页面不存在..."}},methods:{goto:function(){window.vm.$router.push({path:"/welcome/dashboard"})}}},n=(i("e894"),i("2877"));c=Object(n.a)(a,(function(){var t=this,s=t.$createElement;s=t._self._c||s;return s("div",{staticClass:"wscn-http404-container"},[s("div",{staticClass:"wscn-http404"},[t._m(0),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__oops"},[t._v("哎呀！")]),s("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message))]),s("div",{staticClass:"bullshit__info"},[t._v(" 请检查您输入的网址是否正确，或单击下面的按钮返回主页. ")]),s("el-button",{attrs:{type:"primary",round:""},on:{click:function(s){return t.goto()}}},[t._v("回到首页")])],1)])])}),c,!1,null,"82eac96e",null);s.default=c.exports},"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},c980:function(t,s,i){},e894:function(t,s,i){"use strict";i("c980")}}]);

dist/static/js/chunk-bbbb90b4.f6c0635c.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-bbbb90b4"],{"04c0":function(t,n,c){"use strict";c("56c0")},"56c0":function(t,n,c){},"7e10":function(t,n,c){"use strict";c.r(n);var e=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"dingLoading"},[t("img",{attrs:{src:c("f8b2"),alt:""}})])}],i={name:"loadingPage",data:function(){return{}},mounted:function(){}},a=(c("04c0"),c("2877"));e=Object(a.a)(i,(function(){var t=this;t.$createElement;return t._self._c,t._m(0)}),e,!1,null,"17af7bec",null);n.default=e.exports},f8b2:function(t,n,c){t.exports=c.p+"static/img/loading.190c78aa.gif"}}]);

dist/static/js/runtime.js

@@ -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();
+/******/ })
+/************************************************************************/
+/******/ ([]);

src/apis/service/sellOut/project/index.js

@@ -27,4 +27,8 @@ export default {
   project_online_good_add: (data, params) => http(api + "projectaddfed", data, "post", params),
   // 删除已添加的线上商品
   project_online_good_del: (data, params) => http(api + "projectfeeddel", data, "post", params),
+  // 制作方案
+  project_make_plan: (data, params) => http(api + "plancreate", data, "post", params),
+  // 查询方案列表
+  pget_project_plan: (data, params) => http(api + "projectplan", data, "post", params),
 };

src/config/env.production.js

@@ -17,5 +17,6 @@ module.exports = {
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     //应用凭证
     AgentId:"1324690581"
+    
   }
 }

src/views/goodStore/brand/addEdit.vue

@@ -78,7 +78,7 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/brand";
 import resToken from "@/mixins/resToken";
-import { hasChinese } from "@/utils/validate";
+import { isChinese } from "@/utils/validate";
 export default {
   name: "brand",
   props: ["showModel", "id", "sitem"],
@@ -87,7 +87,7 @@ export default {
     const validateusername = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("品牌名称不能为空！"));
-      } else if (!hasChinese(value)) {
+      } else if (!isChinese(value)) {
         callback(new Error("品牌名称必须包含汉字！"));
       } else {
         callback();

src/views/goodStore/sort/addEdit.vue

@@ -88,7 +88,7 @@
 <script>
 import asyncRequest from "@/apis/service/goodStore/sort";
 import resToken from "@/mixins/resToken";
-import { hasChinese } from "@/utils/validate";
+import { isChinese } from "@/utils/validate";
 export default {
   name: "sort",
   props: ["showModel", "id", "sitem", "titleList"],
@@ -97,7 +97,7 @@ export default {
     const validate_fund_code = (rule, value, callback) => {
       if (value === "") {
         callback();
-      } else if (hasChinese(value)) {
+      } else if (isChinese(value)) {
         callback(new Error("财务核算码不能包含汉字！"));
       } else {
         callback();

src/views/sellOut/project/components/columnsForm.js

@@ -1,9 +1,11 @@
 export default [
+    
     {
-        prop: "num",
-        label: "商品编号",
-        width: '110px'
+        prop: "pgNo",
+        label: "要求编号",
+        width: '180px'
     },
+    
     {
         prop: "sale_price",
         label: "销售单价",

src/views/sellOut/project/components/setPlan.vue

@@ -11,6 +11,8 @@
             stripe
             style="width: 100%"
           >
+            <el-table-column label="要求编码" prop="pgNo" width="180px" />
+
             <el-table-column prop="good_type" label="商品类型" width="80px">
               <template slot-scope="scope">
                 <el-tag
@@ -48,44 +50,252 @@
           </el-table>
         </template>
       </div>
-      <div class="project-setPlan-title">客户反馈商品情况</div>
+      <div class="project-setPlan-title">客户意向商品</div>
       <div class="project-setPlan-backGood-table">
-        <template v-if="tableData">
-          <ex-table
-            v-loading="loading"
-            :table="table"
-            :data="tableData"
-            :columns="columns"
-            :page="pageInfo"
+        <el-table
+          :data="tableData"
+          :size="'mini'"
+          border
+          stripe
+          ref="multipleTable"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="40"
+            v-if="table_type === 'add'"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="pgNo"
+            label="要求编码"
+            width="180px"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="sale_price"
+            label="销售单价"
+            width="110"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="num"
+            label="购买数量"
+            width="110"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="good_img"
+            label="图片"
+            width="50"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="scope.row.good_img"
+                style="width: 20px; height: 20px"
+                class="hover"
+                v-viewer
+              >
+                <img
+                  :src="scope.row.good_img"
+                  style="display: inline-block; width: 100%; height: 100%"
+                  alt=""
+                />
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="good_name"
+            label="商品名称"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="class_cat"
+            label="商品分类"
+            show-overflow-tooltip
+          />
+          <el-table-column prop="model" label="规格" show-overflow-tooltip />
+          <el-table-column
+            prop="expiry_day"
+            label="信息有效期"
+            width="85"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="work_day"
+            label="制作工期"
+            width="85"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="delivery_day"
+            label="物流时间"
+            width="85"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+      <div class="project-setPlan-title">
+        方案制定
+        <el-button-group
+          :size="'mini'"
+          class="fr"
+          v-if="table_type === 'list'"
+          style="margin: 8px 0 0 0"
+        >
+          <el-button
+            class="fr"
+            type="primary"
+            :size="'mini'"
+            v-if="index !== 0 && total !== 0"
+            icon="el-icon-arrow-left"
+            @click="index--, change_plan()"
+          ></el-button>
+          <el-button
+            type="primary"
+            class="fr"
+            v-if="total !== 0"
             :size="'mini'"
-            @page-curr-change="handlePageChange($event)"
-            @page-size-change="handleSizeChange($event)"
-            @screen-reset="
-              pageInfo.curr = 1;
-              page = 1;
-              searchList();
-            "
-            @screen-submit="
-              pageInfo.curr = 1;
-              page = 1;
-              searchList();
-            "
+            style="height: 29px"
+            >方案共{{ index + 1 }}/{{ total }}</el-button
           >
-            <template #operation="{ scope }">
-              <el-tooltip
-                effect="dark"
-                content="删除"
-                placement="top"
-                v-if="scope.row.data_source === '1'"
+          <el-button
+            type="primary"
+            class="fr"
+            v-if="index + 1 !== total && total !== 0"
+            @click="index++, change_plan()"
+            :size="'mini'"
+            ><i class="el-icon-arrow-right el-icon--right" :size="'mini'"></i
+          ></el-button>
+          <el-button
+            type="primary"
+            class="fr"
+            @click="add_plan"
+            icon="el-icon-circle-plus-outline"
+            :size="'mini'"
+            >添加方案
+          </el-button>
+        </el-button-group>
+        <el-button-group
+          :size="'mini'"
+          class="fr"
+          v-else-if="table_type === 'add'"
+          style="margin: 8px 0 0 0"
+        >
+          <el-button
+            class="fr"
+            type="primary"
+            :size="'mini'"
+            icon="el-icon-arrow-left"
+            @click="back_list"
+            >返回列表</el-button
+          >
+          <el-button type="primary" class="fr" @click="save_plan" :size="'mini'"
+            >保存方案<i class="el-icon-upload el-icon--right"></i>
+          </el-button>
+        </el-button-group>
+      </div>
+      <div class="project-setPlan-backGood-table">
+        <el-table
+          :data="plan_tableData"
+          :size="'mini'"
+          border
+          stripe
+          ref="multipleTable"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            prop="pgNo"
+            label="要求编码"
+            width="180px"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="sale_price"
+            label="销售单价"
+            width="110"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="sale_price"
+            label="销售单价"
+            width="110"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <digital-input
+                :values="scope.row.sale_price"
+                :placeholder="'起订量'"
+                :min="0"
+                :max="100000000000"
+                :position="'right'"
+                :precision="0"
+                :controls="false"
+                :append="''"
+                @reschange="moq_num_change($event, scope.$index)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="num"
+            label="购买数量"
+            width="110"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="good_img"
+            label="图片"
+            width="50"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div
+                v-if="scope.row.good_img"
+                style="width: 20px; height: 20px"
+                class="hover"
+                v-viewer
               >
-                <i
-                  class="el-icon-delete tb-icon"
-                  @click="deleteId(scope.row.id)"
-                ></i>
-              </el-tooltip>
+                <img
+                  :src="scope.row.good_img"
+                  style="display: inline-block; width: 100%; height: 100%"
+                  alt=""
+                />
+              </div>
             </template>
-          </ex-table>
-        </template>
+          </el-table-column>
+          <el-table-column
+            prop="good_name"
+            label="商品名称"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="class_cat"
+            label="商品分类"
+            show-overflow-tooltip
+          />
+          <el-table-column prop="model" label="规格" show-overflow-tooltip />
+          <el-table-column
+            prop="expiry_day"
+            label="信息有效期"
+            width="85"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="work_day"
+            label="制作工期"
+            width="85"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            prop="delivery_day"
+            label="物流时间"
+            width="85"
+            show-overflow-tooltip
+          />
+        </el-table>
       </div>
     </div>
   </div>
@@ -116,7 +326,11 @@ export default {
       showModel: false,
       searchItem: {},
       loading: false,
+      allPlanList: [],
       ladder: [],
+      index: 0,
+      total: 0,
+      table_type: "list",
       //   allList: [],
       projectNo: "",
       statusOptions: [
@@ -130,6 +344,9 @@ export default {
       },
       // 表格 - 列参数
       columns: columnsForm,
+      tableData: [],
+      multipleSelection: [],
+      plan_tableData: [],
     };
   },
   mounted() {
@@ -152,6 +369,16 @@ export default {
       this.tableData = [];
       await this.searchList();
     },
+    back_list() {
+      this.table_type = "list";
+    },
+    add_plan() {
+      this.table_type = "add";
+    },
+    moq_num_change(e, index) {
+      this.plan_tableData[index].sale_pricee = e + "";
+      this.$set(this.plan_tableData, index, this.plan_tableData[index]);
+    },
     //初始化整个组件
     async initListData() {
       console.log(this.sitem);
@@ -159,24 +386,27 @@ export default {
       this.projectNo = projectNo;
       this.ladder = JSON.parse(JSON.stringify(ladder));
       this.pageInfo = {
-        size: 15,
+        size: 100,
         curr: 1,
         total: 0,
       };
       this.tableData = [];
-      await  this.searchList()
-    },
-    //页数选择
-    async handlePageChange(e) {
-      this.pageInfo.curr = e;
       await this.searchList();
     },
-    //页面条数选择
-    async handleSizeChange(e) {
-      this.pageInfo.curr = 1;
-      this.pageInfo.size = e;
-      await this.searchList();
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+      let list = JSON.parse(JSON.stringify(this.plan_tableData));
+      this.plan_tableData = [];
+      this.multipleSelection.forEach((a, i) => {
+        let fi = list.findIndex((b) => a.id === b.id && b.pgNo === a.pgNo);
+        if (fi !== -1) {
+          this.plan_tableData.push(list[fi]);
+        } else {
+          this.plan_tableData.push(this.multipleSelection[i]);
+        }
+      });
     },
+
     async searchList() {
       const { size, curr } = this.pageInfo;
       this.loading = true;
@@ -212,6 +442,96 @@ export default {
       }
       this.loading = false;
     },
+    //保存方案
+    async save_plan() {
+      if (!this.loading) {
+        let list = JSON.parse(JSON.stringify(this.plan_tableData));
+        let isok = true;
+        list.forEach((a) => {
+          let findex = list.findIndex(
+            (b) => b.pgNo === a.pgNo && a.id !== b.id
+          );
+          if (findex !== -1) {
+            isok = false;
+          }
+        });
+        if (!isok) {
+          this.$message.warning("一种商品要求只能选择一种商品！");
+          return;
+        }
+        let isall = true;
+        this.ladder.forEach((a) => {
+          let to = 0;
+          list.forEach((b) => {
+            if (a.pgNo === b.pgNo) {
+              to++;
+            }
+          });
+          if (to !== 1) {
+            isall = false;
+          }
+        });
+        if (!isall) {
+          this.$message.warning("方案必须涵盖全部商品要求！");
+          return;
+        }
+        this.loading = true;
+        let model = {
+          feedback: [],
+          projectNo: this.projectNo,
+        };
+
+        this.plan_tableData.forEach((e) => {
+          let si = {
+            id: e.id,
+            plan_Price: "0",
+          };
+          model.push(si);
+        });
+        const { code, data } = await asyncRequest.project_make_plan(model);
+        if (code === 0) {
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+        this.loading = false;
+      }
+    },
+    //获取全部方案
+    async get_plan(type) {
+      if (!this.loading) {
+        this.loading = true;
+        let model = {
+          projectNo: this.projectNo,
+        };
+        const { code, data } = await asyncRequest.pget_project_plan(model);
+        if (code === 0) {
+          const { plan } = data;
+          this.allPlanList = JSON.parse(JSON.stringify(plan));
+          this.total = this.allPlanList.length;
+          if (type) {
+            await this.change_plan("1");
+          }
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(res.message);
+        }
+        this.loading = false;
+      }
+    },
+    //切换当前展示的方案
+    async change_plan(type) {
+      this.table_type = "list";
+      if (type) {
+        this.index = 0;
+      }
+
+      this.plan_tableData = JSON.parse(
+        JSON.stringify(this.allPlanList[this.index])
+      );
+    },
   },
 };
 </script>