From 07abda4b184fd201d23a3ba40cb188c2b78e71fa Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 15:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/components/TodolistRightTop.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/views/flow/components/TodolistRightTop.vue b/src/views/flow/components/TodolistRightTop.vue
index 4ae91df..65eb20a 100644
--- a/src/views/flow/components/TodolistRightTop.vue
+++ b/src/views/flow/components/TodolistRightTop.vue
@@ -1,56 +1,62 @@
<!--
* @Date: 2025-07-01 20:45:15
* @LastEditors: gaoshp
- * @LastEditTime: 2025-08-02 21:54:27
+ * @LastEditTime: 2025-08-10 14:51:59
* @FilePath: /mdmweb/src/views/flow/components/TodolistRightTop.vue
-->
<template>
<basic-container>
<el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="120px" disabled>
+ <el-form-item label="鏍囬">
+ <el-input v-model="formInline.title" placeholder="" style="width: 200px"></el-input>
+ </el-form-item>
<el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="formInline.processDefinitionName" placeholder=""></el-input>
+ <el-input v-model="formInline.processDefinitionName" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="鍒涘缓浜�">
- <el-input v-model="formInline.startUserName" placeholder=""></el-input>
+ <el-input v-model="formInline.startUserName" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="鍥惧彿鐗堟">
- <el-input v-model="formInline.drawingNoEdition" placeholder=""></el-input>
+ <el-input v-model="formInline.drawingNoEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="宸ヨ壓鐗堟">
- <el-input v-model="formInline.craftEdition" placeholder=""></el-input>
+ <el-input v-model="formInline.craftEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="浠诲姟杞﹂棿">
- <el-input v-model="formInline.empty" placeholder=""></el-input>
+ <el-input v-model="formInline.workshop" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="浜у搧鍨嬪彿">
- <el-input v-model="formInline.productModel" placeholder=""></el-input>
+ <el-input v-model="formInline.productModel" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="宸ュ簭鍙�">
- <el-input v-model="formInline.processNo" placeholder=""></el-input>
+ <el-input v-model="formInline.processNo" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О">
- <el-input v-model="formInline.processName" placeholder=""></el-input>
+ <el-input v-model="formInline.processName" placeholder="" style="width: 200px"></el-input>
+ </el-form-item>
+ <el-form-item label="宸ュ簭鐗堟">
+ <el-input v-model="formInline.processEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="闆剁粍浠跺彿">
- <el-input v-model="formInline.drawingNo" placeholder=""></el-input>
+ <el-input v-model="formInline.drawingNo" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="鍔犲伐鏈哄簥">
- <el-input v-model="formInline.machineCode" placeholder=""></el-input>
+ <el-input v-model="formInline.machineCode" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="杩囩▼鍗″彿">
- <el-input v-model="formInline.empty" placeholder=""></el-input>
+ <el-input v-model="formInline.empty" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
- <el-input v-model="formInline.createTime" placeholder=""></el-input>
+ <el-input v-model="formInline.createTime" placeholder="" style="width: 200px"></el-input>
</el-form-item>
- <el-form-item label="璁″垝鍔犲伐鏃堕棿">
- <el-input v-model="formInline.planStartTime" placeholder=""></el-input>
+ <el-form-item label="璁″垝鍔犲伐鏃堕棿" v-if="row.processDefinitionKey !== 'program-replace'">
+ <el-input v-model="formInline.planStartTime" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="绋嬪簭鍖呭悕">
- <el-input v-model="formInline.programmer" placeholder=""></el-input>
+ <el-input v-model="formInline.programPackageName" placeholder="" style="width: 200px"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鑺傜偣">
- <el-input v-model="formInline.taskName" placeholder=""></el-input>
+ <el-input v-model="formInline.taskName" placeholder="" style="width: 200px"></el-input>
</el-form-item>
</el-form>
</basic-container>
@@ -72,18 +78,24 @@
// Initialize formInline with row data
this.formInline = {
...this.row,
+ title: this.row.variables.title || '',
processDefinitionName: this.row.processDefinitionName || '',
taskName: this.row.taskName || '',
createTime: this.row.createTime || '',
- startUserName: this.row.drawingNoEdition || '',
+ startUserName: this.row.startUserName || '',
drawingNoEdition: this.row.variables.drawingNoEdition || '',
craftEdition: this.row.variables.craftEdition || '',
machineCode: this.row.variables.machineCode || '',
processName: this.row.variables.processName || '',
processNo: this.row.variables.processNo || '',
+ processEdition: this.row.variables.processEdition || '',
+
planStartTime: this.row.variables.planStartTime || '',
productModel: this.row.variables.productModel || '',
+ programPackageName: this.row.variables.programPackageName || '',
+ workshop: this.row.variables.workshop || '',
drawingNo: this.row.variables.drawingNo || '',
+
}
}
}
--
Gitblit v1.9.3