Merge pull request '物料添加字段' (#136) from liwei into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT/pulls/136
Reviewed-by: wangxy <xinyao.wang@le-it.com.cn>

src/views/plant/material/part.vue

@@ -212,10 +212,26 @@
               />
             </el-form-item>
           </el-col>
-
-
-
-
+          <el-col :span="12">
+            <el-form-item
+              :label="getColumnName('Article-Status')"
+              prop="Article-Status"
+            >
+              <el-select
+                v-model="form['Article-Status']"
+                filterable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in statusArray"
+                  :key="item['stdeftab-stdeftyp']"
+                  :label="item['stdeftab-bez']"
+                  :value="item['stdeftab-stdeftyp']"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <!-- 描述1 -->
             <el-form-item :label="getColumnName('Article-Descr1')">
@@ -228,7 +244,6 @@
               <el-input v-model="form['Article-Descr2']" placeholder="请输入" />
             </el-form-item>
           </el-col>
-          
           <el-col :span="12">
             <el-form-item :label="getColumnName('Article-QuantityPerHour')">
               <el-input
@@ -237,7 +252,6 @@
               />
             </el-form-item>
           </el-col>
-          
           <el-col :span="12">
             <el-form-item>
               <el-checkbox
@@ -485,8 +499,12 @@ export default {
         'Article-LearArtId':[
 					{ required: true, message: '此项不能为空', trigger: 'blur' }
 				],
+        'Article-Status':[
+					{ required: true, message: '此项不能为空', trigger: 'blur' }
+				],
       },
 			artSpecList:[], // 物料类型数据列表
+      statusArray:[], // 物料状态
     }
   },
   created() {
@@ -502,7 +520,7 @@ export default {
 		getProjectList().then(res => {
       this.projectArray = res.data
     })
-
+    this.getAtatusArrayList();
   },
   methods: {
 		// 物料类型中文映射
@@ -510,6 +528,15 @@ export default {
 			const item=this.artSpecList.find(e=> e['stdeftab-stdeftyp'] == value);
 			return item?item['stdeftab-bez'] : value
 		},
+    // 物料状态列表
+		getAtatusArrayList(){
+			this.getStanderOne({ statid: 'Article-Status' }).then(({data=[]}) => {
+				this.statusArray=data.map(()=>{
+          e['stdeftab-stdeftyp']= Number(e['stdeftab-stdeftyp']);
+          return e;
+        });
+			})
+		},
 		// 物料类型列表
 		getArtSpecList(){
 			this.getStanderOne({ statid: 'Article-ArtSpec1' }).then(({data=[]}) => {

src/views/productplan/workbench/order.vue

@@ -428,7 +428,9 @@ export default {
 			this.orderTypeArray = res.data
 		})
 		// 获取零件数据
-		getArticleList().then(res => {
+		getArticleList({
+			status:1
+		}).then(res => {
       this.articleArray = res.data
     })
 		// 获取产线数据
@@ -448,7 +450,9 @@ export default {
     /** 查询角色列表 */
     getList() {
       this.loading = true
-      getWorkorderList(this.queryParams).then(
+      getWorkorderList({
+				...this.queryParams,
+			}).then(
         response => {
           this.dataList = response.data.records
           this.total = response.data.count