Merge remote-tracking branch 'origin/master'

src/api/sys/UserService.js

@@ -117,4 +117,11 @@ export default class UserService {
       params: {id: id}
     })
   }
+  isUpdatePassword () {
+    return request({
+      url: `/sys/user/isUpdatePassword`,
+      method: 'get',
+      params: {}
+    })
+  }
 }

src/views/layout/UpdatePassword.vue

@@ -6,17 +6,26 @@
     :append-to-body="true">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
              label-width="80px" @submit.native.prevent>
+      <div style="margin-bottom: 20px;" v-if="showTip">
+        <el-alert
+          title="当前账号的密码仍为初始密码，风险较大，请及时修改"
+          type="warning"
+          :closable="false"
+          center
+          show-icon>
+        </el-alert>
+      </div>
       <el-form-item label="账号">
         <span>{{ userName }}</span>
       </el-form-item>
       <el-form-item label="原密码" prop="password">
-        <el-input type="password" size="small" v-model="dataForm.password"></el-input>
+        <el-input type="password" size="small" v-model="dataForm.password" ></el-input>
       </el-form-item>
       <el-form-item label="新密码" prop="newPassword">
-        <el-input type="password" size="small" v-model="dataForm.newPassword"></el-input>
+        <el-input type="password" size="small" v-model="dataForm.newPassword" ></el-input>
       </el-form-item>
       <el-form-item label="确认密码" prop="confirmPassword">
-        <el-input type="password" size="small" v-model="dataForm.confirmPassword"></el-input>
+        <el-input type="password" size="small" v-model="dataForm.confirmPassword" ></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -40,6 +49,7 @@
       }
       return {
         visible: false,
+        showTip: false,
         dataForm: {
           password: '',
           newPassword: '',
@@ -80,7 +90,12 @@
     },
     methods: {
       // 初始化
-      init () {
+      init (showTip) {
+        if (this.commonJS.isNotEmpty(showTip)) {
+          this.showTip = showTip
+        } else {
+          this.showTip = false
+        }
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -82,7 +82,6 @@
           <el-col :span="12">
             <el-form-item label="盖章类型" prop="signatureType"
                           :rules="[
-                              {required: true, message: '盖章类型不能为空', trigger: 'change'}
                    ]">
               <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
               <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -144,49 +144,44 @@
                           :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status1, '-')">
                 {{$dictUtils.getDictLabel("cw_status", scope.row.status1, '-')}}
               </el-button>
-              <el-button v-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
+              <el-button v-else-if="scope.row.signatureType === '2'" type="text" @click="detailS2(scope.row)" effect="dark" size="mini"
                           :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status2, '-')">
                 {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status2, '-')}}
               </el-button>
-              <el-button v-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
-                         :type="$dictUtils.getDictLabel('cw_project_report_sign_status_flag', scope.row.status3, '-')">
-                {{$dictUtils.getDictLabel("cw_project_report_sign_status", scope.row.status3, '-')}}
+              <el-button v-else-if="scope.row.signatureType === '3'" type="text" @click="detailS3(scope.row)" effect="dark" size="mini"
+                         :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.status3, '-')">
+                {{$dictUtils.getDictLabel("cw_status", scope.row.status3, '-')}}
+              </el-button>
+              <el-button v-else effect="dark" size="mini" >
+                未发起
               </el-button>
             </template>
           </vxe-column>
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="isAdmin" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-else-if="hasPermission('cwProjectReport:edit')&&
                               (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
-                              (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
-                              )
-                              " type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="isAdmin" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
+                         type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+
+              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-else-if="hasPermission('cwProjectReport:del')&&
                               (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
-                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === '5' || commonJS.isEmpty(scope.row.reviewStatus)) &&
-                              (
-                              (scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3' )) ||
-                              (scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3' )) ||
-                              (scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3' ))
-                              )
-                              " type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+                              (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
+                         type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+
 <!--              复核流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
 <!--              公章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">公章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
 <!--              实体章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">实体章</el-button>
+              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">签章</el-button>
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '2' || scope.row.status3 === '6' || scope.row.status3 === '7')" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
 <!--              公章+执业章流程-->
               <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
@@ -256,6 +251,8 @@
         procDefSKey: '',
         processDefinitionSId2: '',
         procDefSKey2: '',
+        processDefinitionSId3: '',
+        procDefSKey3: '',
         haveProjectIds: ''
       }
     },
@@ -366,6 +363,12 @@
             this.procDefSKey2 = data.key
           }
         })
+        this.processService.getByName('财务-报告签章-实体章').then(({data}) => {
+          if (!this.commonJS.isEmpty(data.id)) {
+            this.processDefinitionSId3 = data.id
+            this.procDefSKey3 = data.key
+          }
+        })
       },
       // 当前页
       currentChangeHandle ({ currentPage, pageSize }) {
@@ -625,23 +628,23 @@
       },
       pushS3 (row) {
         // 读取流程表单
-        let title = `发起流程【报告签章-实体章】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体章]`
+        let title = `发起流程【报告签章-实体公章】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[报告签章-实体公章]`
         let status = 'startAndClose'
         if (row.status3 === '3') {
           status = 'startAndClose'
         } else if (row.status3 === '4') {
           status = 'reapplyFlag'
         }
-        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId2,
+        this.taskService.getTaskDef({ procDefId: this.processDefinitionSId3,
           businessId: row.sid3,
           businessTable: 'cw_project_report_signature'}).then((data) => {
             this.$router.push({
               path: '/flowable/task/TaskForm',
               query: {
                 ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
-                procDefId: this.processDefinitionSId2,
-                procDefKey: this.procDefSKey2,
+                procDefId: this.processDefinitionSId3,
+                procDefKey: this.procDefSKey3,
                 title: title,
                 formType: data.data.formType,
                 formUrl: data.data.formUrl,
@@ -684,7 +687,7 @@
           // eslint-disable-next-line eqeqeq
           this.taskService.getTaskDef({
             procInsId: row.procInsIds3,
-            procDefId: this.processDefinitionSId2
+            procDefId: this.processDefinitionSId3
           }).then(({data}) => {
             this.$router.push({
               path: '/flowable/task/TaskFormDetail',
@@ -692,8 +695,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '报告签章-实体章' + '流程详情',
-                formTitle: '报告签章-实体章' + '流程详情',
+                title: '报告签章-实体公章' + '流程详情',
+                formTitle: '报告签章-实体公章' + '流程详情',
                 businessId: row.sid3,
                 status: 'reback'
               }

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -753,8 +753,10 @@
               this.method = 'false'
             }
             if (this.commonJS.isNotEmpty(this.inputForm.signatureContractId) && this.status === 'audit' && this.commonJS.isNotEmpty(sFiles) && this.inputForm.signatureType !== '3') {
+              // 签章按钮展示
               this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false, 'audit')
             } else {
+              // 签章按钮隐藏
               this.$refs.archiveFile.newUpload(this.method, data.cwFileInfoList, 'cwWorkContract', null, null, null, null, false)
             }
             this.loading = false
@@ -815,7 +817,7 @@
                 let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                 this.projectReportService.saveSignFiles(da).then(() => {
                   this.projectReportService.saveData(this.inputForm).then(({data}) => {
-                    if (this.inputForm.signatureType === '2' || this.inputForm.signatureType === '3') {
+                    if (this.inputForm.signatureType === '2') {
                       this.inputForm.assignee = this.inputForm.signatureAnnotator1
                     }
                     callback(data.businessTable, data.businessId, this.inputForm)
@@ -936,27 +938,13 @@
                       let da = {cwFileInfoList: this.inputForm.cwFileInfoList, id: this.inputForm.id}
                       this.projectReportService.saveSignFiles(da).then(() => {
                         this.projectReportService.getAuditNodeByReportId(this.inputForm.sid3).then(({data}) => {
-                          if (data.signatureType === '签字注师1审核') {
-                            let param = {status: '6', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param)
-                            this.inputForm.assignee = this.inputForm.signatureAnnotator2
-                            let table = 'cw_project_report_signature'
-                            callback(table, this.inputForm.sid3, this.inputForm)
-                          }
-                          if (data.signatureType === '签字注师2审核') {
-                            let param = {status: '7', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param)
-                            callback()
-                          }
-                          if (data.signatureType === '签章管理人审核') {
-                            console.log('签章管理人审核')
-                            let param = {status: '5', id: this.inputForm.sid3}
-                            this.projectReportService.updateSignatureStatusById(param).then(() => {
-                              this.projectReportService.saveReportArchive(this.inputForm.id).then(() => {
-                                callback()
-                              })
+                          let param = {status: '5', id: this.inputForm.sid3}
+                          this.projectReportService.updateSignatureStatusById(param).then(() => {
+                            this.projectReportService.saveReportArchive(this.inputForm.id).then(() => {
+                              let table = 'cw_project_report_signature'
+                              callback(table, this.inputForm.sid3, this.inputForm)
                             })
-                          }
+                          })
                         })
                       })
                     })

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -71,6 +71,7 @@
             <el-col :span="12">
               <el-form-item label="盖章类型" prop="signatureType"
                             :rules="[
+                            {required: true, message: '盖章类型不能为空', trigger: 'change'}
                    ]">
                 <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
                 <el-select  v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">

src/views/modules/cw/workContract/ContractNameForm.vue

@@ -44,7 +44,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="委托方电话" prop="clientContactsPhone"
-                              :rules="[{required: true, message: '委托方电话', trigger: 'blur'}
+                              :rules="[
                        ]">
                   <el-input maxlength="15" :disabled="true" v-model="inputForm.clientContactsPhone" placeholder="请输入委托方电话"
                             @keyup.native="inputForm.clientContactsPhone = twoDecimalPlaces(inputForm.clientContactsPhone)"
@@ -895,9 +895,9 @@
           throw new Error()
         } else {
           if (status === 'save') {
-            this.loading = true
             this.$refs['inputForm'].validate((valid) => {
               if (valid) {
+                this.loading = true
                 if (this.inputForm.filedPaperType !== '0' & this.inputForm.filedPaperType !== '') {
                   if (this.inputForm.filedNo === '' || this.inputForm.filedNo === undefined) {
                     this.loading = false

src/views/modules/flowable/task/TaskForm.vue

@@ -469,6 +469,7 @@
       // Process_1665383385070 评估-报销申请
       // Process_1665628043339 评估-发票作废
       // Process_1665458731435 评估-发票申请
+      // Process_1673332958749 财务-报告签章-实体章
       // 驳回
       reject (vars) {
         if (this.procDefId.includes('Process_1667978088459') ||
@@ -495,7 +496,8 @@
           this.procDefId.includes('Process_1666332258192') ||
           this.procDefId.includes('Process_1665383385070') ||
           this.procDefId.includes('Process_1665628043339') ||
-          this.procDefId.includes('Process_1665458731435')
+          this.procDefId.includes('Process_1665458731435') ||
+          this.procDefId.includes('Process_1673332958749')
         ) {
           console.log('进入新版驳回')
           this.$confirm(`确定驳回流程吗?`, '提示', {

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -77,7 +77,7 @@
           <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>
           <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseType"></vxe-column>
+          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品名称" field="tradeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品数量" field="tradeNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="单位" field="company"></vxe-column>

src/views/modules/program/registered/ProjectArchiveForm.vue

@@ -145,7 +145,6 @@
             <el-col :span="12">
               <el-form-item label="废旧物资评估(万元)" prop="waystEvaluation"
                             :rules="[
-                        {required: true, message:'废旧物资评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.waystEvaluation"
@@ -164,7 +163,6 @@
             <el-col :span="12">
               <el-form-item label="固定资产评估(万元)" prop="fixedAssetsEvaluation"
                             :rules="[
-                        {required: true, message:'固定资产评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.fixedAssetsEvaluation"
@@ -183,7 +181,6 @@
             <el-col :span="12">
               <el-form-item label="净资产评估" prop="netAssetsEvaluation"
                             :rules="[
-                        {required: true, message:'净资产评估不能为空', trigger:'blur'}
                  ]">
                 <el-input-number
                   v-model="inputForm.netAssetsEvaluation"
@@ -201,7 +198,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="租金评估(万/年)" prop="rentEvaluation"
+              <el-form-item label="租金评估(万元)" prop="rentEvaluation"
                             :rules="[
                         {required: true, message:'租金评估不能为空', trigger:'blur'}
                  ]">
@@ -261,15 +258,15 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="当前处理人" prop="currentDisposePerson"
+              <el-form-item label="租金类型" prop="rentType"
                             :rules=" [
-                        {required: true, message:'当前处理人不能为空', trigger:'blur'}
+                        {required: true, message:'租金类型不能为空', trigger:'blur'}
                         ]" >
-                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.currentDisposePerson" @getValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>
+                <el-input v-model="inputForm.rentType" maxlength="64" placeholder="请填写租金类型"   clearable  ></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="是否开票" prop="isInvoice"
                             :rules="[
                         {required: true, message:'是否开票不能为空', trigger:'blur'}
@@ -279,6 +276,10 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+            <el-col :span="24" style="margin-bottom: 30px">
+              <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
+            </el-col>
+
             <el-col :span="12">
               <el-form-item label="开票日期" prop="invoiceDate"
                             :rules="[
@@ -414,6 +415,14 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="当前处理人" prop="currentDisposePerson"
+                            :rules=" [
+                        {required: true, message:'当前处理人不能为空', trigger:'blur'}
+                        ]" >
+                <UserSelect size="medium" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.currentDisposePerson" @getValue='(value) => {inputForm.currentDisposePerson = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <!--              原司法鉴定-->
               <el-form-item label="其他" prop="forensics"
                             :rules="[
@@ -466,7 +475,7 @@
           <!--附件信息 - 评估说明-->
           <UpLoadComponent ref="uploadComponentExplain"></UpLoadComponent>
           <!--附件信息 - 评估明细表-->
-          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
+<!--          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>-->
           <!--附件信息 - 评估操作计算底稿-->
           <UpLoadComponent ref="uploadComponentPapers"></UpLoadComponent>
           <!--附件信息 - 其他-->
@@ -518,6 +527,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',
@@ -558,9 +568,9 @@
     computed: {
       bus: {
         get () {
-          this.$refs.uploadComponentReport.setDividerName('评估报告')
+          this.$refs.uploadComponentReport.setDividerName('评估报告及评估明细表')
           this.$refs.uploadComponentExplain.setDividerName('评估说明')
-          this.$refs.uploadComponentDetail.setDividerName('评估明细表')
+          this.$refs.uploadComponentDetail.setDividerName('图片上传')
           this.$refs.uploadComponentPapers.setDividerName('评估操作计算底稿')
           this.$refs.uploadComponentOther.setDividerName('其他')
           return this.businessId
@@ -616,6 +626,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',
@@ -659,6 +670,7 @@
             rentEvaluation: '',
             forensics: '',
             reportCharges: '',
+            rentType: '',
             currentDisposePerson: '',
             isInvoice: '',
             invoiceDate: '',
@@ -728,9 +740,9 @@
             if (this.commonJS.isEmpty(this.inputForm.otherFileList)) {
               this.inputForm.otherFileList = []
             }
-            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告')
+            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告及评估明细表')
             this.$refs.uploadComponentExplain.newUpload(method, this.inputForm.explainFileList, 'program', null, '评估说明')
-            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '评估明细表')
+            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '图片上传')
             this.$refs.uploadComponentPapers.newUpload(method, this.inputForm.papersFileList, 'program', null, '评估操作计算底稿')
             this.$refs.uploadComponentOther.newUpload(method, this.inputForm.otherFileList, 'program', null, '其他')
             this.loading = false
@@ -813,6 +825,12 @@
         this.$refs['inputForm'].validate((valid) => {
           console.log('')
           if (valid) {
+            if (this.commonJS.isEmpty(this.inputForm.waystEvaluation) &&
+              this.commonJS.isEmpty(this.inputForm.fixedAssetsEvaluation) &&
+              this.commonJS.isEmpty(this.inputForm.netAssetsEvaluation)) {
+              this.$message.error('废旧物资评估值(万元）、固定资产评估值(万元)、净资产评估值，至少要填写一个！')
+              throw new Error()
+            }
             this.loading = true
             this.inputForm.reportFileList = this.$refs.uploadComponentReport.getDataList()
             this.inputForm.explainFileList = this.$refs.uploadComponentExplain.getDataList()
@@ -951,6 +969,7 @@
           rentEvaluation: '',
           forensics: '',
           reportCharges: '',
+          rentType: '',
           currentDisposePerson: '',
           isInvoice: '',
           invoiceDate: '',

src/views/modules/program/registered/ProjectList.vue

@@ -149,10 +149,10 @@
               <!--管理员角色登记完成后可删除-->
               <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
 
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
+<!--              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>-->
 
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
-              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
 
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4')" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>
               <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status2 === '2'&&scope.row.createBy === createName" type="text" size="small" @click="secondAuditReback(scope.row)">校审撤回</el-button>

src/views/modules/program/registered/RegisItemForm.vue

@@ -162,14 +162,23 @@
                           :rules="[
                           {required: true, message:'评估对象不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">
-                <el-option
-                  v-for="item in $dictUtils.getDictList('project_assessment_object')"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <el-input v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable></el-input>
+<!--              <el-select v-model="inputForm.assessmentObject" placeholder="请输入评估对象" clearable style="width: 100%;">-->
+<!--                <el-option-->
+<!--                  v-for="item in $dictUtils.getDictList('project_assessment_object')"-->
+<!--                  :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="assessmentRange"
+                          :rules="[
+                          {required: true, message:'评估范围不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.assessmentRange" placeholder="请输入评估范围" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -460,6 +469,20 @@
           </el-col>
 
           <el-col :span="12">
+            <el-form-item label="是否生成报告号" prop="generateReportNumber"
+                          :rules="[
+                 ]">
+              <el-switch
+                v-model="inputForm.generateReportNumber"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-text="否"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
             <el-form-item label="预计出报告时间" prop="reportingDate"
                           :rules="[
                           {required: true, message:'预计出报告时间不能为空', trigger:'blur'}
@@ -718,6 +741,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: true, // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入（元）
           planEndTime: '', // 计划完成时间
@@ -736,6 +760,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -839,6 +864,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: '', // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入（元）
           planEndTime: '', // 计划完成时间
@@ -857,6 +883,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -886,6 +913,11 @@
           this.programProjectListInfoService.queryById(this.inputForm.id).then(({data}) => {
             this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
+            if (data.generateReportNumber === 'true') {
+              this.inputForm.generateReportNumber = true
+            } else if (data.generateReportNumber === 'false') {
+              this.inputForm.generateReportNumber = false
+            }
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
             if (this.commonJS.isEmpty(this.inputForm.files)) {
               this.inputForm.files = []
@@ -1026,6 +1058,7 @@
               }
             })
           }
+          console.log('this.inputForm.generateReportNumber', this.inputForm.generateReportNumber)
           this.inputForm.files = this.$refs.uploadComponent.getDataList()
           this.programProjectListInfoService.saveForm(this.inputForm).then(({data}) => {
             callback(data.businessTable, data.businessId, this.inputForm)
@@ -1123,6 +1156,7 @@
               this.loading = false
               return
             }
+            console.log('this.inputForm.generateReportNumber', this.inputForm.generateReportNumber)
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.programProjectListInfoService.saveForm(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)
@@ -1301,6 +1335,7 @@
           industry: '', // 所属行业
           enterpriseType: '', // 企业类型
           riskLevel: '', // 风险等级
+          generateReportNumber: '', // 是否生成报告号
           projectSource: '', // 项目来源
           estimate: '', // 预估收入（元）
           planEndTime: '', // 计划完成时间
@@ -1319,6 +1354,7 @@
           projectDevelopment: '', // 项目开发人
           delegateProjectType: '', // 项目类型
           assessmentObject: '', // 评估对象
+          assessmentRange: '', // 评估范围
           workBeginAndEndDate: [], // 预计现场工作起止时间
           workBeginDate: '', // 预计现场工作开始时间
           workEndDate: '', // 预计现场工作结束时间
@@ -1441,8 +1477,55 @@
     }
   }
 </script>
-<style scoped>
-  /deep/ .el-input-number .el-input__inner {
+<style lang="scss">
+  .el-input-number .el-input__inner {
     text-align: left;
   }
+  /**
+  设置框
+   */
+  .el-switch__core{
+    width: 70px!important;
+    height: 30px;
+  }
+  /**
+  设置园
+   */
+  .el-switch__core::after{
+    width: 14px;
+    height: 14px;
+    margin-top: -1px;
+    margin-bottom: 2px;
+  }
+
+  .el-switch__label--left {
+    position: relative;
+    left: 45px;
+    color: #fff;
+    z-index: -1111;
+  }
+  .el-switch__core{
+    width: 50px !important;
+  }
+  .el-switch__label--right {
+    position: relative;
+    right: 46px;
+    color: #fff;
+    z-index: -1111;
+  }
+  .el-switch__label--right.is-active {
+    z-index: 1111;
+    color: #fff !important;
+  }
+  .el-switch__label--left.is-active {
+    z-index: 1111;
+    color: #9c9c9c !important;
+  }
+  .el-switch__label * {
+    line-height: 1;
+    font-size: 18px;
+    display: inline-block;
+  }
+
+
 </style>

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -235,6 +235,7 @@
         </el-container>
       </el-header>
     </el-container>
+    <UpdatePassword ref="updatePassword"></UpdatePassword>
   </div>
 </template>
 
@@ -246,6 +247,8 @@
   import NotifyForm from '@/views/modules/notify/NotifyForm'
   import NotifyService from '@/api/notify/NotifyService'
   import NoticeService from '@/api/flowable/NoticeService'
+  import UserService from '@/api/sys/UserService'
+  import UpdatePassword from '@/views/layout/UpdatePassword'
 
   export default {
     data () {
@@ -314,10 +317,12 @@
     taskService: null,
     notifyService: null,
     noticeService: null,
+    userService: null,
     created () {
       this.taskService = new TaskService()
       this.notifyService = new NotifyService()
       this.noticeService = new NoticeService()
+      this.userService = new UserService()
     },
     activated () {
       // 判断是否有签章页面带过来
@@ -345,12 +350,27 @@
           console.log('取消前往签章页面，清除本页$router.query')
         })
       }
+      // 判断当前用户是否为管理员
+      this.userService.is().then(({data}) => {
+        console.log('是否为管理员', data)
+        if (!data) {
+          // 如果当前用户不是管理员，则判断是否修改过密码
+          this.userService.isUpdatePassword().then(({data}) => {
+            console.log('是否修改过密码', data)
+            if (!data) {
+              // 如果没有修改过密码，则弹出密码修改窗口
+              this.$refs.updatePassword.init(true)
+            }
+          })
+        }
+      })
       this.refreshList()
     },
     components: {
       UserSelect,
       // FlowChart
-      NotifyForm
+      NotifyForm,
+      UpdatePassword
     },
     // watch: {
     // },