|
|
@@ -233,10 +233,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>
|
|
|
@@ -1558,8 +1566,13 @@ const pd_lcdlistonClick = async () => {
|
|
|
ElMessage({type: 'warning',message: '请选择具体的工单，在进行操作'})
|
|
|
return false;
|
|
|
}else{
|
|
|
+ console.log(_Gd_yjno)
|
|
|
pd_lcdformData['gdbh'] = _Gd_gdbh.value;
|
|
|
- pd_lcdformData['yjno'] = _Gd_yjno.value;
|
|
|
+ if(_Gd_yjno.value === '' || _Gd_yjno.value === null){
|
|
|
+ pd_lcdformData['yjno'] = 1;
|
|
|
+ }else{
|
|
|
+ pd_lcdformData['yjno'] = _Gd_yjno.value;
|
|
|
+ }
|
|
|
pd_lcdlist.value = true;
|
|
|
processList.value = []
|
|
|
_getOrderProcessLeft_list();
|
|
|
@@ -1574,6 +1587,7 @@ const _getOrderProcessLeft_list = async () => {
|
|
|
const yjno = pd_lcdformData['yjno']
|
|
|
// console.log(order)
|
|
|
try {
|
|
|
+
|
|
|
//5.1流程单查询-工单工序生产进程菜单栏
|
|
|
const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order,yjno:yjno});
|
|
|
console.log(getOrderProcessLeft_list)
|
|
|
@@ -1778,4 +1792,19 @@ const rowContextMenu = (row) => {
|
|
|
.focusdiv:focus {
|
|
|
border: 1px solid red;
|
|
|
}
|
|
|
+/*!* 流程单查询按钮颜色控制未完成*/
|
|
|
+: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>
|
