Merge branch 'master' of http://106.14.142.95:3000/oyq28/imcs_331_web

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/Index.vue

@@ -41,7 +41,7 @@
 	  computed: {
 	  },
 	  mounted () {
-
+		this.$refs.machineCuttingTool.search()	
 	  },
 	  methods: {
 	  	tabClick(e){

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/accept/index.vue

@@ -274,12 +274,7 @@
 	  	// 调用常量-审核状态
 	  	// this.audioStatus = this.$constWKS.OPTTYPE
 	  	// 加载【字典】
-	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);	
-		
-		setTimeout(function() {
-		}, 2000);
-		// 加载列表数据
-		this.fetch()
+	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);
 		},
 	  computed: {
 	    currentUser () {

imcs-ui/src/views/zuihou/runManageCenter/mesNotice/tab/apply/index.vue

@@ -113,7 +113,7 @@
       <!-- 处理时间 -->
       <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' width="160px">
 	     <template slot-scope="{ row }">
-	         <span v-if="row.status == '1'">{{row.updateTime}}</span>
+	         <span v-if="row.status != '1'">{{row.updateTime}}</span>
 	     </template>
 	  </el-table-column>
 
@@ -122,9 +122,9 @@
 		   fixed="right"
 		    align="center"
 		    column-key="operation"
-		    width="85px">
+		    width="100px">
 			<template slot-scope="{ row }">
-				  <el-tooltip class="item" content='修改' effect="dark" placement="top-start" v-if="row.status!='2'">
+				  <el-tooltip class="item" content='修改' effect="dark" placement="top-start" v-if="row.status=='1'">
 			          <i					    
 			            class="el-icon-edit table-operation"
 			            style="color: #87d068;"
@@ -138,7 +138,14 @@
 			            @click="updateStatus(row)"
 			          />
 		          </el-tooltip>
-				  <el-tooltip class="item" content='页面跳转' effect="dark" placement="top-start" v-if="row.status=='0'">
+				  <el-tooltip class="item" content='查看' effect="dark" placement="top-start" v-if="row.status!='1'" >
+			          <i
+			            class="el-icon-position table-operation"
+			            style="color: #87d068;"
+			            @click="view(row)"
+			          />
+		          </el-tooltip>
+				  <el-tooltip class="item" content='结果确认' effect="dark" placement="top-start" v-if="row.status=='0' && row.apiType=='CUTTERNEED'">
 			          <i
 			            class="el-icon-bell table-operation"
 			            style="color: #87d068;"
@@ -269,7 +276,7 @@
 	  	// 调用常量-审核状态
 	  	// this.audioStatus = this.$constWKS.OPTTYPE
 	  	// 加载【字典】
-	  	// initDicts(['API_TYPE','BU_TYPE'], this.dicts);		
+	  	initDicts(['API_TYPE','BU_TYPE'], this.dicts);		
 	  	// // 加载列表数据
 	  	// this.fetch()
 		},