报销类型修改

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

@@ -72,7 +72,8 @@
         method: '',
         visible: false,
         loading: false,
-        like: ''
+        like: '',
+        officeId: ''
       }
     },
     // reimbursementTypeService: null,
@@ -84,13 +85,14 @@
     components: {
     },
     methods: {
-      init (like) {
+      init (like, deptName) {
         console.log('like', like)
         if (like === '1') {
           this.like = '1'
         } else {
           this.like = ''
         }
+        this.officeId = deptName
         this.visible = true
         this.list()
       },
@@ -114,6 +116,7 @@
       list () {
         this.loading = true
         this.searchForm.like = this.like
+        this.searchForm.officeId = this.officeId
         this.reimbursementApprovalTypeService.bxList({...this.searchForm}).then(({data}) => {
           this.dataList = data
           this.loading = false

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

@@ -140,7 +140,7 @@
             </vxe-table-column>
             <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.typeName" @focus="typePullForm(scope.$rowIndex)"></el-input>
+                <el-input v-model="scope.row.typeName" @focus="typePullForm(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
@@ -218,7 +218,7 @@
             </vxe-table-column>
             <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.typeName" @focus="typePullForm2(scope.$rowIndex)"></el-input>
+                <el-input v-model="scope.row.typeName" @focus="typePullForm2(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="contractName" title="报销合同" :edit-render="{}" :rules="[{required: true, message:'请选择报销合同', trigger:'blur'}]">
@@ -296,7 +296,7 @@
             </vxe-table-column>
             <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.typeName" @focus="typePullForm3(scope.$rowIndex)"></el-input>
+                <el-input v-model="scope.row.typeName" @focus="typePullForm3(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
@@ -374,7 +374,7 @@
             </vxe-table-column>
             <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.typeName" @focus="typePullForm4(scope.$rowIndex)"></el-input>
+                <el-input v-model="scope.row.typeName" @focus="typePullForm4(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="projectName" title="报销详情" :edit-render="{}" :rules="[{required: true, message:'请填写报销详情', trigger:'blur'}]">
@@ -452,7 +452,7 @@
             </vxe-table-column>
             <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
               <template v-slot:edit="scope">
-                <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex)"></el-input>
+                <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex, scope.row.deptId)"></el-input>
               </template>
             </vxe-table-column>
             <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
@@ -1252,30 +1252,30 @@
         this.$forceUpdate()
       },
       // 报销类型下拉弹窗
-      typePullForm (rowIndex) {
+      typePullForm (rowIndex, deptName) {
         this.indexRow = rowIndex
         // this.$refs.reimbursementTypePullForm.init()
-        this.$refs.cwReimbursementTypePullForm.init('1')
+        this.$refs.cwReimbursementTypePullForm.init('1', deptName)
       },
-      typePullForm2 (rowIndex) {
+      typePullForm2 (rowIndex, deptName) {
         this.indexRow = rowIndex
         // this.$refs.reimbursementTypePullForm.init()
-        this.$refs.cwReimbursementTypePullForm2.init('2')
+        this.$refs.cwReimbursementTypePullForm2.init('2', deptName)
       },
-      typePullForm3 (rowIndex) {
+      typePullForm3 (rowIndex, deptName) {
         this.indexRow = rowIndex
         // this.$refs.reimbursementTypePullForm.init()
-        this.$refs.cwReimbursementTypePullForm3.init('1')
+        this.$refs.cwReimbursementTypePullForm3.init('1', deptName)
       },
-      typePullForm4 (rowIndex) {
+      typePullForm4 (rowIndex, deptName) {
         this.indexRow = rowIndex
         // this.$refs.reimbursementTypePullForm.init()
-        this.$refs.cwReimbursementTypePullForm4.init('2')
+        this.$refs.cwReimbursementTypePullForm4.init('2', deptName)
       },
-      typePullForm5 (rowIndex) {
+      typePullForm5 (rowIndex, deptName) {
         this.indexRow = rowIndex
         // this.$refs.reimbursementTypePullForm.init()
-        this.$refs.cwReimbursementTypePullForm5.init('2')
+        this.$refs.cwReimbursementTypePullForm5.init('2', deptName)
       },
       // 报销内容详情
       getProgramForType (rows) {

src/views/modules/cw/reimbursementApproval/type/TypeList.vue

@@ -42,6 +42,7 @@
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column title="报销内容名称" field="name" align="left" tree-node></vxe-column>
+          <vxe-column title="关联部门" field="relateDepartment"></vxe-column>
           <vxe-column width="100" title="序号" field="sort"></vxe-column>
 
           <vxe-column title="操作" width="230px" fixed="right" align="center">

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

@@ -490,7 +490,7 @@
       // Process_1669961023358 物资管理-采购申请
       // Process_1672729521837 物资管理-领用申请
       // Process_1673332958749 财务-报告签章-实体章
-      // Process_1673492595431 物资管理-入库修改
+      // Process_1673514092406 物资管理-入库修改
       // Process_1673600899831 物资管理-合同
       // Process_1673924346231 中审-报销审批
       // Process_1667894339167 会计-合同登记
@@ -524,7 +524,7 @@
           this.procDefId.includes('Process_1669961023358') ||
           this.procDefId.includes('Process_1672729521837') ||
           this.procDefId.includes('Process_1673332958749') ||
-          this.procDefId.includes('Process_1673492595431') ||
+          this.procDefId.includes('Process_1673514092406') ||
           this.procDefId.includes('Process_1673600899831') ||
           this.procDefId.includes('Process_1673924346231') ||
           this.procDefId.includes('Process_1667894339167')