Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy

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

@@ -219,6 +219,7 @@ export default {
         })
          this.getStanderOne({ statid: 'AP_ArticleStockLevel-CompleteStatus' }).then((res) => {
           this.completeStatusList = res.data
+          console.log(this.completeStatusList);
         })
     }
   },

src/views/factoryModel/part/material/addOrEdit.vue

@@ -137,10 +137,19 @@
             :label="getColumnName('Article-ArtSpec4')"
             prop="Article-ArtSpec4"
           >
-          <el-input
+            <el-select
               v-model="formData['Article-ArtSpec4']"
-              placeholder="请输入"
-            />
+              filterable
+              placeholder="请选择"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in attributeArray"
+                :key="item['Attribute-AttrCode']"
+                :label="item['Attribute-AttrName']"
+                :value="item['Attribute-AttrCode']"
+              />
+            </el-select>
 
           </el-form-item>
         </el-col>