用车审批流程修改，上传文件类型修改

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarApprovalController.java

@@ -171,10 +171,12 @@ public class CmcCarApprovalController extends BaseController
         }
         if (formDataJson.getJSONArray("cars").size() > 0 && formDataJson.getJSONArray("drivers").size() > 0) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
+            cmcCarApproval.setKilometers(formDataJson.getString("kilometers"));
+            cmcCarApproval.setReturnDate(formDataJson.getDate("returnDate"));
             String carString = formDataJson.getString("cars").substring(1, formDataJson.getString("cars").length() - 1);
             cmcCarApproval.setCars(carString);
             cmcCarApproval.setDrivers(formDataJson.getString("drivers").substring(1, formDataJson.getString("drivers").length() - 1));
-            if (!formDataJson.getString("projectId").equals("")) {
+            if (formDataJson.getString("projectId") != null && !formDataJson.getString("projectId").equals("")) {
                 CmcProject cmcProject = new CmcProject();
                 cmcProject.setProjectId(formDataJson.getString("projectId"));
                 CmcProject project = cmcProjectService.selectCmcProjectByProjectId(cmcProject.getProjectId());

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarApproval.java

@@ -170,6 +170,15 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "派车审批时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date dispatchTime;
 
+    /** 返回时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "返回时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date returnDate;
+
+    /** 行驶公里数 */
+    @Excel(name = "行驶公里数")
+    private String kilometers;
+
     private SysUser applierUser;
 
     private SysUser deptUser;
@@ -590,6 +599,25 @@ public class CmcCarApproval extends BaseEntity
         return dispatchTime;
     }
 
+    public void setReturnDate(Date returnDate)
+    {
+        this.returnDate = returnDate;
+    }
+
+    public Date getReturnDate()
+    {
+        return returnDate;
+    }
+    public void setKilometers(String kilometers)
+    {
+        this.kilometers = kilometers;
+    }
+
+    public String getKilometers()
+    {
+        return kilometers;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -35,6 +35,8 @@
         <result property="gmTime"    column="gm_time"    />
         <result property="dszTime"    column="dsz_time"    />
         <result property="dispatchTime"    column="dispatch_time"    />
+        <result property="returnDate"    column="return_date"    />
+        <result property="kilometers"    column="kilometers"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
@@ -97,7 +99,7 @@
                ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.end_date, ca.days, ca.dept_user_id, u1.nick_name as dept_nick_name, ca.dept_comment, ca.manager_user_id,
                u2.nick_name as manager_nick_name, ca.manager_comment, ca.car_usage, ca.union_user_id, u3.nick_name as union_nick_name, ca.union_comment, ca.gm_user_id, u4.nick_name as gm_nick_name,
                ca.dsz_user_id, u5.nick_name as dsz_nick_name, ca.gm_comment, ca.dsz_comment, ca.dispatcher, u6.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time,
-               ca.manager_time, ca.union_time, ca.gm_time, ca.dsz_time, ca.dispatch_time from cmc_car_approval as ca
+               ca.manager_time, ca.union_time, ca.gm_time, ca.dsz_time, ca.dispatch_time, ca.return_date, ca.kilometers from cmc_car_approval as ca
             left join sys_user as u on u.user_id = ca.applier
             left join sys_user as u1 on u1.user_id = ca.dept_user_id
             left join sys_user as u2 on u2.user_id = ca.manager_user_id
@@ -136,7 +138,7 @@
             <if test="dispatchComment != null  and dispatchComment != ''"> and ca.dispatch_comment = #{dispatchComment}</if>
             <if test="estimateCost != null "> and ca.estimate_cost = #{estimateCost}</if>
         </where>
-        order by ca.apply_date asc
+        order by ca.apply_date desc
     </select>
 
     <select id="selectCmcCarApprovalByCarApplyId" parameterType="String" resultMap="CmcCarApprovalResult">
@@ -236,8 +238,10 @@
             <if test="managerTime != null ">manager_time = #{managerTime},</if>
             <if test="unionTime != null ">union_time = #{unionTime},</if>
             <if test="gmTime != null ">gm_time = #{gmTime},</if>
-            <if test="dszTime != null ">dsz_time = #{dszTime}</if>
-            <if test="dispatchTime != null ">dispatch_time = #{dispatchTime}</if>
+            <if test="dszTime != null ">dsz_time = #{dszTime},</if>
+            <if test="dispatchTime != null ">dispatch_time = #{dispatchTime},</if>
+            <if test="returnDate != null ">return_date = #{returnDate},</if>
+            <if test="kilometers != null ">kilometers = #{kilometers},</if>
         </trim>
         where car_apply_id = #{carApplyId}
     </update>

oa-ui/src/components/FileUpload/index.vue

@@ -3,7 +3,7 @@
     <el-upload :action="uploadFileUrl" :data="additionalData" :before-upload="handleBeforeUpload" :file-list="fileList"
       :limit="limit" :on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess"
       :show-file-list="false" :headers="headers" class="upload-file-uploader" ref="fileUpload"
-      accept=".doc,.docx,.xls,.xlsx,.pdf">
+      accept=".doc,.docx,.xls,.xlsx,.pdf,.rar,.zip">
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- 上传提示 -->

oa-ui/src/components/preview/index.vue

@@ -1,9 +1,15 @@
+<!--
+ * @Author: wrh
+ * @Date: 2024-06-04 18:18:09
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-22 12:34:21
+-->
 <template>
   <div v-loading="loading">
     <vue-office-docx :src="url" v-if="fileType == 'docx'" />
     <vue-office-excel :src="url" v-if="fileType == 'xlsx'" />
     <vue-office-pdf :src="url" v-if="fileType == 'pdf'"></vue-office-pdf>
-    <div v-if="fileType == 'doc' || fileType == 'xls'">
+    <div v-if="fileType == 'doc' || fileType == 'xls' || fileType == 'zip' || fileType == 'rar'">
       <el-empty :image-size="200" :description="'抱歉，' + fileType + '类型文件不支持在线预览，请下载到本地查看'">
         <el-link type="primary" :href="url" :underline="false" target="_blank">
           <span>立即下载</span>

oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -31,7 +31,7 @@
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
             <FileUpload v-if="formTotal == 0" :disabled="taskName != '支付申请'" :limit="1" :filePathName="'品牌项目支付/审核文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBrandPath"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getBrandPath"></FileUpload>
             <div v-if="formTotal == 1">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.approvalDocument}`)">
                 {{ getFileName(form.approvalDocument) }}

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -77,7 +77,7 @@
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
             <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
+              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
             </FileUpload>
             <div v-if="form.contractDocument && taskName != '合同拟稿'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -246,7 +246,7 @@
                   <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
                     :filePathName="'承接合同/线上会审意见'"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setCommentDocument">
                   </FileUpload>
 
                   <!-- <el-input v-model="comment.document" clearable
@@ -325,7 +325,7 @@
                 <td colspan="5">
                   <FileUpload :disabled="taskName != '会议评审'"
                     v-if="meetingForm.document == '' || meetingForm.document == null" ref="meetingDocument" :limit="1"
-                    :filePathName="'承接合同/会议评审意见'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                    :filePathName="'承接合同/会议评审意见'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
                     @input="getMeetingPath"></FileUpload>
                   <div v-if="meetingForm.document != '' && meetingForm.document != null">
                     <file-item :document="meetingForm.document"></file-item>
@@ -403,7 +403,7 @@
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
             <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''"
-              ref="contractFile" :limit="1" :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              ref="contractFile" :limit="1" :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
               @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan && taskName != '合同签订'">

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -76,7 +76,7 @@
             <el-col :span="16" :xs="24">
               <el-form-item label="合同文件" prop="contractDocument">
                 <FileUpload v-if="formTotal == 0" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
+                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
                 </FileUpload>
                 <div v-if="taskName != '合同拟稿' && form.contractDocument">
                   <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -251,7 +251,7 @@
                   <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
                     :filePathName="'分包合同/线上会审意见'"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setCommentDocument">
                   </FileUpload>
                   <div v-if="comment.document != '' && comment.document != null">
                     <transition-group class="upload-file-list el-upload-list el-upload-list--text"
@@ -325,7 +325,7 @@
                 <td colspan="5" style="text-align:left;">
                   <FileUpload v-if="meetingForm.document == null || meetingForm.document == ''" ref="contractFile"
                     :limit="1" :filePathName="'分包合同/会议评审意见'" :disabled="taskName != '会议评审'"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getMeetingPath"></FileUpload>
                   <div v-if="meetingForm.document != null && meetingForm.document != ''">
                     <file-item :document="meetingForm.document"></file-item>
                   </div>
@@ -398,7 +398,7 @@
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
             <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''" :limit="1"
-              :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+              :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan && taskName != '合同签订'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">

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

@@ -144,7 +144,7 @@
           </el-form-item>
           <el-form-item label="附件上传" prop="borrowDocument">
             <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"
-              :limit="1" :filePathName="'借款/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              :limit="1" :filePathName="'借款/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
               @input="getBorrowPath"></FileUpload>
             <div v-if="form.borrowDocument && taskName != '借款申请'">
               <!-- <file-item :document="form.borrowDocument"></file-item> -->
@@ -247,7 +247,7 @@
           <el-divider></el-divider>
           <el-form-item label="支付凭证" prop="lendDocument">
             <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'借款/支付凭证'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getLendPath">
             </FileUpload>
             <div v-if="form.lendDocument && taskName != '财务处理'">
               <!-- <file-item :document="form.lendDocument"></file-item> -->

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

@@ -102,7 +102,7 @@
           </el-form-item>
           <el-form-item label="相关附件" prop="applyDocument">
             <FileUpload v-if="form.applyDocument == null || form.applyDocument == ''" :disabled="taskName != '保证金申请'"
-              :limit="1" :filePathName="'保证金/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              :limit="1" :filePathName="'保证金/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
               @input="getApplyPath"></FileUpload>
             <div v-if="form.applyDocument && taskName != '保证金申请'">
               <!-- <file-item :document="form.applyDocument"></file-item> -->
@@ -147,7 +147,7 @@
           <el-divider></el-divider>
           <el-form-item label="汇款凭证" prop="remitDocument">
             <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'保证金/汇款凭证'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getRemitPath"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getRemitPath"></FileUpload>
             <div v-if="form.remitDocument && taskName != '财务处理'">
               <!-- <file-item :document="form.remitDocument"></file-item> -->
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.remitDocument}`)">

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-17 17:29:24
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-22 17:57:05
 -->
 
 <template>
@@ -179,12 +179,12 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核签名')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('董事长审核签名')">
                     <span class="auditor"> {{ form.dszUser ? form.dszUser.nickName : dszUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核签名')">
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('董事长审核签名')">
                     <span> {{ form.dszTime ? form.dszTime : dszTime }} </span>
                   </el-form-item>
                 </el-col>
@@ -198,12 +198,12 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="taskName == '安排用车' || taskName == '申请确认'">
+                  <el-form-item label="签名：" label-width="120px" v-if="taskName == '安排用车'">
                     <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="taskName == '安排用车' || taskName == '申请确认'">
+                  <el-form-item label="日期：" label-width="120px" v-if="taskName == '安排用车'">
                     <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
@@ -227,13 +227,26 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-row>
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="返回日期" prop="returnDate">
+                    <el-date-picker v-model="form.returnDate" clearable type="date" value-format="yyyy-MM-dd" placeholder="选择日期" :disabled="taskName != '安排用车'">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" :xs="24">
+                  <el-form-item label="行驶公里：" prop="kilometers" label-width="120px">
+                    <el-input placeholder="请输入行驶公里" v-model="form.kilometers" style="width: 200px;" :disabled="taskName != '安排用车'"/>
+                    <span> 公里</span>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-form>
             <el-row style="text-align: center;" v-if="taskName == '用车申请'">
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
-    "完成审批" }}</el-button>
+              <el-button type="primary" v-if="taskName" @click="completeApply">完成审批</el-button>
             </el-row>
           </div>
         </el-card>
@@ -322,7 +335,7 @@ export default {
       this.dispatchUser = this.$store.getters.name;
       this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    this.dept = this.$store.getters.deptId;
+    this.dept = this.$store.getters.deptId;    
     this.getProjectList();
     this.getCarList();
     this.getDriverList();
@@ -603,7 +616,7 @@ export default {
             this.$emit('goBack')
           })
         });
-      } else if (this.taskName == '安排用车' || this.taskName == '申请确认') {
+      } else if (this.taskName == '安排用车') {
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')
@@ -722,35 +735,25 @@ export default {
     showFormItem(name) {
       let isShow = false;
       if (name == '部门审核')
-        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
-          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.deptUserId != null);
       else if (name == '分管审核')
-        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null)
-          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.managerUserId != null);
       else if (name == '党工团审核')
-        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null)
-          || (this.dept == 0 && this.taskName == '' && (this.form.carUsage == 2 || this.form.carUsage == 3 || this.form.carUsage == 4));
+        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.unionUserId != null);
       else if (name == '总经理审核')
-        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
-          || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.gmUserId != null);
       else if (name == '董事长审核')
-        isShow = (this.dept == 101 && this.taskName == '用车申请') || this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
-          || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = (this.dept == 101 && this.taskName == '用车申请') || this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.dszUserId != null);
       else if (name == '部门审核签名')
-        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null)
-          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '') && this.form.deptUserId != null);
       else if (name == '分管审核签名')
-        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null)
-          || (this.dept > 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.managerUserId != null);
       else if (name == '党工团审核签名')
-        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null)
-          || (this.dept == 0 && this.taskName == '' && (this.form.carUsage == 2 || this.form.carUsage == 3 || this.form.carUsage == 4));
+        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.unionUserId != null);
       else if (name == '总经理审核签名')
-        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
-          || (this.dept == 102 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.gmUserId != null);
       else if (name == '董事长审核签名')
-        isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null)
-          || (this.dept == 101 && this.taskName == '' && (this.form.carUsage == '0' || this.form.carUsage == '1'));
+        isShow = this.taskName == '董事长审核' || ((this.taskName == '安排用车' || this.taskName == '') && this.form.dszUserId != null);
       return isShow;
     },
   },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-16 11:06:07
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-22 12:39:12
 -->
 <template>
   <div class="project-wrapper">
@@ -59,7 +59,7 @@
           </el-link>
         </div>
         <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书'"
-          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setProjectDocument">
+          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setProjectDocument">
         </FileUpload>
       </el-form-item>
       <el-form-item label="资料提交要求：" prop="projectRequest">
@@ -165,8 +165,8 @@ export default {
         partyAId: [{ required: true, message: "请选择甲方单位", trigger: "change" }],
         contactPerson: [{ required: true, message: "请输入联系人", trigger: "blur" }],
         telephone: [{ required: true, message: "请输入联系人联系方式", trigger: "blur" }],
-        projectRequest: [{ required: true, message: "请输入资料提交要求", trigger: "blur" }],
-        taskDocument: [{ required: true, message: "请上传任务书", trigger: "blur" }]
+        // projectRequest: [{ required: true, message: "请输入资料提交要求", trigger: "blur" }],
+        // taskDocument: [{ required: true, message: "请上传任务书", trigger: "blur" }]
       },
       workList: [
         {

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

@@ -70,7 +70,7 @@
               </el-link>
             </div>
             <FileUpload v-if="taskName == '项目安排'" ref="orz" :limit="1" :filePathName="'组织交底文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setOrganizeDocument">
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setOrganizeDocument">
             </FileUpload>
           </el-form-item>
         </el-col>

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

@@ -79,7 +79,7 @@
           </el-row>
           <el-form-item label="原始上报数据" prop="">
             <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setSettleDocument">
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setSettleDocument">
             </FileUpload>
             <div v-if="form.settleDocument" class="upload-list">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.settleDocument}`)">
@@ -93,7 +93,7 @@
           </el-form-item>
           <el-form-item label="经营发展部审核结算单" prop="">
             <FileUpload v-if="taskName == '经营发展部校核'" :limit="1" :filePathName="'项目结算/经营发展部审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setModifyDocument">
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setModifyDocument">
             </FileUpload>
             <div v-if="form.modifyDocument" class="upload-list">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.modifyDocument}`)">
@@ -107,7 +107,7 @@
           </el-form-item>
           <el-form-item label="分管领导审核结算单" prop="">
             <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setFinalDocument">
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setFinalDocument">
             </FileUpload>
             <div v-if="form.finalDocument" class="upload-list">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.finalDocument}`)">

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

@@ -33,7 +33,7 @@
           </el-form-item>
           <el-form-item label="附件" prop="document">
             <FileUpload v-if="taskName == '技术交底'" ref="bsFile" :limit="1" :filePathName="'技术交底'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getTechnicalDoc"></FileUpload>
             <div v-if="form.document && taskName != '技术交底'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.document}`)">
                 {{ getFileName(form.document) }}

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

@@ -71,7 +71,7 @@
           <el-divider></el-divider>
           <el-form-item label="初始技术方案" prop="technicalDocument">
             <FileUpload v-if="taskName == '方案上传'" ref="bsFile" :limit="1" :filePathName="'技术方案/初始'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getTechnicalDoc"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getTechnicalDoc"></FileUpload>
             <!-- <el-link v-if="taskName != '方案上传'" :href="`${baseUrl}${'/profile/upload' + form.technicalDocument}`"
               :underline="false" target="_blank">
               <span class="el-icon-document"> {{ getFileName(form.technicalDocument) }} </span>
@@ -105,7 +105,7 @@
           <el-divider></el-divider>
           <el-form-item label="修改技术方案" prop="modifyDocument">
             <FileUpload v-if="taskName == '技术审核'" ref="jssh" :limit="1" :filePathName="'技术方案/修改'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getModifyDoc"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getModifyDoc"></FileUpload>
             <!-- <el-link v-if="taskName != '技术审核'" :href="`${baseUrl}${'/profile/upload' + form.modifyDocument}`"
               :underline="false" target="_blank">
               <span class="el-icon-document"> {{ getFileName(form.modifyDocument) }} </span>
@@ -138,7 +138,7 @@
           </el-row>
           <el-form-item label="最终技术方案" prop="finalDocument">
             <FileUpload v-if="taskName == '总工审核'" ref="final" :limit="1" :filePathName="'技术方案/最终'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getFinalDoc"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getFinalDoc"></FileUpload>
             <!-- <el-link v-if="taskName != '总工审核'" :href="`${baseUrl}${'/profile/upload' + form.finalDocument}`"
               :underline="false" target="_blank">
               <span class="el-icon-document"> {{ getFileName(form.finalDocument) }} </span>

oa-ui/src/views/oa/car/approval.vue

@@ -71,7 +71,7 @@
         </template>
       </el-table-column>
       <el-table-column label="天数" align="center" prop="days" />
-      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
+      <!-- <el-table-column label="部门审批人" align="center" prop="deptUser.nickName" /> -->
       <el-table-column label="申请日期" align="center" prop="applyDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>

oa-ui/src/views/oa/car/detail.vue

@@ -231,7 +231,7 @@
           <el-input type="textarea" v-model="expenseForm.remark" placeholder="请输入备注说明" style="width:220px" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
           <div v-if="modifyOpen">
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
@@ -273,7 +273,7 @@
           <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getScrapPath"></FileUpload>
           <div v-if="scrapModifyOpen">
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"

oa-ui/src/views/oa/car/expense.vue

@@ -133,7 +133,7 @@
               <span class="el-icon-download">下载文件</span>
             </el-link>
           </div> 
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>

oa-ui/src/views/oa/car/index.vue

@@ -36,6 +36,11 @@
     <el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="车辆id" align="center" prop="carId" /> -->
+      <el-table-column label="车辆状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-tag :type="statusTypeStyle(scope.row.status)">{{ statusTypeText(scope.row.status) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
       <el-table-column label="驾驶员" align="center" prop="driverUser.nickName" />
       <el-table-column label="品牌" align="center" prop="brand" />
@@ -80,8 +85,8 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
 
     <!-- 添加或修改cmc车辆信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -166,7 +171,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         licensePlate: null,
         driver: null
       },
@@ -290,6 +295,40 @@ export default {
       this.download('oa/car/export', {
         ...this.queryParams
       }, `car_${new Date().getTime()}.xlsx`)
+    },
+    statusTypeText(row) {
+      if (row == '0') {
+        return '被领用'
+      }
+      if (row == '1') {
+        return '可领用'
+      }
+      if (row == '2') {
+        return '维修中'
+      }
+      if (row == '3') {
+        return '已停用'
+      }
+      if (row == '4') {
+        return '已报废'
+      }
+    },
+    statusTypeStyle(row) {
+      if (row == '0') {
+        return 'warning'
+      }
+      if (row == '1') {
+        return 'success'
+      }
+      if (row == '2') {
+        return 'danger'
+      }
+      if (row == '3') {
+        return 'primary'
+      }
+      if (row == '4') {
+        return 'info'
+      }
     }
   }
 };

oa-ui/src/views/oa/car/scrap.vue

@@ -110,7 +110,7 @@
               <span class="el-icon-download">下载文件</span>
             </el-link>
           </div>
-          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="'车辆/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>

oa-ui/src/views/oa/device/detail.vue

@@ -289,7 +289,7 @@
           <el-input v-model="expenseForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
           <div v-if="expenseModifyOpen">
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
@@ -395,7 +395,7 @@
           <el-input v-model="scrapForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getScrapPath"></FileUpload>
           <div v-if="scrapModifyOpen">
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"

oa-ui/src/views/oa/device/expense.vue

@@ -138,7 +138,7 @@
               <span class="el-icon-download">下载文件</span>
             </el-link>
           </div>
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>

oa-ui/src/views/oa/device/scrap.vue

@@ -114,7 +114,7 @@
               <span class="el-icon-download">下载文件</span>
             </el-link>
           </div>
-          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+          <FileUpload :limit="1" :filePathName="'设备/报废'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
             @input="getExpensePath"></FileUpload>
         </el-form-item>
       </el-form>

oa-ui/src/views/oa/tender/index.vue

@@ -247,9 +247,9 @@
               招标文件
             </template>
             <FileUpload v-if="form.tenderId == null" ref="zbFile" :limit="1" :filePathName="'投标文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathBidDocument"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathBidDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              <FileUpload v-if="!isView" ref="zb" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
                 :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathBidDocument">
               </FileUpload>
               <div v-if="form.bidDocument">
@@ -351,9 +351,9 @@
               标书文件
             </template>
             <FileUpload v-if="form.tenderId == null" ref="bsFile" :limit="1" :filePathName="'投标文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getUploadPathTenderDocument"></FileUpload>
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getUploadPathTenderDocument"></FileUpload>
             <div v-if="form.tenderId != null">
-              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              <FileUpload v-if="!isView" ref="bs" :limit="1" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
                 :isShowTip="false" :filePathName="'投标文件'" :isModify="true" @input="getUploadPathTenderDocument">
               </FileUpload>
               <div v-if="form.tenderDocument">