From 12e31595cb1400eec8ca3919430d1d1726f2795a Mon Sep 17 00:00:00 2001
From: xuxiaoming <xiaoming.xu@le-it.com.cn>
Date: Fri, 31 Dec 2021 16:18:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dselelct=E6=9C=AA=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/base.css                       |  3 ++
 .../artStockResource/addOrEdit.vue            | 32 ++++++++-----------
 zr-deploy-config.json                         | 20 ++++++++++++
 3 files changed, 36 insertions(+), 19 deletions(-)
 create mode 100644 zr-deploy-config.json

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 @@
         <el-col :span="6">
           <el-form-item :label="getColumnName('ArtStockResourceData-ArtId')"
               prop="ArtStockResourceData-ArtId">
-            <el-select-v2 
-                v-model="formData['ArtStockResourceData-ArtId']"
+            <el-select v-model="formData['ArtStockResourceData-ArtId']"
                 placeholder="请选择"
                 :disabled="isAddOrEdit == 'edit'"
-                :options="articleOptions"
-                @visible-change="setAtrList" />
-             
+                @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>
           </el-form-item>
         </el-col>
       </el-row>
@@ -74,9 +76,8 @@
           <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 mainResourceOptions"
+              <el-option v-for="item in mainResourceList"
                   :key="item['AP_Resource-ResourceId']"
                   :label="item['AP_Resource-Descr']"
                   :value="item['AP_Resource-ResourceId']" />
@@ -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