Browse Source

会计归档调整

huangguoce 1 day ago
parent
commit
0d081cbcb6

+ 9 - 0
src/api/cw/projectRecords/ProjectReportArchiveService.js

@@ -69,6 +69,15 @@ export default class ProjectReportArchiveService {
 			responseType: "blob",
 		});
 	}
+	newExportFile(params) {
+		return request({
+			url: prefix + "/cwProjectReportArchive/newExport",
+			method: "get",
+			params: params,
+			responseType: "blob",
+		});
+	}
+
 	findReportUse(reportNo) {
 		return request({
 			url: prefix + "/cwProjectReportArchive/findReportUse",

File diff suppressed because it is too large
+ 698 - 738
src/views/cw/projectReportArchive/ProjectReportArchiveDia.vue


File diff suppressed because it is too large
+ 687 - 668
src/views/cw/projectReportArchive/ProjectReportArchiveList.vue


+ 443 - 3
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -1,8 +1,285 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
     <el-row>
-      <el-col :span="24">
+      <el-col :span="24" v-if="isAuditUser && (status === 'audit' || status === 'taskFormDetail')">
+        <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method === 'view' ? 'readonly' : ''"
+          :disabled="status === 'audit' || status === 'taskFormDetail'" label-width="110px" @submit.native.prevent>
+          <el-row :gutter="15">
+            <!--                <el-col :span="12">-->
+            <!--                  <el-form-item label="档案名称" prop="name"-->
+            <!--                                :rules="[-->
+            <!--                                {required: true, message:'档案名称不能为空', trigger:'blur'}-->
+            <!--                   ]">-->
+            <!--                    <el-input v-model="inputForm.name" placeholder="请填写档案名称" clearable></el-input>-->
+            <!--                  </el-form-item>-->
+            <!--                </el-col>-->
+            <el-divider content-position="left"><i class="el-icon-document"></i> 归档信息</el-divider>
+
+            <el-col :span="12">
+              <el-form-item label="档案号" prop="fileNumber" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.fileNumber" placeholder="请填写档案号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="报告册数" prop="reportNum" :rules="[
+                { required: true, message: '报告册数不能为空', trigger: 'blur' }
+              ]">
+                <el-input-number v-model="inputForm.reportNum" controls-position="right" style="width:100%"
+                  :precision="0" :max="9999999999" :step="1" :min="0" placeholder="请填写报告册数" :controls="false" clearable>
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="底稿册数" prop="papersNum" :rules="[
+                { required: true, message: '底稿册数不能为空', trigger: 'blur' }
+              ]">
+                <el-input-number v-model="inputForm.papersNum" controls-position="right" style="width:100%"
+                  :precision="0" :max="9999999999" :step="1" :min="0" placeholder="请填写底稿册数" :controls="false" clearable>
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="审计收费(元)" prop="auditMoney" :rules="[
+                { required: true, message: '请输入审计收费(元)', trigger: 'blur' }
+              ]">
+                <el-input v-on:input="inputForm.auditMoney = inputForm.auditMoney.replace(/[^\d.]/g, '')
+                  .replace(/^\./g, '')
+                  .replace(/\.{2,}/g, '.')
+                  .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+                  .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')" v-model="inputForm.auditMoney"
+                  controls-position="right" :controls="false" style="width:100%;" placeholder="请输入审计收费(元)"
+                  :disabled="this.inputForm.auditMoney == this.accountTotal && this.accountTotal != 0 ? true : false"
+                  clearable @keyup="inputMoney">
+                  <template #suffix>
+                    <el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary"
+                      @click="openInvoice(this.inputForm.id)" icon="el-icon-search"></el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="档案年度" prop="year" :rules="[
+                { required: true, message: '档案年度不能为空', trigger: 'blur' }
+              ]">
+                <el-date-picker v-model="inputForm.year" type="year" value-format="YYYY" placeholder="选择档案年度"
+                  style="width:100%" placement="bottom-start" :clearable="false">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-divider content-position="left"><i class="el-icon-document"></i> 项目报告信息</el-divider>
+
+
+            <el-col :span="12">
+              <el-form-item label="委托项目类型" prop="businessType" :rules="[
+              ]">
+                <el-select v-model="inputForm.businessType" placeholder="请选择委托项目类型" style="width:100%;">
+                  <el-option v-for="item in $dictUtils.getDictList('cw_business_type')" :key="item.value"
+                    :label="item.label" :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="项目负责人" prop="projectCreateName" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.projectCreateName" placeholder="请填写项目负责人"
+                  clearable></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="报告文号" prop="reportNo" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.reportNo" placeholder="请填写报告文号" clearable>
+                  <!--                    <el-button slot="append" :disabled="status === 'audit' || status === 'taskFormDetail'" @click="openReportChoose" icon="el-icon-search"></el-button>-->
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="项目名称" prop="cwProjectRecordsDTO.projectName" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.cwProjectRecordsDTO.projectName" placeholder="请填写项目名称"
+                  clearable>
+                  <!--                      <el-button slot="append" :disabled="status === 'audit' || status === 'taskFormDetail'" @click="openChooseProject" icon="el-icon-search"></el-button>-->
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="报告日期" prop="reportDate" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.reportDate" placeholder="请填写报告日期" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="归档时间" prop="auditDate" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.auditDate" placeholder="请填写归档时间" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="签字注师1" prop="signatureAnnotator1Name" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.signatureAnnotator1Name" placeholder="请填写签字注师1"
+                  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="签字注师2" prop="signatureAnnotator2Name" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.signatureAnnotator2Name" placeholder="请填写签字注师2"
+                  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="star-require" label="审定金额(不含税/元)" prop="approvedNoIncludingTax" :rules="[
+              ]">
+                <el-input v-model="inputForm.approvedNoIncludingTax"
+                  :placeholder="`报告中审定金额(不含税/元)为:${this.inputForm.approvedNoIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`"
+                  v-on:input="inputForm.approvedNoIncludingTax = inputForm.approvedNoIncludingTax.replace(/[^\d.]/g, '')
+                    .replace(/^\./g, '')
+                    .replace(/\.{2,}/g, '.')
+                    .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+                    .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="star-require" label="审定金额(含税/元)" prop="approvedIncludingTax" :rules="[
+              ]">
+                <el-input v-model="inputForm.approvedIncludingTax"
+                  :placeholder="`报告中审定金额(含税/元)为:${this.inputForm.approvedIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`"
+                  v-on:input="inputForm.approvedIncludingTax = inputForm.approvedIncludingTax.replace(/[^\d.]/g, '')
+                    .replace(/^\./g, '')
+                    .replace(/\.{2,}/g, '.')
+                    .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+                    .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="status !== 'audit'" :span="12">
+              <el-form-item label="审核备注" prop="approveRemarks" :rules="[
+              ]">
+                <el-input type="textarea" :disabled="true" v-model="inputForm.approveRemarks" placeholder="请填写审核备注"
+                  clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="status !== 'audit'" :span="12">
+              <el-form-item label="案卷号" prop="number" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.number" placeholder="请填写案卷号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="status !== 'audit'" :span="12">
+              <el-form-item label="确认案卷号" prop="isNumber" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm"
+              v-loading="loading" :class="method === 'view' ? 'readonly' : ''" label-width="110px"
+              @submit.native.prevent>
+              <el-col :span="12">
+                <el-form-item label="案卷号" prop="number" :rules="[
+                  { required: true, message: '案卷号不能为空', trigger: 'blur' }
+                ]">
+                  <el-input style="width: 100%" :disabled="false" v-model="inputForm.number" placeholder="请填写案卷号"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="确认案卷号" prop="isNumber" :rules="[
+                  { required: true, message: '确认案卷号不能为空', trigger: 'blur' }
+                ]">
+                  <el-input :disabled="false" style="width: 100%" v-model="inputForm.isNumber" placeholder="请填写确认案卷号"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="审核备注" prop="approveRemarks" :rules="[
+                ]">
+                  <el-input type="textarea" :disabled="false" style="width: 100%" v-model="inputForm.approveRemarks"
+                    placeholder="请填写审核备注" clearable></el-input>
+                </el-form-item>
+              </el-col>
+            </el-form>
+            <el-divider content-position="left"><i class="el-icon-document"></i> 合同信息</el-divider>
+            <el-row :gutter="15" style="width: 100%;">
+              <el-col :span="24">
+                <el-form-item label="合同" prop="contract" :rules="[
+                ]">
+                  <el-input v-model="inputForm.contract" placeholder="参考兴光流转表中合同列填写。如:有、2018-A5等" clearable>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="15" v-if="inputForm.contractNo">
+
+              <el-col :span="12">
+                <el-form-item label="案卷号" prop="filedNo" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.filedNo" placeholder="请填写案卷号" clearable></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="合同编号" prop="contractNo" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.contractNo" placeholder="请填写合同编号" clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="合同名称" prop="contractName" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.contractName" placeholder="请填写合同名称"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="委托方" prop="clientContacts" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.clientContacts" placeholder="请填写委托方"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="合同金额" prop="contractAmount" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.contractAmount" placeholder="请填写合同金额"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="合同创建人" prop="contractCreateName" :rules="[
+                ]">
+                  <el-input :disabled="true" v-model="inputForm.contractCreateName" placeholder="请填写合同创建人"
+                    clearable></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
+            <el-col :span="12" v-else>
+              <el-form-item label="">
+                <el-text size="large" type="danger">无合同</el-text>
+              </el-form-item>
+
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
+          <el-tab-pane label="附件" name="files">
+            <!--        附件-->
+            <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+          </el-tab-pane>
+        </el-tabs>
+      </el-col>
+
+      <!-- 用户提交页面 -->
+      <el-col :span="24" v-else>
         <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method === 'view' ? 'readonly' : ''"
           :disabled="status === 'audit' || status === 'taskFormDetail'" label-width="110px" @submit.native.prevent>
           <el-row :gutter="15">
@@ -121,6 +398,37 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item class="star-require" ref="approvedNoIncludingTaxInput" label="审定金额(不含税/元)"
+                prop="approvedNoIncludingTax" :rules="[
+                  { validator: validateApprovedNoIncludingTax, trigger: 'change' },
+
+                ]">
+                <el-input v-model="inputForm.approvedNoIncludingTax"
+                  :placeholder="`报告中审定金额(不含税/元)为:${this.inputForm.approvedNoIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`"
+                  @input="handleInputNoIncludingTax" clearable>
+                  <template #append v-if="noIncludingTax">
+                    <el-button type="primary" @click="handleSyncTax(1)"
+                      style="background-color: #2d8cf0  !important;color: #fff;">同步</el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="star-require" label="审定金额(含税/元)" prop="approvedIncludingTax" :rules="[
+                { validator: validateApprovedIncludingTax, trigger: 'change' },
+              ]">
+                <el-input v-model="inputForm.approvedIncludingTax"
+                  :placeholder="`报告中审定金额(含税/元)为:${this.inputForm.approvedIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`"
+                  @input="handleInputIncludingTax" clearable>
+                  <template #append v-if="includingTax">
+                    <el-button type="primary" @click="handleSyncTax(2)"
+                      style="background-color: #2d8cf0  !important;color: #fff;">同步</el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
               <el-form-item label="归档时间" prop="auditDate" :rules="[
               ]">
                 <el-input :disabled="true" v-model="inputForm.auditDate" placeholder="请填写归档时间" clearable></el-input>
@@ -138,6 +446,13 @@
                 <el-input :disabled="true" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col v-if="status !== 'audit'" :span="12">
+              <el-form-item label="审核备注" prop="approveRemarks" :rules="[
+              ]">
+                <el-input :disabled="true" v-model="inputForm.approveRemarks" placeholder="请填写审核备注"
+                  clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm"
               v-loading="loading" :class="method === 'view' ? 'readonly' : ''" label-width="110px"
               @submit.native.prevent>
@@ -157,6 +472,13 @@
                     clearable></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="审核备注" prop="approveRemarks" :rules="[
+                ]">
+                  <el-input :disabled="false" style="width: 100%" v-model="inputForm.approveRemarks"
+                    placeholder="请填写审核备注" clearable></el-input>
+                </el-form-item>
+              </el-col>
             </el-form>
 
             <el-col :span="24">
@@ -179,7 +501,19 @@
                 <el-input :disabled="true" v-model="inputForm.createDate" placeholder="请填写创建时间" clearable></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="合同" prop="contract" :rules="[
+                { required: true, message: '合同不能为空', trigger: 'blur' },
+                { max: 255, message: '不能超过255个字符', trigger: 'blur' },
+
+              ]">
+                <el-input v-model="inputForm.contract" placeholder="参考兴光流转表中合同列填写。如:有、2018-A5等" clearable>
+                </el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
+
+
           <el-divider content-position="left"><i class="el-icon-document"></i> 审计报告</el-divider>
           <el-row :gutter="15">
             <el-col :span="12">
@@ -343,6 +677,7 @@ import officeService from '@/api/sys/officeService'
 import processService from '@/api/flowable/processService'
 import ProjectRecordsService from "../../../api/cw/projectRecords/ProjectRecordsService";
 import taskService from "@/api/flowable/taskService.js";
+import { v } from 'vxe-table'
 export default {
   props: {
     businessId: {
@@ -382,6 +717,20 @@ export default {
         year: '',
         number: '',
         isNumber: '',
+        approveRemarks: '',
+        contract: '',
+        approvedNoIncludingTax: "",
+        approvedIncludingTax: "",
+        approvedNoIncludingTaxBak: "",
+        approvedIncludingTaxBak: "",
+        businessType: "",
+        projectCreateName: '',
+        filedNo: '',
+        contractNo: "",
+        contractName: "",
+        clientContacts: "",
+        contractAmount: "",
+        contractCreateName: "",
         auditDate: '',
         procInsId: '',
         processDefinitionId: '',
@@ -447,7 +796,11 @@ export default {
       },
       selectRecord: [],
       isShow: false,
-
+      // 是否为审核人
+      isAuditUser: false,
+      // 审定金额的按钮状态
+      noIncludingTax: false,
+      includingTax: false
 
     }
   },
@@ -519,6 +872,20 @@ export default {
         year: '',
         number: '',
         isNumber: '',
+        approveRemarks: '',
+        contract: '',
+        approvedNoIncludingTax: "",
+        approvedIncludingTax: "",
+        approvedNoIncludingTaxBak: "",
+        approvedIncludingTaxBak: "",
+        businessType: "",
+        projectCreateName: '',
+        filedNo: '',
+        contractNo: "",
+        contractName: "",
+        clientContacts: "",
+        contractAmount: "",
+        contractCreateName: "",
         auditDate: '',
         procInsId: '',
         processDefinitionId: '',
@@ -562,14 +929,23 @@ export default {
       this.inputForm.id = id
       this.loading = false
       this.$nextTick(async () => {
-        console.log(this.inputForm.id)
         this.$refs.inputForm.resetFields()
         this.loading = true
+
+
         const data = await this.projectReportArchiveService.queryById(this.inputForm.id)
         console.log(data)
         this.$refs.uploadComponent.clearUpload()
         this.inputForm = this.recover(this.inputForm, data)
         this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+        if (this.$route.query.procInsId) {
+          let userInfo = this.$TOOL.data.get("USER_INFO");
+          if (this.inputForm.createBy.id === userInfo.id) {
+            this.isAuditUser = false
+          } else {
+            this.isAuditUser = true
+          }
+        }
         if (this.commonJS.isEmpty(this.inputForm.workAttachmentDtoList)) {
           this.inputForm.workAttachmentDtoList = []
         }
@@ -965,6 +1341,20 @@ export default {
         year: '',
         number: '',
         isNumber: '',
+        approveRemarks: '',
+        contract: '',
+        approvedNoIncludingTax: "",
+        approvedIncludingTax: "",
+        approvedNoIncludingTaxBak: "",
+        approvedIncludingTaxBak: "",
+        businessType: "",
+        projectCreateName: '',
+        filedNo: '',
+        contractNo: "",
+        contractName: "",
+        clientContacts: "",
+        contractAmount: "",
+        contractCreateName: "",
         auditDate: '',
         procInsId: '',
         processDefinitionId: '',
@@ -1169,6 +1559,51 @@ export default {
       } else {
         this.isShow = false
       }
+    },
+    isAuditStatus() {
+      if (this.status === 'audit' || this.status === 'taskFormDetail') {
+        return false
+      } else {
+        return true
+      }
+    },
+    handleInputNoIncludingTax(val) {
+      this.inputForm.approvedNoIncludingTax = val.replace(/[^\d.]/g, '')
+        .replace(/^\./g, '')
+        .replace(/\.{2,}/g, '.')
+        .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+        .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')
+    },
+    handleInputIncludingTax(val) {
+      this.inputForm.approvedIncludingTax = val.replace(/[^\d.]/g, '')
+        .replace(/^\./g, '')
+        .replace(/\.{2,}/g, '.')
+        .replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
+        .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^0+/, '0')
+    },
+    validateApprovedIncludingTax(rule, value, callback) {
+      if (value != this.inputForm.approvedIncludingTaxBak) {
+        this.includingTax = true
+        callback(new Error(`报告中审定金额(含税/元)为:${this.inputForm.approvedIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`));
+      } else {
+        callback(); // 校验通过
+      }
+    },
+    validateApprovedNoIncludingTax(rule, value, callback) {
+      if (value != this.inputForm.approvedNoIncludingTaxBak) {
+        this.noIncludingTax = true
+        callback(new Error(`报告中审定金额(不含税/元)为:${this.inputForm.approvedNoIncludingTaxBak}元。与所填写不同,如需归档,请进行同步,保证金额相同`));
+      } else {
+        callback(); // 校验通过
+      }
+    },
+    // 同步审定金额
+    handleSyncTax(index) {
+      if (index == 1) {
+        this.inputForm.approvedNoIncludingTax = this.inputForm.approvedNoIncludingTaxBak
+      } else if (index == 2) {
+        this.inputForm.approvedIncludingTax = this.inputForm.approvedIncludingTaxBak
+      }
     }
   }
 }
@@ -1177,4 +1612,9 @@ export default {
 /deep/ .el-input-number .el-input__inner {
   text-align: left;
 }
+
+.star-require .el-form-item__label::before {
+  content: "*";
+  color: red;
+}
 </style>

+ 35 - 10
src/views/sys/user/UserInfo.vue

@@ -903,7 +903,7 @@
 							</el-row>
 						</el-tab-pane> -->
 					</el-form>
-					<el-tab-pane label="教育经历">
+					<el-tab-pane label="*教育经历(必填)">
 						<el-card style="width: 100%;transition: all 0.3s ease;" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
@@ -1049,7 +1049,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="工作经历">
+					<el-tab-pane label="工作经历(选填)">
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
@@ -1148,7 +1148,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="培训经历">
+					<el-tab-pane label="培训经历(选填)">
 						<!-- 培训经历 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
@@ -1225,7 +1225,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="执业资格证书">
+					<el-tab-pane label="执业资格证书(选填)">
 						<!-- 执业资格证书 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
@@ -1331,7 +1331,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="职称证书">
+					<el-tab-pane label="职称证书(选填)">
 						<!-- 专业技能 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
@@ -1423,7 +1423,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="外语语种">
+					<el-tab-pane label="外语语种(选填)">
 						<!-- 外语语种 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
@@ -1518,7 +1518,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="家庭情况">
+					<el-tab-pane label="家庭情况(选填)">
 						<!-- 家庭情况 -->
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
@@ -1608,7 +1608,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="表彰与奖励">
+					<el-tab-pane label="表彰与奖励(选填)">
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
@@ -1686,7 +1686,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="社会及行业职务">
+					<el-tab-pane label="社会及行业职务(选填)">
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
@@ -1761,7 +1761,7 @@
 							</el-collapse-transition>
 						</el-card>
 					</el-tab-pane>
-					<el-tab-pane label="工作业绩">
+					<el-tab-pane label="工作业绩(选填)">
 						<el-card style="width: 100%" shadow="hover" class="card-info">
 							<template #header>
 								<el-divider content-position="left"><i class="el-icon-document"></i> <span
@@ -2805,6 +2805,13 @@ export default {
 			// }
 		},
 		async submitUserInfo() {
+
+			//判断教育经历是否为空
+			if (this.eduInfoList.length === 0) {
+				this.$message.error("教育经历不能为空");
+				return;
+			}
+
 			this.$confirm('确定提交审批吗?', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -4040,6 +4047,24 @@ export default {
 	order: -1;
 }
 
+
+
+.el-tabs__item {
+	color: #99A3B0;
+}
+
+#tab-0 {
+	color: #4e5969;
+}
+
+#tab-1 {
+	color: #4e5969;
+}
+
+#tab-2 {
+	color: #FF7A00;
+}
+
 .collapseTitle {
 	width: 100%;
 	display: flex;