Merge remote-tracking branch 'origin/master' into master

imcs-ui/src/views/zuihou/prepareProductMgr/bomMgr/Index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="filter-container">
     	<span>
-	    	<el-radio-group v-model="queryParams.model.auditStatus">
+	    	<el-radio-group v-model="queryParams.model.audit_status" @change="search()">
 		      <el-radio-button label="2">{{$t("prepare.searchForm.auditStatuss.two")}}</el-radio-button>
 		      <el-radio-button label="1">{{$t("prepare.searchForm.auditStatuss.one")}}</el-radio-button>
 		      <el-radio-button label="3">{{$t("prepare.searchForm.auditStatuss.three")}}</el-radio-button>
@@ -36,7 +36,7 @@
 
    	<div class="filter-container">
    		<!--<span>
-    		<span>{{$t("prepare.searchForm.auditStatus")}}：</span>
+    		<span>{{$t("prepare.searchForm.audit_status")}}：</span>
     		<el-select v-model="queryParams.model.audit_status" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 180px;">
         	<el-option
 			      v-for="item in qiyongStatus"
@@ -48,11 +48,11 @@
     	</span>-->
     	<span>
     		<span>{{$t("prepare.searchForm.parts_no")}}：</span>
-    		<el-input v-model="queryParams.model.partsNo" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    		<el-input v-model="queryParams.model.parts_no" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.bomAlias")}}：</span>
-    		<el-input v-model="queryParams.model.bomAlias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    		<el-input v-model="queryParams.model.bom_alias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.parts_name")}}：</span>
@@ -60,7 +60,7 @@
     	</span>
       <span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.partsAlias")}}：</span>
-    		<el-input v-model="queryParams.model.partsAlias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
+    		<el-input v-model="queryParams.model.parts_alias" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
       <span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">