借款、保证金

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

@@ -75,12 +75,6 @@ public class CmcDepositController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcDeposit cmcDeposit)
     {
-        if (cmcDeposit.getContractId() != null && cmcDeposit.getTenderId() == null) {
-            cmcDeposit.setTenderId(0);
-        }
-        if (cmcDeposit.getTenderId() != null && cmcDeposit.getContractId() == null) {
-            cmcDeposit.setContractId("0");
-        }
         return toAjax(cmcDepositService.insertCmcDeposit(cmcDeposit));
     }
 

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

@@ -137,7 +137,7 @@
             </el-col>
           </el-row>
           <el-form-item label="申请人说明" prop="remark">
-            <el-input type="textarea" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
+            <el-input type="textarea" :rows="4" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
           </el-form-item>
           <el-form-item label="附件上传" prop="borrowDocument">
             <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"

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

@@ -33,15 +33,15 @@
               <el-descriptions-item label="投标项目名称" label-class-name="my-label">
                 {{ chooseTender.projectName }}
               </el-descriptions-item>
-              <el-descriptions-item label="投标保证金" label-class-name="my-label">{{ chooseTender.deposit
-                }}</el-descriptions-item>
-              <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA ?
-      chooseTender.partyA.partyAName : '' }}</el-descriptions-item>
-              <el-descriptions-item label="招标代理人" label-class-name="my-label">{{ chooseTender.agent
-                }}</el-descriptions-item>
-              <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseTender.agentPerson +
-      chooseTender.agentPhone
-                }}</el-descriptions-item>
+              <el-descriptions-item label="投标保证金" label-class-name="my-label">{{ chooseTender ? chooseTender.deposit : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender ? (chooseTender.partyA ?
+                chooseTender.partyA.partyAName : '') : '' }}</el-descriptions-item>
+              <el-descriptions-item label="招标代理人" label-class-name="my-label">{{ chooseTender ? (chooseTender.agent) : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseTender ? (chooseTender.agentPerson
+                + chooseTender.agentPhone) : ''
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="合同名称" prop="contractId" v-if="contractOpen">
@@ -53,14 +53,18 @@
             </el-select> -->
             <el-button type="primary" size="mini" @click="htOpen = true" v-if="taskName == '保证金申请'">选择合同</el-button>
             <el-descriptions border v-if="isContractSelect" style="margin-top: 10px;" :column="1">
-              <el-descriptions-item label="合同编码" label-class-name="my-label">{{ chooseContract.contractCode
-                }}</el-descriptions-item>
-              <el-descriptions-item label="履约保证金" label-class-name="my-label">{{ chooseContract.deposit
-                }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseContract.tender ? chooseContract.tender.aPerson : ''
-                }}</el-descriptions-item>
+              <el-descriptions-item label="合同编码" label-class-name="my-label">{{ chooseContract ?
+                chooseContract.contractCode : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="履约保证金" label-class-name="my-label">{{ chooseContract ? chooseContract.deposit :
+                ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseContract ? (chooseContract.tender ?
+                chooseContract.tender.aPerson : '') : ''
+              }}</el-descriptions-item>
               <el-descriptions-item label="联系人及电话" label-class-name="my-label">
-                {{ chooseContract.tender ? chooseContract.tender.aPerson + chooseContract.tender.aPhone : ''}}
+                {{ chooseContract ? (chooseContract.tender ? chooseContract.tender.aPerson + chooseContract.tender.aPhone
+                  : '') : '' }}
               </el-descriptions-item>
             </el-descriptions>
           </el-form-item>
@@ -142,9 +146,8 @@
           </el-row>
           <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>
+            <FileUpload v-if="taskName == '财务处理'" :disabled="taskName != '财务处理'" :limit="1" :filePathName="'保证金/汇款凭证'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @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}`)">
@@ -239,7 +242,7 @@ export default {
     taskForm: {
       type: Object,
       required: true
-    },    
+    },
     flowDisabled: {
       type: Boolean,
       default: true
@@ -250,7 +253,7 @@ export default {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
       tbOpen: false,
-      htOpen:false,
+      htOpen: false,
       applierUser: '',
       applyTime: undefined,
       managerUser: '',

oa-ui/src/views/oa/deposit/contract.vue

@@ -255,7 +255,7 @@ export default {
     /** 查询cmc保证金审批列表 */
     getList() {
       this.loading = true;
-      this.queryParams.tenderId = 0;
+      this.queryParams.depositType = '1';
       listDeposit(this.queryParams).then(response => {
         this.depositList = response.rows;
         this.total = response.total;

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

@@ -271,7 +271,7 @@ export default {
     /** 查询cmc保证金审批列表 */
     getList() {
       this.loading = true;
-      this.queryParams.contractId = '0';
+      this.queryParams.depositType = '0';
       listDeposit(this.queryParams).then(response => {
         this.depositList = response.rows;
         this.total = response.total;

oa-ui/src/views/oa/project/change.vue

@@ -86,6 +86,7 @@
 import { listProjectChange, getProjectChange, delProjectChange, addProjectChange, updateProjectChange } from "@/api/oa/project/projectChange";
 import { listProject } from '@/api/oa/project/project';
 import { mapGetters } from 'vuex';
+import { checkPermi } from '@/utils/permission';
 
 export default {
   name: "ProjectChange",
@@ -135,10 +136,13 @@ export default {
   },
   methods: {
     /** 查询cmc项目变更列表 */
-    getList() {
+    async getList() {
       this.loading = true;
-      if (this.deptId > 107) {
-        this.queryParams.undertakingDept = this.deptId
+      if (this.deptId > 107 && this.deptId != 109) {
+        let response = await checkPermi(['oa:allproject:query'])
+        if (response == false) {
+          this.queryParams.undertakingDept = this.deptId
+        }
       }
       listProjectChange(this.queryParams).then(response => {
         this.projectChangeList = response.rows;