Browse Source

侧边栏点击优化

su 1 year ago
parent
commit
c6add55e58

+ 22 - 22
src/view/job/job/job.vue

@@ -40,7 +40,7 @@
             </el-form>
           </div>
           <div class="gva-table-box">
-            <div class="gva-btn-list">
+            <!-- <div class="gva-btn-list">
               <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
               <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
                 <p>确定要删除吗?</p>
@@ -52,7 +52,7 @@
                   <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
                 </template>
               </el-popover>
-            </div>
+            </div> -->
             <el-table
                 ref="multipleTable"
                 style="width: 100%"
@@ -61,36 +61,36 @@
                 row-key="ID"
                 @selection-change="handleSelectionChange"
             >
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="设备编号" prop="设备编号" width="120" />
+              <!-- <el-table-column type="selection" width="55" /> -->
+              <el-table-column align="left" label="设备编号" prop="设备编号" width="80" />
               <el-table-column align="left" label="设备名称" prop="设备名称" width="120" />
-              <el-table-column align="left" label="生产工序" prop="生产工序" width="120" />
-              <el-table-column align="left" label="日定额" prop="日定额" width="120" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="120" />
-              <el-table-column align="left" label="机长" prop="机长" width="120" />
-              <el-table-column align="left" label="副机" prop="副机" width="120" />
-              <el-table-column align="left" label="调墨" prop="调墨" width="120" />
-              <el-table-column align="left" label="二手" prop="二手" width="120" />
-              <el-table-column align="left" label="飞达" prop="飞达" width="120" />
-              <el-table-column align="left" label="辅助" prop="辅助" width="120" />
-              <el-table-column align="left" label="放卷" prop="放卷" width="120" />
-              <el-table-column align="left" label="分切1" prop="分切1" width="120" />
-              <el-table-column align="left" label="分切2" prop="分切2" width="120" />
-              <el-table-column align="left" label="检验" prop="检验" width="120" />
-              <el-table-column align="left" label="使用部门" prop="使用部门" width="120" />
+              <el-table-column align="left" label="生产工序" prop="生产工序" width="80" />
+              <el-table-column align="left" label="日定额" prop="日定额" width="100" />
+              <el-table-column align="left" label="千件工价" prop="千件工价" width="80" />
+              <el-table-column align="left" label="机长" prop="机长" width="100" />
+              <el-table-column align="left" label="副机" prop="副机" width="100" />
+              <el-table-column align="left" label="调墨" prop="调墨" width="100" />
+              <el-table-column align="left" label="二手" prop="二手" width="100" />
+              <el-table-column align="left" label="飞达" prop="飞达" width="100" />
+              <el-table-column align="left" label="辅助" prop="辅助" width="100" />
+              <el-table-column align="left" label="放卷" prop="放卷" width="100" />
+              <el-table-column align="left" label="分切1" prop="分切1" width="100" />
+              <el-table-column align="left" label="分切2" prop="分切2" width="100" />
+              <el-table-column align="left" label="检验" prop="检验" width="100" />
+              <el-table-column align="left" label="使用部门" prop="使用部门" width="100" />
               <el-table-column align="left" label="设备编组" prop="sys_id" width="120" />
               <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
               <el-table-column align="left" label="创建时间" prop="mod_rq" width="120" />
               <el-table-column align="left" label="修改时间" prop="sys_rq" width="120" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120" />
-              <el-table-column align="center" fixed="right" label="操作"  min-width="250">
+              <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" />
+              <el-table-column align="center" fixed="right" label="操作"  min-width="100">
                 <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
                     <el-icon style="margin-right: 5px"><InfoFilled /></el-icon>
                     查看详情
                   </el-button>
-                  <el-button type="primary" link icon="edit" class="table-button" @click="updateCompanyFunc(scope.row)">变更</el-button>
-                  <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
+                  <!-- <el-button type="primary" link icon="edit" class="table-button" @click="updateCompanyFunc(scope.row)">变更</el-button>
+                  <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button> -->
                 </template>
               </el-table-column>
             </el-table>

+ 22 - 8
src/view/job/piece/piece.vue

@@ -9,7 +9,7 @@
       </el-aside>
       <el-container>
         <el-main>
-          <div class="gva-search-box">
+          <!-- <div class="gva-search-box">
             <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
               <el-form-item label="创建日期" prop="createdAt">
                 <template #label>
@@ -29,8 +29,8 @@
                 <el-button icon="refresh" @click="onReset">重置</el-button>
               </el-form-item>
             </el-form>
-          </div>
-          <div class="gva-table-box">
+          </div> -->
+          <!-- <div class="gva-table-box">
             <div class="gva-btn-list">
 			  <el-button type="primary" icon="upload" @click="">导出到excel</el-button>
 			  <el-button type="primary" icon="plus" @click="getDetails(2)">详情</el-button>
@@ -77,7 +77,7 @@
                   @size-change="handleSizeChange"
               />
             </div>
-          </div>
+          </div> -->
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
             <el-scrollbar height="500px">
               <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="80px">
@@ -100,7 +100,7 @@
             </template>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="当前编码:" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" :title="`当前编码:${pieceData.sys_bh}`" destroy-on-close>
             <el-scrollbar height="550px">
               <el-descriptions column="1" border>
                 <el-descriptions-item label="编号">
@@ -206,7 +206,7 @@ const PieceWork = async() => {
 				children: sysItem.children.map(syssItem => ({
 				  label: `${syssItem.sys_mc}【${syssItem.sys_bh}】`,
 				  params: {
-				    code: sysItem.sys_bh,
+				    code: syssItem.sys_bh,
 				  },
 				}))
 	          })),
@@ -221,7 +221,7 @@ const PieceWork = async() => {
 						children: sysItem.children.map(syssItem => ({
 						  label: `${syssItem.sys_mc}【${syssItem.sys_bh}】`,
 						  params: {
-						    code: sysItem.sys_bh,
+						    code: syssItem.sys_bh,
 						  },
 						}))
 		        })),
@@ -242,10 +242,24 @@ const PieceWork = async() => {
 PieceWork()
 const handleNodeClick = (node,check) => {
   //存放当前节点的nodeId
-  if (node.params) {
+  // if (node.paramss) {
+  // 		sys_bh.value = node.paramss.code;
+  // 		getDetails();
+		// return false;
+  // 	}
+  // if (node.params) {
+  // 		sys_bh.value = node.params.code;
+  // 		getDetails();
+  // 	}
+  if(node.children==null){
+  	sys_bh.value = node.params.code;
+  	getDetails();
+  }else{
+  	if(node.children.length==0){
   		sys_bh.value = node.params.code;
   		getDetails();
   	}
+  }
   console.log(node,check);
 }
 // 自动化生成的字典(可能为空)以及字段

+ 28 - 9
src/view/job/process/process.vue

@@ -100,7 +100,7 @@
             </template>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="当前编码:" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" :title="`当前编码:${processData.sys_bh}`" destroy-on-close>
             <el-scrollbar height="550px">
               <el-descriptions column="1" border>
                 <el-descriptions-item label="编号">
@@ -188,7 +188,7 @@ const Process = async() => {
 	  				children: sysItem.children.map(syssItem => ({
 	  				  label: syssItem.sys_mc,
 	  				  params: {
-	  				    code: sysItem.sys_bh,
+	  				    code: syssItem.sys_bh,
 	  				  },
 					  children: syssItem.childrens.map(syssItems => ({
 					    label: syssItems.sys_mc,
@@ -206,16 +206,35 @@ const Process = async() => {
   }
 }
 Process()
-const handleNodeClick = (node,check) => {
-  //存放当前节点的nodeId
- //  if (node.child==[]) {
-	// 	sys_bh.value = node.sys_bh;
-	// 	getDetails();
-	// }
-	if (node.params) {
+const handleNodeClick = async(node,check) => {
+	if(node.children==null){
+		sys_bh.value = node.params.code;
+		getDetails();
+	}else{
+		if(node.children.length==0){
 			sys_bh.value = node.params.code;
 			getDetails();
 		}
+	}
+  //存放当前节点的nodeId
+ //  if (node.children) {
+	// 	sys_bh.value = node.params.code;
+	// 	getDetails();
+	// }
+	// if (node.paramsss) {
+	// 		sys_bh.value = node.paramsss.code;
+	// 		getDetails();
+	// 		// return false;
+	// 	}
+	// if (node.paramss) {
+	// 		sys_bh.value = node.paramss.code;
+	// 		getDetails();
+	// 		return false;
+	// 	}
+	// if (node.params) {
+	// 		sys_bh.value = node.params.code;
+	// 		getDetails();
+	// 	}
      console.log(node,check);
 }
 // 自动化生成的字典(可能为空)以及字段

+ 8 - 0
src/view/job/related/related .vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>