Merge branch 'develop' into xuxiaoming

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

@@ -3,7 +3,8 @@
     <SearchTemplate>
       <el-form :inline="true" class="clearfix search-content">
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-ArtId')">
-            <el-select
+						<el-input v-model="queryParams.ArtId" placeholder="请输入" clearable></el-input>
+            <!-- <el-select
               v-model="queryParams.ArtId"
               placeholder="请选择"
             >
@@ -13,7 +14,7 @@
                 :label="item['Article-ArtId']+'-'+item['Article-Descr1']"
                 :value="item['Article-ArtId']"
               />
-            </el-select>
+            </el-select> -->
         </el-form-item>
           <el-form-item :label="getColumnName('AP_ArticleStockLevel-CompleteStatus')">
             <el-select

src/views/plan/workbench/homePage/formal/analysis/index.vue

@@ -88,7 +88,7 @@ export default {
 		return {
 			queryParams: {},
 			withTheRingRadio: "1", // 同比或者环比
-			allTheSingle: "2", // 所有超差或者指定零件
+			allTheSingle: "1", // 所有超差或者指定零件
 			versionData: [], // 版本列表
 			tableData: [],
 			loading: false,