2022-02-14 21:17

imcs-ui/src/lang/zh/runCenter.js

@@ -117,6 +117,7 @@ export default {
 			orderNo: '订单编号',
 			orderName: '订单名称',
 			bomName: '零件名称',
+			bomAlias: '产品代号',
 			deliveryTime: '订单交货期',
 			setCurrent: '设置产线运行模式',
 			setModel: '设置产线运行模式',
@@ -211,6 +212,7 @@ export default {
 				name: '零件名称',
 				partsAlias: '零件代号',
 				partsNo: '零件编号',
+				materialBrandName: '材料牌号',
 				specifications: '规格',
 				model: '型号',
 				brand: '品牌',

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

@@ -2,20 +2,24 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
+    	<!-- 名称 -->
     	<span>
     		<span>{{$t("prepare.searchForm.name")}}：</span>
     		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
+    	<!-- 品牌 -->
     	<span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.brand")}}：</span>
     		<el-select style="width:150px;" :placeholder='$t("common.pleaseSelect")' v-model="brand.key" value size="medium">
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.METERIAL_BRAND" />
         </el-select>
     	</span>
+    	<!-- 规格 -->
     	<span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.model")}}：</span>
     		<el-input v-model="queryParams.model.specification" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
+    	<!-- 状态 -->
     	<span style="margin-left: 15px;">
     		<span>{{$t("prepare.searchForm.status")}}：</span>
     		<el-select v-model="queryParams.model.status" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 150px;">
@@ -278,6 +282,7 @@
 	    },
 	    reset () {
 	      this.queryParams = initQueryParams({})
+	      this.brand = {key: ''};
 	      this.$refs.table.clearSort()
 	      this.$refs.table.clearFilter()
 	      this.search()