Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/performance/Manualdocuments.vue

@@ -793,11 +793,11 @@
 	
 	  if (isDuplicate) {
 	    // 如果值重复，提示错误并清空输入框
-	    event.target.value = "";
-	    ElMessage({
-	      type: 'error',
-	      message: '输入的值已存在，请重新输入',
-	    });
+	    event.target.value = 0;
+	    // ElMessage({
+	    //   type: 'error',
+	    //   message: '输入的值已存在，请重新输入',
+	    // });
 	  } else {
 	    console.log("输入的值无重复");
 	    // 值无重复，可以继续处理逻辑

src/view/performance/chejianbaogong.vue

@@ -1863,7 +1863,7 @@
 			    </div>
 			  </div>
 			  <!-- 机台生产日报表维护弹窗 -->
-			  <el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 90%; margin-left: 5%; margin-top: 2%;">
+			  <el-dialog v-model="popdialog" title="机台生产日报表维护" destroy-on-close width="90%" style="height: 92%; margin-left: 5%; margin-top: 1%;">
 			    <div>
 			      <!-- 顶层布局 -->
 			      <layout>
@@ -1878,7 +1878,7 @@
 			        <!-- 左右布局 -->
 			        <layout style="height: calc(100% - 50px); display: flex;">
 			          <!-- 左侧树形区域 -->
-			          <layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 640px;">
+			          <layout-sider style="width: 140px; margin-right: 10px; overflow: hidden;height: 584px;">
 			            <div class="JKWTree-tree" style="height: 100%; max-height: 100vh; overflow-y: auto;">
 			              <h3></h3>
 			              <el-tree
@@ -1918,7 +1918,7 @@
 			  					    :row-style="{ height: '0px' }" :header-cell-style="{ padding: '0px' }"
 			  					    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
 			  					    border :show-overflow-tooltip="true" :cell-class-name="planUsageCellClass"
-			  					    style="width: 100%;height: 65vh" ref="tablesczl_gxmc"
+			  					    style="width: 100%;height: 56vh" ref="tablesczl_gxmc"
 			  					    @row-dblclick="gyscbzSelectClick">
 			  					    <el-table-column align="left"  label="流程单号" 	  width="81"	prop="流程单号" />
 			  					    <el-table-column align="left"  label="工序号" 	  width="68"	prop="工序号" />