修改一些页面的逻辑，修改签字字体

oa-ui/src/assets/styles/index.scss

@@ -198,6 +198,10 @@ aside {
   font-family: 'xdks'; // 根据自己用的去重命名字体名 
   src: url('~@/assets/font/kaishu/xdks.ttf');
 }
+@font-face {
+  font-family:'auditor'; // 根据自己用的去重命名字体名 
+  src: url('~@/assets/font/kaishu/auditor.ttf');
+}
 .vertical-text{
   writing-mode: vertical-rl;
   transform: rotate(360deg);
@@ -205,6 +209,6 @@ aside {
 }
 
 .auditor {
-  font-family: 'xdks';
+  font-family: 'auditor';
   font-size: 20px;
 }

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -134,7 +134,7 @@
             交</el-button>
         </div>
       </el-col>
-      <el-col :span="6" :xs="24">
+      <el-col :span="6" :xs="24" v-if="isFlow">
         <el-card>
           <h2 style="text-align: center;">流程进度</h2>
           <div>
@@ -189,6 +189,10 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    isFlow:{
+      type:Object,
+      default:true
     }
   },
   name: "Archive",
@@ -295,9 +299,11 @@ export default {
     }
     this.getProjectList();
     this.getList();
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
-      this.flowData = res.data;
-    })
+    if(this.isFlow){
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
+    }
   },
   methods: {
     // 初始化表单

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -70,6 +70,7 @@
                 <td>申请金额</td>
                 <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">项目管理部校核金额</td>
                 <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">分管领导审核金额</td>
+                <td>操作</td>
               </tr>
               <tr v-for="(detail, index) in detailList" :key="index">
                 <td>
@@ -101,8 +102,8 @@
                     @change="calculateManagerAmount(detail)"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle :disabled="taskName != '借款申请'"
-                    @click="deleDetailItem(index)"></el-button>
+                  <el-button type="text" style="color:#F56C6C" icon="el-icon-delete" size="mini" circle :disabled="taskName != '借款申请'"
+                    @click="deleDetailItem(index)">删除行</el-button>
                 </td>
               </tr>
             </table>

oa-ui/src/views/flowable/form/inProgress/achiData.vue

@@ -48,7 +48,39 @@
     </el-table>
 
     <el-dialog title=" 成果明细" :visible.sync="open" append-to-body width="65%">
-      
+      <archive-form :taskForm="openObj" :taskName="''" :isFlow="false"></archive-form>
+      <!-- <el-form ref="form" :model="form" label-width="150px">
+        <el-form-item label="项目信息:" prop="projectName">
+          {{ form.projectName }}
+        </el-form-item>
+        <el-form-item label="成果汇交时间:" prop="submitTime">
+          {{ form.submitTime }}
+        </el-form-item>
+        <el-form-item label="生产部门检查员:" prop="submitTime">
+          {{ findUserName(form.produceInspector) }}
+        </el-form-item>
+        <el-form-item label="质量检查员:" prop="submitTime">
+          {{ findUserName(form.qualityInspector) }}
+        </el-form-item>
+        <el-form-item label="技术部负责人:" prop="submitTime">
+          {{ findUserName(form.deptLeader) }}
+        </el-form-item>
+        <el-form-item label="归档人:" prop="submitTime">
+          {{ findUserName(form.archiver) }}
+        </el-form-item>
+        <el-form-item label="资料接受时间:" prop="submitTime">
+          {{ form.receiveTime }}
+        </el-form-item>
+        <el-form-item label="质量检查时间:" prop="submitTime">
+          {{ form.qualityTime }}
+        </el-form-item>
+        <el-form-item label="生产部门检查时间:" prop="submitTime">
+          {{ form.produceTime }}
+        </el-form-item>
+        <el-form-item label="归档时间:" prop="submitTime">
+          {{ form.archiveTime }}
+        </el-form-item>
+      </el-form> -->
     </el-dialog>
   </div>
 </template>
@@ -58,6 +90,7 @@ import { listArchive } from "@/api/oa/archive/archive"
 import { listDefinition } from "@/api/flowable/definition";
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { getProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { MessageBox } from 'element-ui'
@@ -79,6 +112,10 @@ export default {
       achiList: [],
       definitionList: [],
       open:false,
+      openObj:{},
+      form:{
+        projectName:''
+      }
     }
   },
   mounted() {
@@ -112,7 +149,14 @@ export default {
       });
     },
     handleLook(row) {
-      this.open = true
+      console.log(row);
+      this.form= row
+      this.openObj.formId = row.archiveId
+      getProject(row.projectId).then(res=>{
+        if(res.data)
+          this.$set(this.form,'projectName',res.data.projectNumber + '-' + res.data.projectName)
+        this.open = true
+      })
     },
     addAchi() {
       let row = this.definitionList[0];

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 19:22:26
+ * @LastEditTime: 2024-06-03 17:23:30
 -->
 
 <template>
@@ -76,19 +76,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="7" :xs="24">
-                  <el-form-item label="乘车人数：" prop="passengers">
-                    <el-input-number v-model="form.passengers" :min="1"
-                      :disabled="taskName != '用车申请'"></el-input-number>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6" :xs="24">
                   <el-form-item label="开始日期：" prop="beginDate">
                     <el-date-picker style="width:170px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" :xs="24">
+                <el-col :span="7" :xs="24">
                   <el-form-item label="结束日期：" prop="endDate">
                     <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
@@ -101,6 +95,10 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-form-item label="乘车人数：" prop="passengers">
+                <el-input-number v-model="form.passengers" :min="1"
+                  :disabled="taskName != '用车申请'"></el-input-number>
+                </el-form-item>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
               <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-28 10:35:58
+ * @LastEditTime: 2024-06-03 17:15:38
 -->
 <template>
   <div class="project-wrapper">
@@ -117,7 +117,7 @@
           :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setProjectDocument">
         </FileUpload>
         <div v-if="$route.query.taskName != '项目登记'" class="upload-list">
-          <el-link :href="`${baseUrl}${'/profile/upload' + addForm.taskDocument}`" :underline="false" target="_blank">
+          <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + addForm.taskDocument}`" :underline="false" target="_blank">
             <span class="el-icon-document"> {{ getFileName(addForm.taskDocument) }} </span>
           </el-link>
         </div>

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-31 16:53:29
+ * @LastEditTime: 2024-06-03 17:12:50
 -->
 <template>
   <div>
@@ -68,6 +68,7 @@
               <td>截至日期</td>
               <td>累计总进度（%）</td>
               <td style="width: 300px">情况说明</td>
+              <td style="width: 80px">操作</td>
             </tr>
             <tr v-for="(progress, index) in progressList" :key="index">
               <td>
@@ -85,8 +86,8 @@
                 <el-input v-model="progress.situation" type="textarea"></el-input>
               </td>
               <td>
-                <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                  @click="deleProgressItem(index)"></el-button>
+                <el-button type="text" icon="el-icon-delete" style="color:#F56C6C" size="mini"
+                  @click="deleProgressItem(index)">删除行</el-button>
               </td>
             </tr>
           </table>

oa-ui/src/views/flowable/form/settleForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 15:51:12
+ * @LastEditTime: 2024-06-03 17:06:45
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -1010,6 +1010,8 @@ export default {
           } else if (this.taskName == "总经理审批") {
             this.getNextFlowNodeFn();
           }
+        }else{
+          this.$message.error('请完善表单必填项')
         }
       });
     },

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-03 15:23:55
+ * @LastEditTime: 2024-06-03 17:07:45
 -->
 <template>
   <div class="app-container">
@@ -30,7 +30,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="流程状态" align="center" width="100">
         <template slot-scope="scope">
@@ -63,7 +63,7 @@
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
           <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
           <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
-          <el-button @click="handleDelete(scope.row)" type="text" size="small" :disabled="beDeleted(scope.row)"
+          <el-button @click="handleDelete(scope.row)" style="color:#F56C6C" type="text" size="small" :disabled="beDeleted(scope.row)"
             v-hasPermi="['system:deployment:remove']">删除</el-button>
         </template>
       </el-table-column>

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-31 14:24:08
+ * @LastEditTime: 2024-06-03 16:18:24
 -->
 
 <template>
@@ -50,7 +50,7 @@
 
     </el-row>
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24">
+      <el-col :span="8" :xs="24">
         <div class="header">日历</div>
         <div class="calendar-warpper">
           <!-- <Calendar></Calendar> -->
@@ -58,7 +58,7 @@
           </el-calendar>
         </div>
       </el-col>
-      <el-col :span="11" :xs="24">
+      <el-col :span="16" :xs="24">
         <div class="header">公告</div>
         <div class="notice-content">
           <el-table v-loading="noticeLoading" :data="noticeList" height="320px" @row-click="handleRowClick">
@@ -84,12 +84,12 @@
 
         </div>
       </el-col>
-      <el-col :span="8" :xs="24">
+      <!-- <el-col :span="8" :xs="24">
         <div class="header">XXXX</div>
         <div class="project-content">
 
         </div>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>