Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/utils/enum.js

@@ -184,4 +184,12 @@ export const schedulePeriodEnum = new EnumFactory({
   'minutes': '分钟',
   'hours': '小时',
   'days': '天',
-})
+})
+
+export const wmState = new EnumFactory({
+  10: { text: '合格', type: 'success' },
+  20: { text: '不合格', type: 'warning' },
+  30: { text: '返修', type: 'warning' },
+  40: { text: '检验', type: 'primary' },
+  50: { text: '报废', type: 'danger' },
+}, parseInt)

src/views/wpm_gx/inm.vue

@@ -36,11 +36,18 @@
 				:params="params"
 				:query="query"
 			>
-				<el-table-column
+			<el-table-column
-					label="#"
+			label="状态"
-					type="index"
+			prop="state"
-					width="50"
+			width="100"
-				></el-table-column>
+		><template #default="scope"
+								><el-tag
+									:type="wmState[scope.row.state]?.type"
+									>{{
+										wmState[scope.row.state]?.text
+									}}</el-tag
+								>
+							</template></el-table-column>
 				<el-table-column
 					label="物料名称"
 					prop="material_name"
@@ -71,7 +78,7 @@
 					prop="count"
 					min-width="80"
 				></el-table-column>
-				<el-table-column
+				<!-- <el-table-column
 				v-if="mgroupName=='size'||mgroupName=='facade'"
 					label="检验状态"
 				>
@@ -79,7 +86,7 @@
 						<el-tag type="success" v-if="scope.row.count_xtest == null">已检验</el-tag>
 						<el-tag type="primary" v-else>未检验 </el-tag>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column
 					label="不合格标记"
 					prop="notok_sign_name"
@@ -130,6 +137,7 @@
 	</el-container>
 </template>
 <script>
+import { wmState } from "@/utils/enum.js";
 import materials from "./../mtm/materials.vue";
 import checkDialog from "./check_form.vue";
 export default {
@@ -146,6 +154,7 @@ export default {
 	name: "wmaterial",
 	data() {
 		return {
+			wmState,
 			apiObj: null,
 			params: {
 				mgroupx: "",