diff --git a/src/assets/css/base.css b/src/assets/css/base.css
index fe45148..0c10500 100644
--- a/src/assets/css/base.css
+++ b/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;
}
\ No newline at end of file
diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
index 47e57f8..1f7c035 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
@@ -13,15 +13,13 @@
-
-
-
+ :options="articleOptions"
+ @visible-change="setAtrList" />
+
@@ -76,8 +74,9 @@
-
@@ -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() {
diff --git a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
index 7bd0f8c..b043a94 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
@@ -132,7 +132,6 @@
v-if="isAddOrEdit"
:isAddOrEdit="isAddOrEdit"
:item="item"
-
:articleList="articleList"
:maxCoverPeriodTypeArray="maxCoverPeriodTypeArray"
:minCoverPeriodTypeArray="minCoverPeriodTypeArray"
diff --git a/vue.config.js b/vue.config.js
index 58351fd..efc5910 100644
--- a/vue.config.js
+++ b/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')