解决 Oracle 关键字冲突的问题

导出最新的 SQL 脚本

yudao-ui-admin/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -292,8 +292,8 @@ export default {
           if (task.endTime) {
             html += `<p>结束时间：${this.parseTime(task.endTime)}</p>`
           }
-          if (task.comment) {
-            html += `<p>审批建议：${task.comment}</p>`
+          if (task.reason) {
+            html += `<p>审批建议：${task.reason}</p>`
           }
         } else if (element.type === 'bpmn:EndEvent' && this.processInstance) {
           html = `<p>结果：${this.getDictDataLabel(this.DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, this.processInstance.result)}</p>`;

yudao-ui-admin/src/views/bpm/processInstance/detail.vue

@@ -14,8 +14,8 @@
             {{ processInstance.startUser.nickname }}
             <el-tag type="info" size="mini">{{ processInstance.startUser.deptName }}</el-tag>
           </el-form-item>
-          <el-form-item label="审批建议" prop="comment">
-            <el-input type="textarea" v-model="auditForms[index].comment" placeholder="请输入审批建议" />
+          <el-form-item label="审批建议" prop="reason">
+            <el-input type="textarea" v-model="auditForms[index].reason" placeholder="请输入审批建议" />
           </el-form-item>
         </el-form>
         <div style="margin-left: 10%; margin-bottom: 20px; font-size: 14px;">
@@ -66,8 +66,8 @@
                 <label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{ parseTime(item.endTime) }}</label>
                 <label v-if="item.durationInMillis" style="margin-left: 30px;font-weight: normal">耗时：</label>
                 <label v-if="item.durationInMillis" style="color:#8a909c;font-weight: normal"> {{ getDateStar(item.durationInMillis) }} </label>
-                <p v-if="item.comment">
-                  <el-tag :type="getTimelineItemType(item)">{{ item.comment }}</el-tag>
+                <p v-if="item.reason">
+                  <el-tag :type="getTimelineItemType(item)">{{ item.reason }}</el-tag>
                 </p>
               </el-card>
             </el-timeline-item>
@@ -148,7 +148,7 @@ export default {
       runningTasks: [],
       auditForms: [],
       auditRule: {
-        comment: [{ required: true, message: "审批建议不能为空", trigger: "blur" }],
+        reason: [{ required: true, message: "审批建议不能为空", trigger: "blur" }],
       },
 
       // 转派审批人
@@ -259,7 +259,7 @@ export default {
           }
           this.runningTasks.push({...task});
           this.auditForms.push({
-            comment: ''
+            reason: ''
           })
         });
 
@@ -351,7 +351,7 @@ export default {
         }
         const data = {
           id: task.id,
-          comment: this.auditForms[index].comment
+          reason: this.auditForms[index].reason
         }
         if (pass) {
           approveTask(data).then(response => {

yudao-ui-admin/src/views/bpm/task/done.vue

@@ -28,7 +28,7 @@
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
         </template>
       </el-table-column>
-      <el-table-column label="审批意见" align="center" prop="comment" width="200" />
+      <el-table-column label="审批意见" align="center" prop="reason" width="200" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>