Merge pull request '优化物料下拉列表框' (#170) from xuxiaoming into develop

Reviewed-on: #170

src/assets/css/base.css

@@ -538,4 +538,58 @@ li {
 }
 .el-tabs__header {
 	margin: 0 0 13px;
+}
+
+.el-select-v2 {
+	width: 100%;
+}
+ 
+
+/* input输入框样式 */
+.el-select-v2__wrapper {
+	background: #FFFFFF;
+	border-radius: 2px;
+	border: 2px solid #CCCCCC;
+	color: #5F6266;
+	height: 32px;
+	line-height: 30px;
+  margin-top: 3px;
+  padding-left: 8px;
+}
+ .el-select-v2 .el-input .el-input__inner {
+	background: #E9E9E9;
+	border-radius: 2px;
+	border: 1px solid #B7B7B7;
+ 
+}
+.el-select-v2__placeholder{
+	font-family: PingFang-SC-Medium, PingFang-SC;
+	font-weight: 500;
+	color: #5F6266;
+	line-height: 28px;
+	text-shadow: 0px 0px 0px #FFFFFF;
+}
+.el-select-v2__placeholder.is-transparent{
+  opacity: 1;
+}
+.el-select-dropdown__option-item:hover {
+	background: #2D9B8E;
+	color: #fff;
+}
+.el-select-dropdown__option-item.is-selected{
+  background: linear-gradient(180deg, #35B0A6 0%, #1E524D 100%);
+	color: #fff !important;
+}
+.el-form .el-select-v2__suffix {
+  top:18px;
+	right: -2px;
+	width: 48px;
+	height: 28px;
+	line-height: 28px;
+	border: 2px solid #CCCCCC;
+	background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 43%, #E7E7E7 100%);
+}
+.el-select-v2__caret{
+  margin-left: 10px;
+  margin-top: -5px;
 }

src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue

@@ -13,15 +13,13 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('ArtStockResourceData-ArtId')"
               prop="ArtStockResourceData-ArtId">
-            <el-select v-model="formData['ArtStockResourceData-ArtId']"
+            <el-select-v2 
+                v-model="formData['ArtStockResourceData-ArtId']"
                 placeholder="请选择"
                 :disabled="isAddOrEdit == 'edit'"
-                @visible-change="setAtrList">
-              <el-option v-for="item in artList"
-                  :key="item['Article-ArtId']"
-                  :label="item['Article-ArtId'] + '-' + item['Article-Descr1']"
-                  :value="item['Article-ArtId']" />
-            </el-select>
+                :options="articleOptions"
+                @visible-change="setAtrList" />
+             
           </el-form-item>
         </el-col>
       </el-row>
@@ -76,8 +74,9 @@
           <el-form-item :label="getColumnName('AP_ArticleResource-ResourceId')"
               prop="AP_ArticleResource-ResourceId">
             <el-select v-model="articleResource['AP_ArticleResource-ResourceId']"
+                @visible-change="setResourceList"
                 placeholder="请选择">
-              <el-option v-for="item in mainResourceList"
+              <el-option v-for="item in mainResourceOptions"
                   :key="item['AP_Resource-ResourceId']"
                   :label="item['AP_Resource-Descr']"
                   :value="item['AP_Resource-ResourceId']" />
@@ -446,9 +445,7 @@
       articleList: {
         default: [],
       },
-      resourceList: {
-        default: [],
-      },
+      
       maxCoverPeriodTypeArray: {
         default: [],
       },
@@ -472,7 +469,8 @@
             trigger: "blur",
           }, ],
         },
-        artList: [],
+        articleOptions: [],
+        mainResourceOptions:[],
         loading: false,
         formData: {},
         articleStockLevel: {},
@@ -491,7 +489,15 @@
       // 物料列表赋值
       setAtrList(value) {
         if (value) {
-          this.artList = this.articleList
+          this.articleOptions = this.articleList.map( (item) => ({
+            value: item["Article-ArtId"],
+            label: item["Article-ArtId"] + "-" + item["Article-Descr1"]
+          }))
+        }
+      },
+      setResourceList(value) {
+        if (value) {
+          this.mainResourceOptions = this.mainResourceList
         }
       },
       addSecondaryResource() {

src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue

@@ -132,7 +132,6 @@
       v-if="isAddOrEdit"
       :isAddOrEdit="isAddOrEdit"
       :item="item"
-
       :articleList="articleList"
       :maxCoverPeriodTypeArray="maxCoverPeriodTypeArray"
       :minCoverPeriodTypeArray="minCoverPeriodTypeArray"

vue.config.js

@@ -4,7 +4,9 @@ function resolve(dir) {
   return path.join(__dirname, '.', dir)
 }
 module.exports = {
+  runtimeCompiler: true ,
   chainWebpack: config => {
+
     config.module.rules.delete("svg"); //重点:删除默认配置中处理svg,
     config.module
       .rule('svg-sprite-loader')