diff --git a/src/assets/css/base.css b/src/assets/css/base.css
index 0c10500..2b6f775 100644
--- a/src/assets/css/base.css
+++ b/src/assets/css/base.css
@@ -592,4 +592,7 @@ li {
.el-select-v2__caret{
margin-left: 10px;
margin-top: -5px;
+}
+.el-select-v2__wrapper.is-focused{
+ border-color:#CCCCCC;
}
\ 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 1f7c035..47e57f8 100644
--- a/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
+++ b/src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue
@@ -13,13 +13,15 @@
-
-
+ @visible-change="setAtrList">
+
+
@@ -74,9 +76,8 @@
-
@@ -445,7 +446,9 @@
articleList: {
default: [],
},
-
+ resourceList: {
+ default: [],
+ },
maxCoverPeriodTypeArray: {
default: [],
},
@@ -469,8 +472,7 @@
trigger: "blur",
}, ],
},
- articleOptions: [],
- mainResourceOptions:[],
+ artList: [],
loading: false,
formData: {},
articleStockLevel: {},
@@ -489,15 +491,7 @@
// 物料列表赋值
setAtrList(value) {
if (value) {
- 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
+ this.artList = this.articleList
}
},
addSecondaryResource() {
diff --git a/zr-deploy-config.json b/zr-deploy-config.json
new file mode 100644
index 0000000..668d103
--- /dev/null
+++ b/zr-deploy-config.json
@@ -0,0 +1,20 @@
+[
+ {
+ "local": {
+ "buildCommand": "build:dev",
+ "distDir": "./docs",
+ "distZip": "./docs.zip",
+ "tipsLang": "zh"
+ },
+ "server": {
+ "name": "server1",
+ "host": "101.201.121.115",
+ "port": "22",
+ "username": "administrator",
+ "password": "Leit2021@@",
+ "distDir": "C:/frontendApp/mds/test/",
+ "distZipName": "dist",
+ "bakeup": false
+ }
+ }
+]
\ No newline at end of file