fix 冲突合并

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

@@ -79,7 +79,8 @@
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 编码 -->
       <el-table-column prop="orderNo" label='订单编号' :show-overflow-tooltip="true" width="180"></el-table-column>
-      <el-table-column prop="lineCode"  label='产线编码' width="180"></el-table-column>
+	  <el-table-column prop="lineCode"  label='产线编码' width="100"></el-table-column>
+      <el-table-column prop="userCode"  label='用户编码' width="120"></el-table-column>	  
       <el-table-column prop="buType" label='业务类型' width="120" >
 		<template slot-scope="{ row }">			
 			 <div v-for="item in buTypeList" :key="item.value" :value="item" >				
@@ -103,17 +104,18 @@
 	  <el-table-column prop="targetSource"  label='数据流向' width="160"></el-table-column>
       <!-- <el-table-column prop="apiAddress" label='接口地址' align="center" width="200px"></el-table-column> -->
       <!-- 处理状态 -->
-      <el-table-column prop="status" label='状态' align="center" width="120px">
+      <el-table-column prop="status" label='状态' align="center" width="120">
       	<template slot-scope="{ row }">
       		    <el-tag v-if="row.status == '1'" >未处理</el-tag>
 	      	    <el-tag v-if="row.status == '0'">处理中</el-tag>
 	      	    <el-tag v-if="row.status == '3'">已处理</el-tag>
+	      	    <el-tag v-if="row.status == '2'">已下载</el-tag>
 	      	    <el-tag v-if="row.status == '99'">异常</el-tag>
 		</template>
       </el-table-column>
-      <el-table-column prop="createTime" label='创建时间'></el-table-column>
+      <el-table-column prop="createTime" label='创建时间' width="120"></el-table-column>
       <!-- 处理时间 -->
-      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")' >
+      <el-table-column prop="updateTime" :label='$t("developer.table.warnLong.chuliTime")'  width="120">
 	     <template slot-scope="{ row }">
 	         <span v-if="row.status == '1'">{{row.updateTime}}</span>
 	     </template>
@@ -140,13 +142,14 @@
 			            @click="view(row)"
 			          />
 		          </el-tooltip>
-				  <el-tooltip class="item" content='页面跳转' effect="dark" placement="top-start" v-if="row.status=='1'">
+				  <!--
+				  <el-tooltip class="item" content='页面跳转' effect="dark" placement="top-start" v-if="row.status=='0'">
 			          <i
 			            class="el-icon-bell table-operation"
 			            style="color: #87d068;"
 			            @click="redirect(row)"
 			          />
-		          </el-tooltip>
+		          </el-tooltip> -->
 				  <el-tooltip class="item" content='文件下载' effect="dark" placement="top-start" v-if="row.status=='2'">
 			          <i
 					    v-if="row.children"
@@ -455,6 +458,7 @@
 	
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
+		  this.queryParams.sort = "createTime"
 	      // 固定参数：dataStatus = 1-入库/出库，2-解锁/锁定
 	      //this.queryParams.model.status = '1'		  
 	     await mesNoticeApi.page(this.queryParams).then(response => {

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

@@ -104,9 +104,9 @@
       <!-- 处理状态 -->
       <el-table-column prop="status" label='状态' align="center" width="120px">
       	<template slot-scope="{ row }">
-      		    <el-tag v-if="row.status == '0'" >未处理</el-tag>
-	      	    <el-tag v-if="row.status == '1'">处理中</el-tag>
-	      	    <el-tag v-if="row.status == '2'">已处理</el-tag>
+      		    <el-tag v-if="row.status == '1'" >未处理</el-tag>
+	      	    <el-tag v-if="row.status == '0'">处理中</el-tag>
+	      	    <el-tag v-if="row.status == '2'">已下载</el-tag>
 	      	    <el-tag v-if="row.status == '99'">异常</el-tag>
 		</template>
       </el-table-column>