Merge branch 'sit' into dev

dist/static/css/chunk-25ffc4de.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-415aa836.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-4d8c5f0a.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-5ce8d4ba.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-96c7fd04.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-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-15caf0ce.91994102.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-15caf0ce"],{"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"})}}},e=(i("e894"),i("2877"));e=Object(e.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=e.exports},"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},"44e6":function(t,s,i){},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},e894:function(t,s,i){"use strict";i("44e6")}}]);

dist/static/js/chunk-25ffc4de.102650f2.js

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

dist/static/js/chunk-5ce8d4ba.b627d305.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-5ce8d4ba"],{9406:function(t,a,i){"use strict";i.r(a);var c=i("5530"),e=i("2f62");c={name:"dashboard",data:function(){return{emptyGif:i("ff1f")}},computed:Object(c.a)({},Object(e.b)(["avatar"])),mounted:function(){}},i("9d69"),e=i("2877"),e=Object(e.a)(c,(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},"9cf7":function(t,a,i){},"9d69":function(t,a,i){"use strict";i("9cf7")},ff1f:function(t,a,i){t.exports=i.p+"static/img/welcome.6cf0f25b.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/views/goodStore/sort/addEditRate.vue

@@ -55,7 +55,7 @@
                 :size="'mini'"
                 :controls="false"
                 :append="'%'"
-                @reschange="order_rate_change"
+                @reschange="rate_change($event, 'order_rate')"
               />
             </el-form-item>
             <el-form-item label="成本→售价" prop="sale_rate">
@@ -69,13 +69,14 @@
                 :size="'mini'"
                 :controls="false"
                 :append="'%'"
-                @reschange="sale_rate_change"
+                @reschange="rate_change($event, 'sale_rate')"
               />
             </el-form-item>
-            <el-form-item label="最低毛利" prop="lower_rate">
+
+            <el-form-item label="主管利率" prop="rate">
               <digital-input
-                :values="ruleForm.lower_rate"
-                :placeholder="'最低毛利'"
+                :values="ruleForm.rate"
+                :placeholder="'主管利率'"
                 :min="-100"
                 :max="100000000000"
                 :position="'right'"
@@ -83,13 +84,27 @@
                 :size="'mini'"
                 :controls="false"
                 :append="'%'"
-                @reschange="lower_rate_change"
+                @reschange="rate_change($event, 'rate')"
               />
             </el-form-item>
-            <el-form-item label="单品修改下限" prop="rate">
+            <el-form-item label="财务利率" prop="money_rate">
               <digital-input
-                :values="ruleForm.rate"
-                :placeholder="'单品修改下限'"
+                :values="ruleForm.money_rate"
+                :placeholder="'财务利率'"
+                :min="-100"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'%'"
+                @reschange="rate_change($event, 'money_rate')"
+              />
+            </el-form-item>
+            <el-form-item label="项目最低毛利" prop="low_rate">
+              <digital-input
+                :values="ruleForm.low_rate"
+                :placeholder="'项目最低毛利'"
                 :min="-100"
                 :max="100000000000"
                 :position="'right'"
@@ -97,7 +112,21 @@
                 :size="'mini'"
                 :controls="false"
                 :append="'%'"
-                @reschange="rate_change"
+                @reschange="rate_change($event, 'low_rate')"
+              />
+            </el-form-item>
+            <el-form-item label="BOSS毛利率" prop="lower_rate">
+              <digital-input
+                :values="ruleForm.lower_rate"
+                :placeholder="'BOSS毛利率'"
+                :min="-100"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'%'"
+                @reschange="rate_change($event, 'lower_rate')"
               />
             </el-form-item>
           </el-form>
@@ -126,30 +155,51 @@ export default {
   props: ["showModel", "id", "sitem", "titleList"],
   mixins: [resToken],
   data() {
+    const validate_rate = (rule, value, callback) => {
+      const { required } = rule;
+      if (value === "" && required) {
+        callback(new Error("主管利率毛利率不能为空！"));
+      } else {
+        callback();
+      }
+    };
     const validate_order_rate = (rule, value, callback) => {
-      if (value === "") {
+      const { required } = rule;
+      if (value === "" && required) {
         callback(new Error("预算→成本毛利率不能为空！"));
       } else {
         callback();
       }
     };
     const validate_sale_rate = (rule, value, callback) => {
-      if (value === "") {
+      const { required } = rule;
+      if (value === "" && required) {
         callback(new Error("成本→售价毛利率不能为空！"));
       } else {
         callback();
       }
     };
+
     const validate_lower_rate = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("最低毛利率不能为空！"));
+      const { required } = rule;
+      if (value === "" && required) {
+        callback(new Error("BOSS毛利率不能为空！"));
       } else {
         callback();
       }
     };
-    const validate_rate = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("单品修改下限毛利率不能为空！"));
+    const validate_low_rate = (rule, value, callback) => {
+      const { required } = rule;
+      if (value === "" && required) {
+        callback(new Error("项目最低毛利率不能为空！"));
+      } else {
+        callback();
+      }
+    };
+    const validate_money_rate = (rule, value, callback) => {
+      const { required } = rule;
+      if (value === "" && required) {
+        callback(new Error("财务毛利率不能为空！"));
       } else {
         callback();
       }
@@ -165,6 +215,8 @@ export default {
         sale_rate: "0",
         lower_rate: "0",
         rate: "0",
+        low_rate: "0",
+        money_rate: "0",
       },
       rulesThis: this.rules,
       rules: {
@@ -175,9 +227,16 @@ export default {
           { required: true, validator: validate_sale_rate, trigger: "blur" },
         ],
         lower_rate: [
-          { required: true, validator: validate_lower_rate, trigger: "blur" },
+          { required: false, validator: validate_lower_rate, trigger: "blur" },
         ],
         rate: [{ required: true, validator: validate_rate, trigger: "blur" }],
+
+        low_rate: [
+          { required: true, validator: validate_low_rate, trigger: "blur" },
+        ],
+        money_rate: [
+          { required: true, validator: validate_money_rate, trigger: "blur" },
+        ],
       },
     };
   },
@@ -222,6 +281,8 @@ export default {
             lower_rate,
             rate,
             fund_code,
+            low_rate,
+            money_rate,
           } = this.sitem;
           this.ruleForm = {
             pid: pid || "",
@@ -232,31 +293,22 @@ export default {
             sale_rate: sale_rate || "0",
             lower_rate: lower_rate || "0",
             rate: rate || "0",
+            low_rate: low_rate || "0",
+            money_rate: money_rate || "0",
           };
         }
       });
     },
-    order_rate_change(e) {
-      this.ruleForm.order_rate = e + "";
-      this.$refs.ruleForm.validateField("order_rate");
-    },
-    sale_rate_change(e) {
-      this.ruleForm.sale_rate = e + "";
-      this.$refs.ruleForm.validateField("sale_rate");
-    },
-    lower_rate_change(e) {
-      this.ruleForm.lower_rate = e + "";
-      this.$refs.ruleForm.validateField("lower_rate");
-    },
-    rate_change(e) {
-      this.ruleForm.rate = e + "";
-      this.$refs.ruleForm.validateField("rate");
+    rate_change(e, key) {
+      this.ruleForm[key] = e + "";
+      this.$refs.ruleForm.validateField(key);
     },
 
     async initData() {
-      const res = await asyncRequest.detail({ id: this.sitem.id });
-      if (res && res.code === 0 && res.data) {
-        console.log(res.data);
+      const { code, data, message } = await asyncRequest.detail({
+        id: this.sitem.id,
+      });
+      if (code === 0) {
         const {
           pid,
           id,
@@ -266,7 +318,9 @@ export default {
           lower_rate,
           rate,
           fund_code,
-        } = res.data;
+          low_rate,
+          money_rate,
+        } = data;
         this.ruleForm = {
           pid: pid || "",
           id: id || "",
@@ -276,11 +330,13 @@ export default {
           sale_rate: sale_rate || "0",
           lower_rate: lower_rate || "0",
           rate: rate || "0",
+          low_rate: low_rate || "0",
+          money_rate: money_rate || "0",
         };
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(message);
       }
     },
     async submitForm() {

src/views/purchaseIn/workbench/detail.vue

@@ -94,12 +94,14 @@
                   {{ sitem.metal_name }}
                 </li>
 
-                <li>工艺说明：</li>
-                <li>{{ sitem.cost_desc }}</li>
+                <li v-if="sitem && sitem.cost_desc">工艺说明：</li>
+                <li v-if="sitem && sitem.cost_desc">{{ sitem.cost_desc }}</li>
                 <li>产品用途：</li>
                 <li>{{ sitem.use_desc }}</li>
                 <li>商品备注：</li>
                 <li>{{ sitem.remark }}</li>
+                <li>商品附件：</li>
+                <li v-if="sitem && sitem.enclosure_file "><a :href="sitem.enclosure_file" download="附件" class="fl" >点击下载附件</a></li>
               </ul>
             </div>
           </div>
@@ -162,7 +164,7 @@
               show-overflow-tooltip
             />
             <el-table-column
-              prop="sale_price"
+              prop="total_fee"
               label="成本合计"
               width="110"
               show-overflow-tooltip

src/views/sellOut/zixunOrder/components/addEditForm.vue

@@ -662,6 +662,7 @@ export default {
               pgNo: e.pgNo,
               total_weight: e.total_weight,
               is_gold_price: e.is_gold_price,
+              enclosure_file:e.enclosure_file,
               specinfo: [],
             };
             e.specinfo.forEach((a) => {

src/views/sellOut/zixunOrder/components/addEditGoodModal.vue

@@ -340,14 +340,15 @@
                       prop="enclosure_file"
                       class="activity-upload"
                     >
-                      <div v-if="ruleForm&&ruleForm.enclosure_file" class="clearfix">
-                        <a :href="ruleForm.enclosure_file" download="附件">点击下载</a>
+                      <div v-if="ruleForm&&ruleForm.enclosure_file" class="clearfix tl">
+                        <a :href="ruleForm.enclosure_file" download="附件" class="fl" >点击下载</a>
 
                         <el-link
                           :underline="false"
                           @click="deleteUrl()"
                           type="warning"
                           style="margin: 0 0 0 16px"
+                          class="fr"
                           >删除</el-link
                         >
                       </div>

src/views/sellOut/zixunOrder/components/editForm.vue

@@ -549,6 +549,55 @@
                       </div>
                     </el-form-item>
                   </el-col>
+                  <el-col :span="8" class="clear">
+                    <el-form-item
+                      label="附件"
+                      prop="enclosure_file"
+                      class="activity-upload"
+                    >
+                      <div
+                        v-if="ruleForm && ruleForm.enclosure_file"
+                        class="clearfix tl"
+                      >
+                        <a
+                          :href="ruleForm.enclosure_file"
+                          download="附件"
+                          class="fl"
+                          >点击下载</a
+                        >
+
+                        <el-link
+                          :underline="false"
+                          v-if="type !== 'view'"
+                          @click="deleteUrl()"
+                          type="warning"
+                          style="margin: 0 0 0 16px"
+                          class="fr"
+                          >删除</el-link
+                        >
+                      </div>
+
+                      <div class="activity-upload" v-else>
+                        <div class="btnupload" style="position: relative">
+                          <i class="el-icon-plus avatar-uploader-icon"></i>
+                          <file-upload-pdf
+                            class="Upload"
+                            :accept="'.zip,.rar,.7z'"
+                            :multiple="false"
+                            :uploadcondition="beforeOtherUpload"
+                            @UploadErrorEvent="UploadErrorOtherenclosure_file"
+                            @UploadSuccessEvent="
+                              UploadSuccessOtherenclosure_file
+                            "
+                          />
+                        </div>
+                        <div class="txt-tips fl">
+                          <p>建议大小：小于5MB</p>
+                          <p>文件格式：.zip,.rar,.7z</p>
+                        </div>
+                      </div>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8" v-show="is_noble">
                     <el-form-item label="金属种类" prop="metal_id">
                       <search-metal-kind
@@ -846,6 +895,7 @@ export default {
             p_good_img,
             p_arrtime,
             specinfo,
+            enclosure_file,
           } = JSON.parse(JSON.stringify(this.sitem));
           this.unit_name = unit_name;
           this.brand_name = brand;
@@ -908,6 +958,7 @@ export default {
             metal_id: metal_id || "",
             gold_price: gold_price || "",
             unit: unit ? [unit] : [],
+            enclosure_file: enclosure_file || "",
           };
           if (this.ruleForm.projectNo && this.ruleForm.projectNo.length === 1) {
             await this.selectChange(this.ruleForm.projectNo);
@@ -1228,6 +1279,50 @@ export default {
         this.$refs.ruleForm.validateField("good_img");
       }
     },
+    //其他文件上传失败
+    UploadErrorOtherenclosure_file(res) {
+      if (res !== "break") {
+        this.$refs.ruleForm.validateField("enclosure_file");
+      }
+    },
+
+    //判断其他文件规格
+    beforeOtherUpload(file) {
+      let isJPG = false;
+      if (file.type === "application/x-zip-compressed") {
+        isJPG = true;
+      }
+      let name = file.name;
+      let list = name.split(".");
+      if (list[list.length - 1] === "rar" || list[list.length - 1] === "7z") {
+        isJPG = true;
+      }
+
+      const isLt2M = file.size / 1024 / 1024 < 5;
+      if (!isJPG) {
+        this.$message.error("文件格式不正确！");
+      }
+      if (!isLt2M) {
+        this.$message.error("文件大小不能超过 5MB!");
+      }
+      return isJPG && isLt2M;
+    },
+
+    deleteUrl() {
+      this.ruleForm.enclosure_file = "";
+      this.$refs.ruleForm.validateField("enclosure_file");
+    },
+    // 其他文件上传成功
+    async UploadSuccessOtherenclosure_file(data) {
+      const { url } = data;
+      console.log(url);
+      if (url === "noToken") {
+        await this.logout();
+      } else {
+        this.ruleForm.enclosure_file = url;
+        this.$message.success("附件上传成功!");
+      }
+    },
   },
 };
 </script>