Merge pull request '添加状态筛选' (#172) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/172

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

@@ -15,6 +15,7 @@
               prop="ArtStockResourceData-ArtId">
             <el-select v-model="formData['ArtStockResourceData-ArtId']"
                 placeholder="请选择"
+                filterable
                 :disabled="isAddOrEdit == 'edit'"
                 @visible-change="setAtrList">
               <el-option v-for="item in artList"

src/views/plan/workbench/lookError/index.vue

@@ -10,6 +10,19 @@
             style="width: 240px"
           />
         </el-form-item>
+       <el-form-item :label="getColumnName('AP_ErrorDatalst-ErrorStatus')">
+          <el-select
+              v-model="queryParams.ErrorStatus"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in statusOptions" 
+                :key="item['Stdef-StdefTyp']"
+                :label="item['Stdef-Bez']"
+                :value="item['Stdef-StdefTyp']"
+              />
+            </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             icon="el-icon-search"
@@ -64,6 +77,7 @@ export default {
   mixins: [ListMixin],
   data() {
     return {
+      statusOptions:[],
       queryTableDataUrl: "/admin/ap/errordatalst/query",
       headers: [
         "AP_ErrorDatalst-Id",
@@ -91,6 +105,9 @@ export default {
     },
   },
   mounted() {
+    this.getStanderOne({ statid: 'AP_ErrorDatalst-ErrorStatus' }).then((res) => {
+      this.statusOptions = res.data
+    })
     this.$nextTick(() => {
       this.tableHeight = this.calculationTableHeight(
         this.$refs.tableRef,

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/addOrEdit.vue

@@ -118,6 +118,13 @@
                 placeholder="请输入" />
           </el-form-item>
         </el-col>
+         <el-col :span="12">
+          <el-form-item :label="getColumnName('AP_MpsSetting-DefaultLookAheadWeeks')"
+              prop="AP_MpsSetting-DefaultLookAheadWeeks">
+            <el-input v-model.number="formData['AP_MpsSetting-DefaultLookAheadWeeks']"
+                placeholder="请输入" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template #footer>