修改页面bug

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

@@ -37,7 +37,9 @@ export default {
       offset: {
         workpieceName: '零件名称',
         orderNo: '订单编号',
+		orderName: '订单名称',
         workpieceId: '零件编号',
+		uniqueCode: '零件唯一码',
         createTime: '生成日期',
       },
 		},
@@ -94,6 +96,7 @@ export default {
         unqualifiedCount: '不合格零件',
         qualifiedCount: '合格零件',
         addOrderCount: '补单次数',
+		orderDeliveryTime: '交货日期',
         createTime: '下单日期'
 			},
 			qualityResult: {
@@ -102,7 +105,7 @@ export default {
 		orderName: '订单名称',
         workpieceName: '零件名称',
         uniqueCode: '唯一码',
-        procedureName: '检测序',
+        procedureNo: '检测序',
         okFlag:'检测结果',
         measuringReport:'检测报告',
         createTime:'生成日期'
@@ -115,6 +118,7 @@ export default {
         workpieceName: '零件名称',
         workpieceId: '零件编号',
         procedureName: '工序名称',
+		procedureNo: '检测序',
         offsetX: 'X',
         offsetY: 'Y',
         offsetZ: 'Z',

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

@@ -106,7 +106,7 @@
       @cell-click="cellClick"
     >
       <el-table-column align="center" type="selection" width="40px" :reserve-selection="true" />
-      <el-table-column v-for="item in titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" width="180px" :formatter="textFormatter"></el-table-column>
+      <el-table-column v-for="item in titleList" :key="item.id" :prop="item.field" :label='item.text' :show-overflow-tooltip="true" :formatter="textFormatter"></el-table-column>
       <!--<el-table-column prop="name" label="名称" :show-overflow-tooltip="true" width="250px"></el-table-column>
       <el-table-column prop="status" label="状态" align="center" width="90px">
         <template slot-scope="{ row }">

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

@@ -3,7 +3,7 @@
 		<!-- 搜索模块 -->
     <div class="filter-container">
     	<span>
-    		<span>{{$t("prepare.searchForm.name")}}：</span>
+    		<span>{{$t("prepare.searchForm.tpName")}}：</span>
     		<el-input v-model="queryParams.model.name" :placeholder='$t("common.pleaseEnter")' style="width: 150px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">

imcs-ui/src/views/zuihou/qualityCenter/measuringOffsetMgr/Index.vue

@@ -7,13 +7,13 @@
     		<el-input v-model="queryParams.model.workpieceName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 10px;">
-    		<span>{{$t("machining.searchForm.offset.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<span>{{$t("machining.searchForm.offset.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
-		<span style="margin-left: 10px;">
+		<!--<span style="margin-left: 10px;">
     		<span>{{$t("machining.searchForm.offset.workpieceId")}}：</span>
     		<el-input v-model="queryParams.model.workpieceId" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
+    	</span>-->
 		<span style="margin-left: 10px;">
     		<span>{{$t("machining.searchForm.offset.createTime")}}：</span>
 <!--    		<el-input v-model="queryParams.model.createTime" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
@@ -56,8 +56,8 @@
 	        </div>
 	      </template>
       </el-table-column>
-	    <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("machining.table.offset.orderNo")' :show-overflow-tooltip="true"></el-table-column>
+	    <!-- 订单编号 
+      <el-table-column prop="orderNo" :label='$t("machining.table.offset.orderNo")' :show-overflow-tooltip="true"></el-table-column> -->
 
       <el-table-column prop="orderName" :label='$t("machining.table.offset.orderName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- '零件名称 -->
@@ -86,7 +86,7 @@
         <template slot-scope="{ row }">
         	<el-tooltip class="item" :content="$t('machining.common.downloadReport')" effect="dark" placement="top-start">
 	          <i
-	            class="el-icon-view table-operation"
+	            class="el-icon-download table-operation"
 	            style="color: #87d068"
 	            @click ="downloadReport(row)"
 			  />

imcs-ui/src/views/zuihou/qualityCenter/qualityMgr/Index.vue

@@ -6,10 +6,11 @@
     		<span>{{$t("machining.table.qualityMgr.bomName")}}：</span>
     		<el-input v-model="queryParams.model.bomName" :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"/>
     	</span>
+		<!--
     	<span style="margin-left: 15px;">
     		<span>{{$t("machining.common.orderNo")}}：</span>
     		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 180px;" size="medium"/>
-    	</span>
+    	</span> -->
 <!--    	<span style="margin-left: 15px;">-->
 <!--    		<span>{{$t("machining.table.qualityMgr.produceStatus")}}：</span>-->
 <!--    		<el-select v-model="queryParams.model.produceStatus" :placeholder='$t("common.pleaseSelect")' size="medium" style="width: 180px;">-->
@@ -82,8 +83,8 @@
       </el-table-column>
       <!-- 序号 -->
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-      <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("machining.table.qualityMgr.orderNo")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 订单编号 
+      <el-table-column prop="orderNo" :label='$t("machining.table.qualityMgr.orderNo")' :show-overflow-tooltip="true"></el-table-column> -->
       <!-- 零件简称 -->
       <el-table-column prop="bomName" :label='$t("machining.table.qualityMgr.bomName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 来源
@@ -107,7 +108,7 @@
       <el-table-column prop="qualifiedCount" :label='$t("machining.table.qualityMgr.qualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="addOrderCount" :label='$t("machining.table.qualityMgr.addOrderCount")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 下单日期 -->
-      <el-table-column prop="createTime" :label='$t("machining.table.qualityMgr.createTime")' width="150" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="orderDeliveryTime" :label='$t("machining.table.qualityMgr.orderDeliveryTime")' width="150" :show-overflow-tooltip="true"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"

imcs-ui/src/views/zuihou/qualityCenter/qualityResult/Index.vue

@@ -6,13 +6,13 @@
     		<span>{{$t("machining.searchForm.offset.workpieceName")}}：</span>
     		<el-input v-model="queryParams.model.workpieceName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
-      <span style="margin-left: 10px;">
+      <!--<span style="margin-left: 10px;">
     		<span>{{$t("machining.searchForm.offset.orderNo")}}：</span>
     		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
+    	</span>-->
       <span style="margin-left: 10px;">
-    		<span>{{$t("machining.searchForm.offset.workpieceId")}}：</span>
-    		<el-input v-model="queryParams.model.workpieceId" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<span>{{$t("machining.searchForm.offset.uniqueCode")}}：</span>
+    		<el-input v-model="queryParams.model.uniqueCode" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
       <span style="margin-left: 10px;">
     		<span>{{$t("machining.searchForm.offset.createTime")}}：</span>
@@ -58,18 +58,18 @@
       </el-table-column>
       <!-- 订单名称 -->
       <el-table-column prop="orderName" :label='$t("machining.table.qualityResult.orderName")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("machining.table.qualityResult.orderNo")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- '零件名称 -->
+      <!-- 订单编号 
+      <el-table-column prop="orderNo" :label='$t("machining.table.qualityResult.orderNo")' :show-overflow-tooltip="true"></el-table-column> -->
+      <!-- 零件名称 -->
       <el-table-column prop="workpieceName" :label='$t("machining.table.qualityResult.workpieceName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零件编号 -->
       <el-table-column prop="uniqueCode" :label='$t("machining.table.qualityResult.uniqueCode")'  :show-overflow-tooltip="true"></el-table-column>
       <!-- 工序名称 -->
-      <el-table-column prop="procedureName" :label='$t("machining.table.qualityResult.procedureName")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="procedureNo" :label='$t("machining.table.qualityResult.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- X -->
       <el-table-column prop="okFlag" :label='$t("machining.table.qualityResult.okFlag")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- Y -->
-      <el-table-column prop="measuringReport" :label='$t("machining.table.qualityResult.measuringReport")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- Y 
+      <el-table-column prop="measuringReport" :label='$t("machining.table.qualityResult.measuringReport")' :show-overflow-tooltip="true"></el-table-column> -->
       <!-- 所属计划 -->
       <el-table-column prop="createTime" :label='$t("machining.table.qualityResult.createTime")' :show-overflow-tooltip="true"></el-table-column>
 
@@ -84,8 +84,9 @@
         <template slot-scope="{ row }">
           <el-tooltip class="item" :content="$t('machining.common.downloadReport')" effect="dark" placement="top-start">
             <i
-              class="el-icon-view table-operation"
+              class="el-icon-download table-operation"
               style="color: #87d068"
+              title="下载"
               @click ="downloadReport(row)"
             />
           </el-tooltip>

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogResource.vue

@@ -23,7 +23,7 @@
 		      class="noPaddingTable"
 		      style="width: 100%;"
 		    >
-		    	<el-table-column label="基础信息" align="center">
+		    	<el-table-column label="基础信息" align="center" fixed="left" width="350">
 			    	<!-- 序号 -->
 			    	<el-table-column :label='$t("common.serialNo")' width="50px" align="center">
 				      <template slot-scope="scope">

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/PprogTask.vue

@@ -26,7 +26,7 @@
 	    	<!-- 基础信息 -->
 	    	<!--<el-table-column :label='$t("runCenter.table.oderTask.baseInfo")' align="center" width="555px" fixed resizable="false">-->
 	    		<!-- 序号 -->
-		    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
+		    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center" fixed="left">
 			      <template slot-scope="scope">
 			        <div>
 			          {{scope.$index+(queryParams.current - 1) * queryParams.size + 1}}
@@ -34,20 +34,20 @@
 			      </template>
 		      	</el-table-column>
 		      	<!-- 任务编号 -->
-		      	<el-table-column prop="taskNo" :label='$t("runCenter.table.oderTask.taskNo")' :show-overflow-tooltip="true" width="100px"></el-table-column>
+		      	<el-table-column prop="taskNo" :label='$t("runCenter.table.oderTask.taskNo")' :show-overflow-tooltip="true" width="100px" fixed="left"></el-table-column>
 		      	<!-- 执行者 -->
-		      	<el-table-column prop="executorName" :label='$t("runCenter.table.oderTask.executorName")' :show-overflow-tooltip="true" align="center" width="120px"></el-table-column>
+		      	<el-table-column prop="executorName" :label='$t("runCenter.table.oderTask.executorName")' :show-overflow-tooltip="true" align="center" width="120px" fixed="left"></el-table-column>
 		      	<!-- 产品 -->
-		     	<el-table-column prop="bomDesc" :label='$t("runCenter.table.schedul.bomDesc")' :show-overflow-tooltip="true" width="120px"></el-table-column>
+		     	<el-table-column prop="bomDesc" :label='$t("runCenter.table.schedul.bomDesc")' :show-overflow-tooltip="true" width="120px" fixed="left"></el-table-column>
 		      	<!-- 工序号 -->
-		      	<el-table-column prop="procedureNo" :label='$t("runCenter.table.schedul.procedureNo")' :show-overflow-tooltip="true" width="70px"></el-table-column>
+		      	<el-table-column prop="procedureNo" :label='$t("runCenter.table.schedul.procedureNo")' :show-overflow-tooltip="true" width="70px" fixed="left"></el-table-column>
 		      	<!-- 生产资源 -->
-		      	<el-table-column prop="resourceDesc" :label='$t("runCenter.table.schedul.resourceDesc")' :show-overflow-tooltip="true" width="170px"></el-table-column>
+		      	<el-table-column prop="resourceDesc" :label='$t("runCenter.table.schedul.resourceDesc")' :show-overflow-tooltip="true" width="170px" fixed="left"></el-table-column>
 	      	<!--</el-table-column>-->
 	      	<!-- 开始时间 -->
-	     	<el-table-column prop="expectStartTime" :label='$t("runCenter.table.oderTask.expectStartTime")' width="150px"></el-table-column>
+	     	<el-table-column prop="expectStartTime" :label='$t("runCenter.table.oderTask.expectStartTime")' width="150px" fixed="left"></el-table-column>
 	      	<!-- 预计结束时间 -->
-	      	<el-table-column prop="expectEndTime" :label='$t("runCenter.table.oderTask.expectEndTime")' width="150px"></el-table-column>
+	      	<el-table-column prop="expectEndTime" :label='$t("runCenter.table.oderTask.expectEndTime")' width="150px" fixed="left"></el-table-column>
 	      	<!-- 动态加的表头数据 -->
 	      	<el-table-column v-for="item in titleData" :key="item.id" :prop="item.field" :label="item.text" class-name="dateColumnCls" align="center" width="79px">
 		      	<template slot-scope="{ row }">

imcs-ui/src/views/zuihou/runManageCenter/productionScheduling/components/SchedResource.vue

@@ -22,7 +22,7 @@
 		      class="noPaddingTable"
 		      style="width: 100%;"
 		    >
-		    	<el-table-column label="基础信息" align="center" fixed="left"  width="100%">
+		    	<el-table-column label="基础信息" align="center" fixed="left"  width="350">
 			    	<!-- 序号 -->
 			    	<el-table-column :label='$t("common.serialNo")' width="50px" align="center">
 				      <template slot-scope="scope">