数据调整信息提交

src/views/modules/cw/invoice/InvoiceFormTask.vue

@@ -251,7 +251,6 @@
               :precision="2"
               placeholder="请填写发票金额"
               :step="0.01"
-              :min="0"
               clearable>
             </el-input-number>
           </el-form-item>

src/views/modules/cw/reimbursementApproval/info/InfoList.vue

@@ -285,8 +285,8 @@
       // 新增
       add () {
         // 读取流程表单
-        let tabTitle = `发起流程【财务-报销审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [财务-报销审批]`
+        let tabTitle = `发起流程【会计-报销审批】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -321,8 +321,8 @@
           status = 'reapplyFlag'
         }
         // 读取流程表单
-        let tabTitle = `发起流程【财务-报销审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [财务-报销审批]`
+        let tabTitle = `发起流程【会计-报销审批】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
           businessId: row.id,
           businessTable: 'cw_reimbursement_info',
@@ -394,7 +394,7 @@
         //   this.tablePage.total = data.total
         //   this.loading = false
         // })
-        this.processService.getByName('财务-报销审批').then(({data}) => {
+        this.processService.getByName('会计-报销审批').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
@@ -473,7 +473,7 @@
           ...this.searchForm
         }).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res.data, '财务-报销审批列表信息')
+          this.$utils.downloadExcel(res.data, '会计-报销审批列表信息')
           this.loading = false
         }).catch(function (err) {
           this.loading = false
@@ -486,7 +486,7 @@
         //   ...this.searchForm
         // }).then((res) => {
         //   // 将二进制流文件写入excel表，以下为重要步骤
-        //   this.$utils.downloadExcel(res.data, '财务-报销审批列表信息')
+        //   this.$utils.downloadExcel(res.data, '会计-报销审批列表信息')
         //   this.loading = false
         // }).catch(function (err) {
         //   this.loading = false

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

@@ -345,7 +345,7 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        this.processService.getByName('财务-报告复核').then(({data}) => {
+        this.processService.getByName('会计-报告复核').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key

src/views/modules/finance/invoice/InvoiceForm.vue

@@ -259,7 +259,6 @@
                 :precision="2"
                 placeholder="请填写发票金额"
                 :step="0.01"
-                :min="0"
                 clearable>
               </el-input-number>
             </el-form-item>

src/views/modules/finance/invoice/InvoiceFormTask.vue

@@ -251,7 +251,6 @@
               :precision="2"
               placeholder="请填写发票金额"
               :step="0.01"
-              :min="0"
               clearable>
             </el-input-number>
           </el-form-item>

src/views/modules/finance/invoice/InvoiceList.vue

@@ -439,7 +439,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
-        this.processService.getByName('发票申请').then(({data}) => {
+        this.processService.getByName('评估-发票申请').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
@@ -506,8 +506,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【发票申请】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [发票申请]`
+        let tabTitle = `发起流程【评估-发票申请】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-发票申请]`
         this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -528,11 +528,11 @@
             })
           })
       },
-      // 发起发票申请审批
+      // 发起评估-发票申请审批
       invoicePush (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 = 'startAndHold'
         if (row.status === '3') {
           status = 'startAndClose'
@@ -594,7 +594,7 @@
             })
           })
       },
-      // 查看发票申请审批流程结果
+      // 查看评估-发票申请审批流程结果
       invoiceDetail (row) {
         if (row.status !== '0' && row.status !== '1') {
           if (row.status === '6' || row.status === '7' || row.status === '8' || row.status === '9') {
@@ -610,8 +610,8 @@
                   ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                   isShow: 'false',
                   readOnly: true,
-                  title: '发票申请' + '流程详情',
-                  formTitle: '发票申请' + '流程详情',
+                  title: '评估-发票申请' + '流程详情',
+                  formTitle: '评估-发票申请' + '流程详情',
                   businessId: row.id,
                   status: 'reback'
                 }
@@ -640,7 +640,7 @@
           })
         })
       },
-      // 撤回发票申请审批
+      // 撤回评估-发票申请审批
       invoiceReback (row) {
         this.$confirm(`确定要撤回该申请吗?`, '提示', {
           confirmButtonText: '确定',

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

@@ -163,7 +163,7 @@
               <!--三神结束后，评估报告签发前进行资产评估项目（校对）-->
               <el-button v-if="hasPermission('program:registered:proo')&&scope.row.createBy === createName&&scope.row.status3 === '5'&&commonJS.isEmpty(scope.row.issuedStatus)" type="text" size="small" @click="proofread(scope.row.id)">校对</el-button>
               <!--报告签发-->
-              <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName &&scope.row.status3 === '5' && (scope.row.issuedStatus === '0' || scope.row.issuedStatus === '1' || scope.row.issuedStatus === '3')" type="text" size="small" @click="issued(scope.row)">签发</el-button>
+              <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName &&scope.row.status3 === '5' && (scope.row.issuedStatus === null ||scope.row.issuedStatus === undefined ||scope.row.issuedStatus === '' ||scope.row.issuedStatus === '0' || scope.row.issuedStatus === '1' || scope.row.issuedStatus === '3')" type="text" size="small" @click="issued(scope.row)">签发</el-button>
               <!--报告签发撤回-->
               <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName && scope.row.issuedStatus === '2'" type="text" size="small" @click="issuedReback(scope.row)">签发撤回</el-button>
               <!--评估报告装订后的审核-->

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

@@ -410,23 +410,23 @@
                 if (type === 'reject') {
                   // 驳回
                   this.inputForm.status = '4'
-                  // this.loading = true
-                  // this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
-                  // if (this.commonJS.isNotEmpty(this.inputForm.auditPeopleList)) {
-                  //   this.inputForm.programAuditAssessPeopleDtoList = []
-                  //   this.inputForm.auditPeopleList.split(',').forEach(item => {
-                  //     let i = {assessPeople: item, auditId: this.inputForm.id}
-                  //     this.inputForm.programAuditAssessPeopleDtoList.push(i)
-                  //   })
-                  // } else {
-                  //   this.inputForm.programAuditAssessPeopleDtoList = []
-                  // }
-                  // this.programProjectListInfoService.saveFormThree(this.inputForm).then(({data}) => {
-                  //   this.loading = false
-                  // }).catch(() => {
-                  //   this.loading = false
-                  // })
-                  // return
+                  this.loading = true
+                  this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
+                  if (this.commonJS.isNotEmpty(this.inputForm.auditPeopleList)) {
+                    this.inputForm.programAuditAssessPeopleDtoList = []
+                    this.inputForm.auditPeopleList.split(',').forEach(item => {
+                      let i = {assessPeople: item, auditId: this.inputForm.id}
+                      this.inputForm.programAuditAssessPeopleDtoList.push(i)
+                    })
+                  } else {
+                    this.inputForm.programAuditAssessPeopleDtoList = []
+                  }
+                  this.programProjectListInfoService.saveFormThree(this.inputForm).then(({data}) => {
+                    this.loading = false
+                  }).catch(() => {
+                    this.loading = false
+                  })
+                  return
                 }
                 if (type === 'reback') {
                   // 撤回

src/views/modules/reimbursement/info/InfoList.vue

@@ -268,8 +268,8 @@
         //   status = 'startAndClose'
         // }
         // 读取流程表单
-        let tabTitle = `发起流程【报销申请】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [报销申请]`
+        let tabTitle = `发起流程【评估-报销审批】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [评估-报销审批]`
         let status = 'startAndHold'
         if (row.type === '3') {
           status = 'startAndClose'
@@ -362,7 +362,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
-        this.processService.getByName('报销申请').then(({data}) => {
+        this.processService.getByName('评估-报销审批').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
@@ -434,7 +434,7 @@
           ...this.searchForm
         }).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res.data, '报销申请列表信息')
+          this.$utils.downloadExcel(res.data, '评估-报销审批列表信息')
           this.loading = false
         }).catch(function (err) {
           this.loading = false

src/views/modules/sys/office/OfficeForm.vue

@@ -203,20 +203,27 @@
       doSubmit () {
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
-            this.loading = true
             console.log(this.inputForm)
-            this.officeService.save(this.inputForm).then(({data}) => {
-              this.loading = false
+            if (this.inputForm.parent.id === this.inputForm.id) {
               this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500
+                message: '不可选择当前节点作为上级机构',
+                type: 'warning'
               })
-              this.visible = false
-              this.$emit('refreshDataList')
-            }).catch(() => {
-              this.loading = false
-            })
+            } else {
+              this.loading = true
+              this.officeService.save(this.inputForm).then(({data}) => {
+                this.loading = false
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500
+                })
+                this.visible = false
+                this.$emit('refreshDataList')
+              }).catch(() => {
+                this.loading = false
+              })
+            }
           }
         })
       },