代码提交:

0930项目登记

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

@@ -15,8 +15,8 @@
           <el-form-item label="合同名称" prop="name">
             <el-input size="small" v-model="searchForm.name" placeholder="请输入合同名称" clearable></el-input>
           </el-form-item>
-          <el-form-item label="委派人" prop="clientName">
-            <el-input size="small" v-model="searchForm.clientName" placeholder="请输入合同名称" clearable></el-input>
+          <el-form-item label="委派方" prop="clientName">
+            <el-input size="small" v-model="searchForm.clientName" placeholder="请输入委派方" clearable></el-input>
           </el-form-item>
           <el-form-item label="创建人" prop="createBy">
             <SelectUserTree
@@ -61,7 +61,7 @@
 
           <vxe-column width="200px" title="合同编号" field="no"></vxe-column>
           <vxe-column  title="合同名称" field="name"></vxe-column>
-          <vxe-column width="150px" title="委派人" field="clientName"></vxe-column>
+          <vxe-column width="150px" title="委派方" field="clientName"></vxe-column>
           <vxe-column width="150px" title="合同类型" field="name"></vxe-column>
           <vxe-column width="150px" title="创建时间" field="createDate"></vxe-column>
           <vxe-column width="100px" title="创建人" field="createBy"></vxe-column>

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

@@ -93,8 +93,8 @@
                           :rules="[
                           {required: true, message:'项目类别不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.projectType" label="1" size="small" style="margin-right: 0px;width: 48%" border>资评报字</el-radio>
-              <el-radio v-model="inputForm.projectType" label="2" size="small" style="margin-right: 0px;width: 48%" border>资评咨字</el-radio>
+              <el-radio v-model="inputForm.projectType" label="1" size="small" style="margin-right: 0px">资评报字</el-radio>
+              <el-radio v-model="inputForm.projectType" label="2" size="small" style="margin-right: 0px">资评咨字</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -161,7 +161,7 @@
                           :rules="[
                           {required: true, message:'是否首次承做不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isFirst" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isFirst" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -252,7 +252,7 @@
                           :rules="[
                           {required: true, message:'风险等级不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.riskLevel" v-for="item in $dictUtils.getDictList('program_registered_risk_level')" :label="item.value" size="small" style="margin-right: 0px;width: 31%" border>
+              <el-radio v-model="inputForm.riskLevel" v-for="item in $dictUtils.getDictList('program_registered_risk_level')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -535,7 +535,7 @@
                           :rules="[
                           {required: true, message:'本所是否具备承接胜任能力不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isHave" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isHave" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -544,7 +544,7 @@
                           :rules="[
                           {required: true, message:'是否影响本所承做人员独立性不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isInfluence" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isInfluence" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -553,7 +553,7 @@
                           :rules="[
                           {required: true, message:'项目承做方式不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.mode" v-for="item in $dictUtils.getDictList('project_commitment_mode')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.mode" v-for="item in $dictUtils.getDictList('project_commitment_mode')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>

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

@@ -149,6 +149,7 @@
   import pick from 'lodash.pick'
   import TaskService from '@/api/flowable/TaskService'
   import ProcessService from '@/api/flowable/ProcessService'
+  import UserService from '@/api/sys/UserService'
   export default {
     data () {
       return {
@@ -178,10 +179,12 @@
     programProjectListInfoService: null,
     taskService: null,
     processService: null,
+    userService: null,
     created () {
       this.programProjectListInfoService = new ProgramProjectListInfoService()
       this.taskService = new TaskService()
       this.processService = new ProcessService()
+      this.userService = new UserService()
     },
     components: {
       ProjectForm,
@@ -303,6 +306,7 @@
               }
             })
           })
+        this.reload()
       },
       // 发起项目登记审批
       registeredPush (row) {
@@ -333,6 +337,7 @@
               }
             })
           })
+        this.reload()
       },
       // 查看项目登记审批流程结果
       registeredDetail (row) {
@@ -367,11 +372,13 @@
             this.programProjectListInfoService.updateStatusById(form)
             this.$message.success(data)
             this.refreshList()
+            this.reload()
           })
         })
       },
       is () {
         this.userService.is().then(({data}) => {
+          console.log('isAdmin', data)
           this.isAdmin = data
         })
       },

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

@@ -85,8 +85,8 @@
                           :rules="[
                           {required: true, message:'项目类别不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.projectType" label="1" size="small" style="margin-right: 0px;width: 48%" border>资评报字</el-radio>
-              <el-radio v-model="inputForm.projectType" label="2" size="small" style="margin-right: 0px;width: 48%" border>资评咨字</el-radio>
+              <el-radio v-model="inputForm.projectType" label="1" size="small" style="margin-right: 0px">资评报字</el-radio>
+              <el-radio v-model="inputForm.projectType" label="2" size="small" style="margin-right: 0px">资评咨字</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -153,7 +153,7 @@
                           :rules="[
                           {required: true, message:'是否首次承做不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isFirst" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isFirst" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -244,7 +244,7 @@
                           :rules="[
                           {required: true, message:'风险等级不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.riskLevel" v-for="item in $dictUtils.getDictList('program_registered_risk_level')" :label="item.value" size="small" style="margin-right: 0px;width: 31%" border>
+              <el-radio v-model="inputForm.riskLevel" v-for="item in $dictUtils.getDictList('program_registered_risk_level')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -527,7 +527,7 @@
                           :rules="[
                           {required: true, message:'本所是否具备承接胜任能力不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isHave" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isHave" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -536,7 +536,7 @@
                           :rules="[
                           {required: true, message:'是否影响本所承做人员独立性不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.isInfluence" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.isInfluence" v-for="item in $dictUtils.getDictList('yes_no')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -545,7 +545,7 @@
                           :rules="[
                           {required: true, message:'项目承做方式不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.mode" v-for="item in $dictUtils.getDictList('project_commitment_mode')" :label="item.value" size="small" style="margin-right: 0px;width: 48%" border>
+              <el-radio v-model="inputForm.mode" v-for="item in $dictUtils.getDictList('project_commitment_mode')" :label="item.value" size="small" style="margin-right: 0px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>

src/views/modules/reimbursement/type/TypeForm.vue

@@ -68,14 +68,13 @@
           parentId: ''
         }
         if (method === 'add') {
-          this.title = `新建内容信息`
-          this.inputForm.parentId = '0'
+          this.title = `新建报销类型`
         } else if (method === 'edit') {
           this.inputForm.id = id
-          this.title = '修改内容信息'
+          this.title = '修改报销类型'
         } else if (method === 'view') {
           this.inputForm.id = id
-          this.title = '查看项目类型'
+          this.title = '查看报销类型'
         } else if (method === 'addChild') {
           this.title = '添加下级结构'
           this.inputForm.parentId = id