liuhairui 1 year ago
parent
commit
9b06aa79fa

+ 80 - 44
src/view/job/rewards/rewards.vue

@@ -23,10 +23,13 @@
 								<el-button type="primary" icon="delete" @click="onDel" class="bt">删除</el-button>
 								<el-button type="primary" icon="delete" @click="onDel" class="bt">删除</el-button>
 							</el-form-item>
 							</el-form-item>
 						</el-form>
 						</el-form>
-						<el-table ref="multipleTable" style="width: 100%;height: 65vh" border tooltip-effect="dark" :data="tableData"
-							row-key="ID" :show-overflow-tooltip="true" highlight-current-row id="Exceltable"
-							:row-style="{ height: '20px' }" :cell-style="{ padding: '0px' }"
-							:header-row-style="{ height: '20px' }" :header-cell-style="{ padding: '0px' }"
+						<el-table ref="multipleTable" style="width: 100%;height: 65vh"  tooltip-effect="dark" :data="tableData"
+							row-key="ID" id="Exceltable"
+							highlight-current-row="true"
+							border  
+							:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
+							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+							:show-overflow-tooltip="true"
 							@selection-change="handleSelectionChange" @row-dblclick="handleDoubleClick"
 							@selection-change="handleSelectionChange" @row-dblclick="handleDoubleClick"
 							@row-click="Click">
 							@row-click="Click">
 							<el-table-column type="selection" width="55" />
 							<el-table-column type="selection" width="55" />
@@ -1939,46 +1942,79 @@ import LuckyExcel from 'luckyexcel';
 	}
 	}
 </script>
 </script>
 
 
+<style>
+.JKWTree-container {
+  display: flex;
+}
+
+.JKWTree-tree {
+  width: 300px;
+  background-color: #fff;
+  padding: 10px;
+  margin-right: 20px;
+}
+
+.JKWTree-tree h3 {
+  font-size: 15px;
+  font-weight: 700;
+  margin: 10px 0;
+}
+
+.JKWTree-content {
+  flex: 1;
+}
+
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row > td {
+  background: #ff80ff !important;
+  /* 背景颜色 */
+}
+</style>
 <style scoped>
 <style scoped>
-	:deep(.el-table td .cell) {
-		line-height: 30px !important;
-	}
-
-	.JKWTree-container {
-		display: flex;
-	}
-
-	/* 选中某行时的背景色 */
-	:deep(.el-table__body tr.current-row)>td {
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+
+:deep(.el-tabs__header) {
+  margin-bottom: 0;
+}
+
+.search {
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+
+.bt {
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+
+.el-tabs__header {
+  margin: 0px !important;
+}
+
+.gva-table-box {
+  padding: 0px !important;
+}
+
+.mab {
+  margin-bottom: 5px;
+}
+
+:deep(.plan-usage-low div) {
+  color: blue !important;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/* 工序产量核查高亮 */
+:deep(.lan-plan-usage-lows  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+/* tree组件背景高亮 */
+:deep(.el-tree-node:focus > .el-tree-node__content){
 		background: #ff80ff !important;
 		background: #ff80ff !important;
 	}
 	}
-	/* 文字颜色 */
-	:deep(.cfje div input){
-		color: blue;
-	}
-	/* :deep(.bzryred div input){
-		color: red;
-	} */
-	.JKWTree-tree {
-		width: 300px;
-		background-color: #fff;
-		padding: 10px;
-		margin-right: 20px;
-	}
-
-	.JKWTree-tree h3 {
-		font-size: 15px;
-		font-weight: 700;
-		margin: 10px 0;
-	}
-
-	.JKWTree-content {
-		flex: 1;
-	}
-
-	.bt {
-		margin-left: 2px !important;
-		padding: 3px !important;
-		font-size: 12px;
-	}
-</style> 
+</style>

+ 2 - 2
src/view/performance/06-packingDocuments/index.vue

@@ -23,9 +23,9 @@
 						</el-form>
 						</el-form>
 						<!-- 数据展示 -->
 						<!-- 数据展示 -->
 						<el-table ref="table" style="width: 100%;height: 62vh;" :data="tableData" row-key="ID" highlight-current-row
 						<el-table ref="table" style="width: 100%;height: 62vh;" :data="tableData" row-key="ID" highlight-current-row
-							border show-overflow-tooltip :row-style="{ height: '20px' }"
+							border show-overflow-tooltip  @row-dblclick="handleShowDetail"
+							:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-							:header-cell-style="{ padding: '0px' }" @row-dblclick="handleShowDetail"
 							@current-change="(row, oldRow) => { currentRow = row}">
 							@current-change="(row, oldRow) => { currentRow = row}">
 							<el-table-column type="selection" width="55" />
 							<el-table-column type="selection" width="55" />
 							<!-- 循环渲染列 -->
 							<!-- 循环渲染列 -->

+ 85 - 41
src/view/performance/09-workOrderVerification/index.vue

@@ -2,15 +2,16 @@
 	<div>
 	<div>
 		<el-container>
 		<el-container>
 			<!-- 左侧树形结构 -->
 			<!-- 左侧树形结构 -->
-			<el-scrollbar max-height="75vh">
+			<!-- <el-scrollbar max-height="75vh"> -->
 
 
-				<layout-sider :resize-directions="['right']" :width="220" style="margin-right: 50px;">
-					<div class="JKWTree-tree" style="height: 70vh;">
-						<h3>工单核验单维护</h3>
-						<el-tree :data="treeData" highlight-current-row @node-click="handleNodeClick" />
+				<layout-sider :resize-directions="['right']" :width="220" style="margin-right: 10px">
+					<div class="JKWTree-tree" style="height: 70vh;width:100vh" >
+					  <h3>工单核验单维护</h3>
+					  <el-tree :data="treeData" highlight-current @node-click="handleNodeClick"/>
 					</div>
 					</div>
 				</layout-sider>
 				</layout-sider>
-			</el-scrollbar>
+			
+			<!-- </el-scrollbar> -->
 
 
 			<el-container>
 			<el-container>
 				<el-main>
 				<el-main>
@@ -28,10 +29,13 @@
 							</el-form-item>
 							</el-form-item>
 						</el-form>
 						</el-form>
 						<!-- 数据展示 -->
 						<!-- 数据展示 -->
-						<el-table ref="table" style="width: 100%" :data="tableData" row-key="ID" highlight-current-row
-							border show-overflow-tooltip :row-style="{ height: '20px' }"
+						<el-table ref="table" style="width: 100%;height: 62vh;" :data="tableData" row-key="ID" 
+							@row-click="handleSelectChange"
+							highlight-current-row="true"
+							border  
+							:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
 							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-							:header-cell-style="{ padding: '0px' }" @row-click="handleSelectChange"
+							:show-overflow-tooltip="true"
 							@row-dblclick="doubleClick">
 							@row-dblclick="doubleClick">
 							<!-- 循环渲染表格列 -->
 							<!-- 循环渲染表格列 -->
 							<el-table-column v-for="column in tableColumns" :key="column.prop" :prop="column.prop"
 							<el-table-column v-for="column in tableColumns" :key="column.prop" :prop="column.prop"
@@ -1814,39 +1818,79 @@ const handleDelete = () => {
 }
 }
 </script>
 </script>
 
 
+<style>
+.JKWTree-container {
+  display: flex;
+}
+
+.JKWTree-tree {
+  width: 300px;
+  background-color: #fff;
+  padding: 10px;
+  margin-right: 20px;
+}
+
+.JKWTree-tree h3 {
+  font-size: 15px;
+  font-weight: 700;
+  margin: 10px 0;
+}
+
+.JKWTree-content {
+  flex: 1;
+}
+
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row > td {
+  background: #ff80ff !important;
+  /* 背景颜色 */
+}
+</style>
 <style scoped>
 <style scoped>
-	.JKWTree-container {
-		display: flex;
-	}
-	.JKWTree-tree {
-		width: 100%;
-		background-color: #fff;
-		padding: 10px;
-		margin-right: 20px;
-	}
-	.JKWTree-tree h3 {
-		font-size: 15px;
-		font-weight: 700;
-		margin: 10px 0;
-	}
-	.JKWTree-content {
-		flex: 1;
-	}
-	.bt {
-		margin-left: 2px !important;
-		padding: 3px !important;
-		font-size: 12px;
-	}
-	/* 选中某行时的背景色 */
-	:deep(.el-table__body tr.current-row)>td {
-		background: #ff80ff !important;
-	}
-	:deep(.el-tree-node:focus > .el-tree-node__content){
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+
+:deep(.el-tabs__header) {
+  margin-bottom: 0;
+}
+
+.search {
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+
+.bt {
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+
+.el-tabs__header {
+  margin: 0px !important;
+}
+
+.gva-table-box {
+  padding: 0px !important;
+}
+
+.mab {
+  margin-bottom: 5px;
+}
+
+:deep(.plan-usage-low div) {
+  color: blue !important;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+/* 工序产量核查高亮 */
+:deep(.lan-plan-usage-lows  div) {
+  color: blue !important;
+  font-weight: bold;
+}
+/* tree组件背景高亮 */
+:deep(.el-tree-node:focus > .el-tree-node__content){
 		background: #ff80ff !important;
 		background: #ff80ff !important;
 	}
 	}
-	
-	
-	.mab {
-		margin-bottom: 5px;
-	}
 </style>
 </style>

+ 3 - 1
src/view/performance/Manualdocuments.vue

@@ -25,8 +25,10 @@
 							</div>
 							</div>
 						</el-form-item>
 						</el-form-item>
 						<!-- 数据展示 -->
 						<!-- 数据展示 -->
-						<el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData"
+						<el-table ref="multipleTable" style="width: 100%;height: 62vh;" tooltip-effect="dark" :data="tableData"
 							row-key="ID" highlight-current-row="true" border @selection-change="handleSelectionChange"
 							row-key="ID" highlight-current-row="true" border @selection-change="handleSelectionChange"
+							:row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
+							:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 							@row-click="Click" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 							@row-click="Click" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
 							<el-table-column type="selection" width="55" />
 							<el-table-column type="selection" width="55" />
 							<el-table-column align="left" sortable label="工单印件" prop="combinedProp" width="340" />
 							<el-table-column align="left" sortable label="工单印件" prop="combinedProp" width="340" />

+ 3 - 1
src/view/performance/Packagingoutput.vue

@@ -37,7 +37,9 @@
             </el-form-item>
             </el-form-item>
             <!-- 数据展示 -->
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true"  :cell-style="cellStyle" border @selection-change="handleSelectionChange" 
+              highlight-current-row="true"   border @selection-change="handleSelectionChange" 
+			  :row-style="{ height: '20px' }"  :header-cell-style="{ padding: '0px' }"
+			  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 			  :show-overflow-tooltip="true" @row-click="Click" @row-dblclick="doubleClick">
 			  :show-overflow-tooltip="true" @row-click="Click" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
               <el-table-column type="selection" width="55" />
 			  <!-- 循环渲染列 -->
 			  <!-- 循环渲染列 -->