优化

src/view/job/rewards/rewards.vue

@@ -32,24 +32,24 @@
 							:show-overflow-tooltip="true"
 							@selection-change="handleSelectionChange" @row-dblclick="handleDoubleClick"
 							@row-click="Click">
-							<el-table-column type="selection" width="55" />
+							<el-table-column type="selection" width="45" />
 							<el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120" sortable />
 							<el-table-column align="left" label="印件名称" prop="yj_yjmc" width="210" sortable />
 							<el-table-column align="left" label="日期" prop="sczl_rq" width="100" sortable />
-							<el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="120" sortable />
-							<el-table-column align="left" label="联数" prop="sczl_ls" width="120" sortable />
-							<el-table-column align="left" label="责任部门" prop="责任部门" width="120" sortable />
-							<el-table-column align="left" label="大废品数" prop="sczl_cl" width="120" sortable />
-							<el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="120" sortable />
-							<el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="120" sortable />
-							<el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="120" sortable />
-							<el-table-column align="left" label="检验员工" prop="JL_bh1" width="120" sortable />
+							<el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="110"  />
+							<el-table-column align="left" label="联数" prop="sczl_ls" width="60"  />
+							<el-table-column align="left" label="责任部门" prop="责任部门" width="110" sortable />
+							<el-table-column align="left" label="大废品数" prop="sczl_cl" width="110" sortable />
+							<el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="110" sortable />
+							<el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="110" sortable />
+							<el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="110" sortable />
+							<el-table-column align="left" label="检验员工" prop="JL_bh1" width="110" sortable />
 							<el-table-column align="left" label="责任班组" prop="sczl_bzdh" width="120" sortable />
 							<el-table-column align="left" label="责任员工1" prop="sczl_bh1" width="120" sortable />
 							<el-table-column align="left" label="责任员工2" prop="sczl_bh2" width="120" sortable />
 							<el-table-column align="left" label="创建用户" prop="sys_id" width="120" sortable />
 							<el-table-column align="left" label="创建时间" prop="sys_rq" width="160" sortable />
-							<el-table-column align="left" label="UNIQID" prop="UniqId" width="120" sortable />
+							<el-table-column align="left" label="UNIQID" prop="UniqId" width="90" />
 						</el-table>
 						<div class="gva-pagination">
 							<el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"

src/view/performance/chejianbaogong.vue

@@ -1775,6 +1775,7 @@
             <div style="width: 100%;height: 100%;">
               <el-button type="" @click="pd_lcdCancel">退出</el-button>
             </div>
+			<br>
             <div style="width: 100%; height: 100%; display: flex; align-items: center;">
               <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
                 <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue"/>
@@ -1796,12 +1797,20 @@
                     <el-tree :data="pd_lcd_treeData" @node-click="pd_lcd_handleNodeClick" default-expand-all></el-tree>
                   </div>
                 </layout-sider>
+				
+				<div style="display: flex; align-items: center;margin-left: 25px;">
+					<el-tag type="success" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+					<h2 style="margin: 0 20px 0 0;">绿格子图标表示“已完成”</h2>
+					<el-tag type="danger" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+					<h2 style="margin: 0;">红格子图标表示“未完成”</h2>
+				</div>
+				<br>
                 <layout-main>
                   <!-- 这里放右侧的内容 -->
-                  <el-space wrap>
+                  <el-space wrap style="margin-left: 20px;">
                     <!-- 右侧内容 -->
-                    <template v-for="item in processList.total_process">
-                      <el-button  class="custom-button" disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button>
+                    <template v-for="item in processList.total_process" >
+                      <el-button  class="custom-button" disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px;">{{ item }}</el-button>
                     </template>
                   </el-space>
                 </layout-main>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -434,6 +434,7 @@
             <div style="width: 100%;height: 100%;">
               <el-button type="" @click="gd_lcdCancel">退出</el-button>
             </div>
+			<br>
             <div style="width: 100%; height: 100%; display: flex; align-items: center;">
               <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
                 <el-input v-model="gd_lcdformData['gdbh']" @keyup.enter="gd_lcdProductValue"/>
@@ -457,10 +458,18 @@
                 </layout-sider>
                 <layout-main>
                   <!-- 这里放右侧的内容 -->
-                  <el-space wrap>
+				  <div style="display: flex; align-items: center;margin-left: 20px;">
+				  	<el-tag type="success" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+				  	<h2 style="margin: 0 20px 0 0;">绿格子图标表示“已完成”</h2>
+				  	<el-tag type="danger" style="width: 55px; height: 40px; margin-right: 10px;"><h2>流程号</h2></el-tag>
+				  	<h2 style="margin: 0;">红格子图标表示“未完成”</h2>
+				  </div>
+				  <br>
+                   <el-space wrap style="margin-left: 20px;">
                     <!-- 右侧内容 -->
                     <template v-for="item in processList.total_process">
-                      <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button>
+						<el-button  class="custom-button" disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px;">{{ item }}</el-button>
+                      <!-- <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button> -->
                     </template>
                   </el-space>
                 </layout-main>
@@ -1913,12 +1922,12 @@ const _getOrderProcessLeft_list = async () => {
 };
 //点击左侧获取工序显示右侧数据
 const lcd_handleNodeClick = async (node) => {
-  if (node.value === undefined || node.value === null){
-      return false;
-  }
+if (node.value === undefined) return
   const order = gd_lcdformData['gdbh'];
-  //5.2流程单查询-获取工单工序生产进程右侧【接口】
+  const yjno = gd_lcdformData['yjno'];
+  ////5.2流程单查询-获取工单工序生产进程右侧
   const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value,yjno:yjno});
+  console.log(getOrderProcessRight_list)
   processList.value = getOrderProcessRight_list.data
 };
 
@@ -4569,4 +4578,19 @@ const luckyexcelCloseDialog = () => {
 .mab{
   margin-bottom: 5px;
 }
+/*!* 流程单查询按钮颜色控制未完成*/
+:deep(.custom-button.el-button--info) {
+	background-color: palegreen !important;
+  color: #155724;
+  font-size: 20px;
+  border-color: #c3e6cb;
+}
+/* 已完成 */
+:deep(.custom-button.el-button--danger) {
+	background-color: rgb(236, 135, 135) !important;
+  color: #721c24;
+  font-size: 20px;
+  border-color: #f5c6cb;
+}
+
 </style>