Parcourir la source

修正页面相关展示的bug

oyq28 il y a 3 ans
Parent
commit
947569f17c

+ 1 - 0
imcs-ui/src/lang/zh/machining.js

@@ -95,6 +95,7 @@ export default {
 			qualityResult: {
 				no: '单据编号',
         orderNo: '订单编号',
+		orderName: '订单名称',
         workpieceName: '零件名称',
         uniqueCode: '唯一码',
         procedureName: '检测序',

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

@@ -56,6 +56,8 @@
           </div>
         </template>
       </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>
       <!-- '零件名称 -->

+ 9 - 9
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/failAuditOrder/index.vue

@@ -70,22 +70,22 @@
       </el-table-column>
       <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
       <!-- 订单编号 -->
-      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <el-table-column prop="orderNo" :label='$t("runCenter.table.oder.orderNo")' :show-overflow-tooltip="true" style="width: 8%;"></el-table-column>
       <!-- 订单名称 -->
-      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" width="180px"></el-table-column>
+      <el-table-column prop="orderName" :label='$t("runCenter.table.oder.orderName")' :show-overflow-tooltip="true" style="width: 10%;"></el-table-column>
       <!-- 简称 -->
       <!--<el-table-column prop="custDesc" :label='$t("runCenter.table.oder.custDesc")' :show-overflow-tooltip="true" width="120px"></el-table-column>-->
       <!-- 来源 -->
-      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" width="80px">
+      <el-table-column prop="source" :label='$t("runCenter.table.oder.source")' :show-overflow-tooltip="true" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.source == '1'">{{$t("runCenter.common.source.self")}}</el-tag>
 					<el-tag v-if="row.source == '2'" type="success">{{$t("runCenter.common.source.out")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 交货日期 -->
-      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" width="120px"></el-table-column>
+      <el-table-column prop="deliveryTime" :label='$t("runCenter.table.oder.deliveryTime")' :show-overflow-tooltip="true" style="width: 12%;"></el-table-column>
       <!-- 订单状态 -->
-      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" width="90px">
+      <el-table-column prop="orderStatus" :label='$t("runCenter.table.oder.orderStatus")' align="center" style="width: 6%;">
       	<template slot-scope="{ row }">
       		<el-tag v-if="row.orderStatus == '0'" type="info">{{$t("runCenter.common.orderStatus.zero")}}</el-tag>
 	      	<el-tag v-if="row.orderStatus == '1'" type="warn">{{$t("runCenter.common.orderStatus.one")}}</el-tag>
@@ -126,7 +126,7 @@
 				</template>
       </el-table-column>-->
       <!-- 审核状态 -->
-      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" width="100px">
+      <el-table-column prop="auditStatus" :label='$t("runCenter.table.oder.auditStatus")' align="center" style="width: 8%;">
       	<template slot-scope="{ row }">
 	      	<el-tag v-if="row.auditStatus == '1'" type="info">{{$t("common.audio.daiAudio")}}</el-tag>
 					<el-tag v-if="row.auditStatus == '2'" type="success">{{$t("common.audio.audioOk")}}</el-tag>
@@ -134,7 +134,7 @@
 				</template>
       </el-table-column>
       <!-- 启用状态 -->
-      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" width="100px">
+      <el-table-column prop="status" :label='$t("runCenter.table.oder.status")' :show-overflow-tooltip="true" style="width: 10%;">
       	<template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
           	{{ row.status=='1' ? $t("common.status.valid") : $t("common.frozen") }}
@@ -142,9 +142,9 @@
         </template>
       </el-table-column>
       <!-- 下单日期 -->
-      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' width="160px"></el-table-column>
+      <el-table-column prop="orderTime" :label='$t("runCenter.table.oder.orderTime")' style="width: 15%;"></el-table-column>
       <!-- 创建时间 -->
-      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' width="160px"></el-table-column>
+      <el-table-column prop="createTime" :label='$t("runCenter.table.oder.createTime")' style="width: 15%;"></el-table-column>
       <!-- 操作 -->
       <el-table-column
         :label="$t('table.operation')"

+ 4 - 4
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/index.vue

@@ -522,16 +522,16 @@
           this.partsTracedBackCardVisible = false
       },
       //【工艺卡下载】按钮-事件
-      down(row){
+      down(row){		  
           this.planId = row.id
           this.rowData = row
           this.craftCardsVisible = true
-			},
-			partsTracedBackPage(row){
+	  },
+	  partsTracedBackPage(row){
           this.planId = row.id
           this.rowData = row
           this.partsTracedBackCardVisible = true
-      },
+      }
 	  }
 	}
 </script>