Pārlūkot izejas kodu

修改分管领导判断安全交底、技术交底

余思翰 8 mēnešus atpakaļ
vecāks
revīzija
97226ccce1

+ 4
- 4
oa-ui/src/views/flowable/form/oa/carForm.vue Parādīt failu

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-09-06 14:14:38
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-09-19 10:53:41
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
100
               </el-form-item>
100
               </el-form-item>
101
               <el-divider></el-divider>
101
               <el-divider></el-divider>
102
               <!-- 部门审核意见 -->
102
               <!-- 部门审核意见 -->
103
-              <el-form-item label="部门审核意见:" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
103
+              <el-form-item label="部门审核意见:" prop="deptComment" label-width="125px" v-if="showFormItem('部门审核')">
104
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
104
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
105
                   :disabled="taskName != '部门审核'">
105
                   :disabled="taskName != '部门审核'">
106
                 </el-input>
106
                 </el-input>
118
                 </el-col>
118
                 </el-col>
119
               </el-row>
119
               </el-row>
120
               <!-- 分管审核意见 -->
120
               <!-- 分管审核意见 -->
121
-              <el-form-item label="分管审核意见:" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
121
+              <el-form-item label="分管审核意见:" prop="managerComment" label-width="125px" v-if="showFormItem('分管审核')">
122
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
122
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
123
                   :disabled="taskName != '分管审核'">
123
                   :disabled="taskName != '分管审核'">
124
                 </el-input>
124
                 </el-input>

+ 8
- 5
oa-ui/src/views/flowable/form/projectProcess/manageReview.vue Parādīt failu

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-08 13:56:14
3
  * @Date: 2024-04-08 13:56:14
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-09-12 16:18:28
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2024-09-19 10:40:21
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
159
       let resPlan = await getTechnicalPlan(formId);
159
       let resPlan = await getTechnicalPlan(formId);
160
       let resTech = await getTechnical(formId);
160
       let resTech = await getTechnical(formId);
161
       if (resSafe.data) {
161
       if (resSafe.data) {
162
-        this.safe = true
162
+        if (resSafe.data.acceptComment && resSafe.data.acceptTime)
163
+          this.safe = true
163
       }
164
       }
164
       if (resPlan.data) {
165
       if (resPlan.data) {
165
-        this.plan = true
166
+        if (resPlan.data.technicalDocument && resPlan.data.technicalComment)
167
+          this.plan = true
166
       }
168
       }
167
       if (resTech.data) {
169
       if (resTech.data) {
168
-        this.tech = true
170
+        if (resTech.data.acceptComment)
171
+          this.tech = true
169
       }
172
       }
170
     },
173
     },
171
     getDeptLeader(val) {
174
     getDeptLeader(val) {

+ 8
- 11
oa-ui/src/views/flowable/form/projectProcess/planTab.vue Parādīt failu

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-04-19 15:32:00
3
  * @Date: 2024-04-19 15:32:00
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-08-02 10:43:19
5
+ * @LastEditTime: 2024-09-19 10:27:58
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
186
       form: {},
186
       form: {},
187
       rules: {},
187
       rules: {},
188
       userList: [],
188
       userList: [],
189
-      openPrint:false,
189
+      openPrint: false,
190
     };
190
     };
191
   },
191
   },
192
   mounted() {
192
   mounted() {
206
           let qualityInspector = this.processQualityInspector(technicalPlanRes.data)
206
           let qualityInspector = this.processQualityInspector(technicalPlanRes.data)
207
           technicalPlanRes.data.qualityInspector = qualityInspector
207
           technicalPlanRes.data.qualityInspector = qualityInspector
208
           this.form = technicalPlanRes.data;
208
           this.form = technicalPlanRes.data;
209
-          if (!this.projectNumber || !this.projectName) {
210
-            // 仅在需要时调用getProject  
211
-            const projectRes = await getProject(this.taskForm.formId);
212
-            if (projectRes.data) {
213
-              this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
214
-              this.$set(this.form, "projectName", projectRes.data.projectName);
215
-              this.$set(this.form, "projectLeader", projectRes.data.projectLeader);
216
-              this.$set(this.form, "undertakingDept", projectRes.data.undertakingDept);
217
-            }
209
+          const projectRes = await getProject(this.taskForm.formId);
210
+          if (projectRes.data) {
211
+            this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
212
+            this.$set(this.form, "projectName", projectRes.data.projectName);
213
+            this.$set(this.form, "projectLeader", projectRes.data.projectLeader);
214
+            this.$set(this.form, "undertakingDept", projectRes.data.undertakingDept);
218
           }
215
           }
219
         }
216
         }
220
       } catch (error) {
217
       } catch (error) {

+ 2
- 1
oa-ui/src/views/flowable/task/myProcess/index.vue Parādīt failu

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-03 09:23:11
3
  * @Date: 2024-01-03 09:23:11
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-09-13 14:47:39
5
+ * @LastEditTime: 2024-09-19 11:18:09
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
296
     },
296
     },
297
     /**  发起流程申请 */
297
     /**  发起流程申请 */
298
     handleStartProcess(row) {
298
     handleStartProcess(row) {
299
+      console.log(row);
299
       // if (row.category == "assess" || row.category == "car" || ) {
300
       // if (row.category == "assess" || row.category == "car" || ) {
300
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
301
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
301
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
302
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {

Notiek ielāde…
Atcelt
Saglabāt