Browse Source

解决页面显示bug

oyq28 3 years ago
parent
commit
2ed7b9a3c0

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

@@ -102,6 +102,7 @@
       <!-- 生产中 -->
      <el-table-column prop="finishedNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>
 
+      <el-table-column prop="completeNum" :label='$t("machining.table.qualityMgr.completeNum")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="unqualifiedCount" :label='$t("machining.table.qualityMgr.unqualifiedCount")' :show-overflow-tooltip="true"></el-table-column>
       <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>

+ 17 - 0
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/components/Edit.vue

@@ -162,6 +162,10 @@
           align="center"
           width="150px"
         >
+         <template slot="header">			   
+			    <span>原料炉批号</span>
+			    <span class="star">*</span>	 
+			   </template>  
         	<template slot-scope="{ row }">
 			      <div style="color: #42d885;cursor: pointer;" @click="changeMetral(row)">
 			      	<span v-if="row.furnaceBatchNo">{{ row.furnaceBatchNo }}</span>
@@ -177,6 +181,10 @@
           width="150px"
           align="center"
         >
+         <template slot="header">			   
+			   <span>{{$t("runCenter.table.orderSldPro.bomNum")}}</span>
+			   <span class="star">*</span>	 
+			   </template> 
           <template slot-scope="{ row }">
             <el-input-number
               v-model="row.bomNum"
@@ -193,6 +201,10 @@
           width="220px"
           align="center"
         >
+          <template slot="header">			   
+			     <span>{{$t("runCenter.table.orderSldPro.deliveryTime")}}</span>
+			     <span class="star">*</span>	 
+			    </template>
           <template slot-scope="{ row }">
             <el-date-picker
               v-model="row.deliveryTime"
@@ -697,4 +709,9 @@ export default {
 	margin-left: 10px;
 	color: #1890ff;
 }
+.star {
+	color: #F56C6C;
+	font-size: 14px;
+	margin-right: 4px;
+ }
 </style>

+ 2 - 2
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/components/MeterialSelect.vue

@@ -295,12 +295,12 @@ export default {
     		this.isVisible = false
     	}else if(!this.selection.length){
 	        this.$message({
-          message: "请选择一条数据~~",
+          message: this.$t('tips.noDataSelected'),
           type: 'warning'
         })
       } else {
     		this.$message({
-          message: "只能选择一条数据~~",
+          message: this.$t('tips.mustOne'),
           type: 'warning'
         })
     	}

+ 8 - 0
imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/components/Select.vue

@@ -311,6 +311,14 @@ export default {
       this.fetch()
     },
     submitForm () {
+      if(this.selection && this.selection.length==0){
+        this.$message({
+              message: this.$t('tips.unSelected'),
+              type: 'warning'
+        })
+        return false
+      }
+
     	this.selection.forEach(item => {
     		// 页面需要参数: bomId
     		item.bomId = item.id