Przeglądaj źródła

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

余思翰 1 rok temu
rodzic
commit
9443d0529f

+ 5
- 1
oa-ui/src/assets/styles/index.scss Wyświetl plik

198
   font-family: 'xdks'; // 根据自己用的去重命名字体名 
198
   font-family: 'xdks'; // 根据自己用的去重命名字体名 
199
   src: url('~@/assets/font/kaishu/xdks.ttf');
199
   src: url('~@/assets/font/kaishu/xdks.ttf');
200
 }
200
 }
201
+@font-face {
202
+  font-family:'auditor'; // 根据自己用的去重命名字体名 
203
+  src: url('~@/assets/font/kaishu/auditor.ttf');
204
+}
201
 .vertical-text{
205
 .vertical-text{
202
   writing-mode: vertical-rl;
206
   writing-mode: vertical-rl;
203
   transform: rotate(360deg);
207
   transform: rotate(360deg);
205
 }
209
 }
206
 
210
 
207
 .auditor {
211
 .auditor {
208
-  font-family: 'xdks';
212
+  font-family: 'auditor';
209
   font-size: 20px;
213
   font-size: 20px;
210
 }
214
 }

+ 10
- 4
oa-ui/src/views/flowable/form/archiveForm.vue Wyświetl plik

134
             交</el-button>
134
             交</el-button>
135
         </div>
135
         </div>
136
       </el-col>
136
       </el-col>
137
-      <el-col :span="6" :xs="24">
137
+      <el-col :span="6" :xs="24" v-if="isFlow">
138
         <el-card>
138
         <el-card>
139
           <h2 style="text-align: center;">流程进度</h2>
139
           <h2 style="text-align: center;">流程进度</h2>
140
           <div>
140
           <div>
189
     taskForm: {
189
     taskForm: {
190
       type: Object,
190
       type: Object,
191
       required: true
191
       required: true
192
+    },
193
+    isFlow:{
194
+      type:Object,
195
+      default:true
192
     }
196
     }
193
   },
197
   },
194
   name: "Archive",
198
   name: "Archive",
295
     }
299
     }
296
     this.getProjectList();
300
     this.getProjectList();
297
     this.getList();
301
     this.getList();
298
-    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
299
-      this.flowData = res.data;
300
-    })
302
+    if(this.isFlow){
303
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
304
+        this.flowData = res.data;
305
+      })
306
+    }
301
   },
307
   },
302
   methods: {
308
   methods: {
303
     // 初始化表单
309
     // 初始化表单

+ 3
- 2
oa-ui/src/views/flowable/form/finance/borrowForm.vue Wyświetl plik

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

+ 46
- 2
oa-ui/src/views/flowable/form/inProgress/achiData.vue Wyświetl plik

48
     </el-table>
48
     </el-table>
49
 
49
 
50
     <el-dialog title=" 成果明细" :visible.sync="open" append-to-body width="65%">
50
     <el-dialog title=" 成果明细" :visible.sync="open" append-to-body width="65%">
51
-      
51
+      <archive-form :taskForm="openObj" :taskName="''" :isFlow="false"></archive-form>
52
+      <!-- <el-form ref="form" :model="form" label-width="150px">
53
+        <el-form-item label="项目信息:" prop="projectName">
54
+          {{ form.projectName }}
55
+        </el-form-item>
56
+        <el-form-item label="成果汇交时间:" prop="submitTime">
57
+          {{ form.submitTime }}
58
+        </el-form-item>
59
+        <el-form-item label="生产部门检查员:" prop="submitTime">
60
+          {{ findUserName(form.produceInspector) }}
61
+        </el-form-item>
62
+        <el-form-item label="质量检查员:" prop="submitTime">
63
+          {{ findUserName(form.qualityInspector) }}
64
+        </el-form-item>
65
+        <el-form-item label="技术部负责人:" prop="submitTime">
66
+          {{ findUserName(form.deptLeader) }}
67
+        </el-form-item>
68
+        <el-form-item label="归档人:" prop="submitTime">
69
+          {{ findUserName(form.archiver) }}
70
+        </el-form-item>
71
+        <el-form-item label="资料接受时间:" prop="submitTime">
72
+          {{ form.receiveTime }}
73
+        </el-form-item>
74
+        <el-form-item label="质量检查时间:" prop="submitTime">
75
+          {{ form.qualityTime }}
76
+        </el-form-item>
77
+        <el-form-item label="生产部门检查时间:" prop="submitTime">
78
+          {{ form.produceTime }}
79
+        </el-form-item>
80
+        <el-form-item label="归档时间:" prop="submitTime">
81
+          {{ form.archiveTime }}
82
+        </el-form-item>
83
+      </el-form> -->
52
     </el-dialog>
84
     </el-dialog>
53
   </div>
85
   </div>
54
 </template>
86
 </template>
58
 import { listDefinition } from "@/api/flowable/definition";
90
 import { listDefinition } from "@/api/flowable/definition";
59
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
91
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
60
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
92
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
93
+import { getProject } from "@/api/oa/project/project";
61
 import { todoList } from "@/api/flowable/todo";
94
 import { todoList } from "@/api/flowable/todo";
62
 import { Snowflake } from '@/utils/snowFlake.js'
95
 import { Snowflake } from '@/utils/snowFlake.js'
63
 import { MessageBox } from 'element-ui'
96
 import { MessageBox } from 'element-ui'
79
       achiList: [],
112
       achiList: [],
80
       definitionList: [],
113
       definitionList: [],
81
       open:false,
114
       open:false,
115
+      openObj:{},
116
+      form:{
117
+        projectName:''
118
+      }
82
     }
119
     }
83
   },
120
   },
84
   mounted() {
121
   mounted() {
112
       });
149
       });
113
     },
150
     },
114
     handleLook(row) {
151
     handleLook(row) {
115
-      this.open = true
152
+      console.log(row);
153
+      this.form= row
154
+      this.openObj.formId = row.archiveId
155
+      getProject(row.projectId).then(res=>{
156
+        if(res.data)
157
+          this.$set(this.form,'projectName',res.data.projectNumber + '-' + res.data.projectName)
158
+        this.open = true
159
+      })
116
     },
160
     },
117
     addAchi() {
161
     addAchi() {
118
       let row = this.definitionList[0];
162
       let row = this.definitionList[0];

+ 6
- 8
oa-ui/src/views/flowable/form/oa/carForm.vue Wyświetl plik

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-05-23 19:22:26
5
+ * @LastEditTime: 2024-06-03 17:23:30
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
76
               </el-form-item>
76
               </el-form-item>
77
               <el-row>
77
               <el-row>
78
                 <el-col :span="7" :xs="24">
78
                 <el-col :span="7" :xs="24">
79
-                  <el-form-item label="乘车人数:" prop="passengers">
80
-                    <el-input-number v-model="form.passengers" :min="1"
81
-                      :disabled="taskName != '用车申请'"></el-input-number>
82
-                  </el-form-item>
83
-                </el-col>
84
-                <el-col :span="6" :xs="24">
85
                   <el-form-item label="开始日期:" prop="beginDate">
79
                   <el-form-item label="开始日期:" prop="beginDate">
86
                     <el-date-picker style="width:170px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
80
                     <el-date-picker style="width:170px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
87
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
81
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
88
                     </el-date-picker>
82
                     </el-date-picker>
89
                   </el-form-item>
83
                   </el-form-item>
90
                 </el-col>
84
                 </el-col>
91
-                <el-col :span="6" :xs="24">
85
+                <el-col :span="7" :xs="24">
92
                   <el-form-item label="结束日期:" prop="endDate">
86
                   <el-form-item label="结束日期:" prop="endDate">
93
                     <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
87
                     <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
94
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
88
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
101
                   </el-form-item>
95
                   </el-form-item>
102
                 </el-col>
96
                 </el-col>
103
               </el-row>
97
               </el-row>
98
+              <el-form-item label="乘车人数:" prop="passengers">
99
+                <el-input-number v-model="form.passengers" :min="1"
100
+                  :disabled="taskName != '用车申请'"></el-input-number>
101
+                </el-form-item>
104
               <el-divider></el-divider>
102
               <el-divider></el-divider>
105
               <!-- 部门审核意见 -->
103
               <!-- 部门审核意见 -->
106
               <el-form-item label="部门审核意见:" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
104
               <el-form-item label="部门审核意见:" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">

+ 2
- 2
oa-ui/src/views/flowable/form/projectProcess/addproject.vue Wyświetl plik

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

+ 4
- 3
oa-ui/src/views/flowable/form/projectProcess/inProgress.vue Wyświetl plik

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

+ 3
- 1
oa-ui/src/views/flowable/form/settleForm.vue Wyświetl plik

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

+ 3
- 3
oa-ui/src/views/flowable/task/myProcess/index.vue Wyświetl plik

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-06-03 15:23:55
5
+ * @LastEditTime: 2024-06-03 17:07:45
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div class="app-container">
8
   <div class="app-container">
30
     </el-row>
30
     </el-row>
31
 
31
 
32
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
32
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
33
-      <el-table-column type="selection" width="55" align="center" />
33
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
34
       <el-table-column type="index" label="序号" width="55" align="center" />
34
       <el-table-column type="index" label="序号" width="55" align="center" />
35
       <el-table-column label="流程状态" align="center" width="100">
35
       <el-table-column label="流程状态" align="center" width="100">
36
         <template slot-scope="scope">
36
         <template slot-scope="scope">
63
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
63
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
64
           <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
64
           <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
65
           <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
65
           <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
66
-          <el-button @click="handleDelete(scope.row)" type="text" size="small" :disabled="beDeleted(scope.row)"
66
+          <el-button @click="handleDelete(scope.row)" style="color:#F56C6C" type="text" size="small" :disabled="beDeleted(scope.row)"
67
             v-hasPermi="['system:deployment:remove']">删除</el-button>
67
             v-hasPermi="['system:deployment:remove']">删除</el-button>
68
         </template>
68
         </template>
69
       </el-table-column>
69
       </el-table-column>

+ 5
- 5
oa-ui/src/views/index.vue Wyświetl plik

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-05-31 14:24:08
5
+ * @LastEditTime: 2024-06-03 16:18:24
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
50
 
50
 
51
     </el-row>
51
     </el-row>
52
     <el-row :gutter="20">
52
     <el-row :gutter="20">
53
-      <el-col :span="5" :xs="24">
53
+      <el-col :span="8" :xs="24">
54
         <div class="header">日历</div>
54
         <div class="header">日历</div>
55
         <div class="calendar-warpper">
55
         <div class="calendar-warpper">
56
           <!-- <Calendar></Calendar> -->
56
           <!-- <Calendar></Calendar> -->
58
           </el-calendar>
58
           </el-calendar>
59
         </div>
59
         </div>
60
       </el-col>
60
       </el-col>
61
-      <el-col :span="11" :xs="24">
61
+      <el-col :span="16" :xs="24">
62
         <div class="header">公告</div>
62
         <div class="header">公告</div>
63
         <div class="notice-content">
63
         <div class="notice-content">
64
           <el-table v-loading="noticeLoading" :data="noticeList" height="320px" @row-click="handleRowClick">
64
           <el-table v-loading="noticeLoading" :data="noticeList" height="320px" @row-click="handleRowClick">
84
 
84
 
85
         </div>
85
         </div>
86
       </el-col>
86
       </el-col>
87
-      <el-col :span="8" :xs="24">
87
+      <!-- <el-col :span="8" :xs="24">
88
         <div class="header">XXXX</div>
88
         <div class="header">XXXX</div>
89
         <div class="project-content">
89
         <div class="project-content">
90
 
90
 
91
         </div>
91
         </div>
92
-      </el-col>
92
+      </el-col> -->
93
     </el-row>
93
     </el-row>
94
   </div>
94
   </div>
95
 </template>
95
 </template>

Ładowanie…
Anuluj
Zapisz