update 起草组管理对接接口

src/api/incomePaymentsApi.js

@@ -136,6 +136,14 @@ const revokeConfirm = (params) => postAction(`/payConfirmPaymentRecord/backIncom
 // 判断当前节点 是否可以发邮件
 const judgeEmailStatus = (param) => getAction('/sys/message/sysMessageTemplate/queryByCode', param)
 
+// 2024-01-08 起草组相关功能接口
+// 起草组管理-复制
+const copyDraftingGroup = (param) => postAction('/drafting/payDraftingGroup/copy', param)
+// 起草组管理-工作组下拉
+const getWorkingGroupList = (param) => getAction('/drafting/payDraftingGroup/queryAllWorkingGroupsIdAndName', param)
+// 通过id获取起草组详情
+const getDraftingGroupById = (params) => getAction('/drafting/payDraftingGroup/queryById', params)
+
 export {
   getWorkingGroupById,
   getChargeNotice,
@@ -206,5 +214,9 @@ export {
   revokeConfirm,
 
 
-  judgeEmailStatus
+  judgeEmailStatus,
+  
+  copyDraftingGroup,
+  getWorkingGroupList,
+  getDraftingGroupById,
 }

src/views/draftingGroup/DraftingGroupManagement.vue

@@ -8,12 +8,22 @@
           <a-row>
             <a-col :xxl="6" :xl="6"  :lg="7" :md="8" :sm="24">
               <a-form-item label="起草组项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入起草组项目" v-model="queryParam.workingGroupProject" :maxLength='50'></a-input>
+                <a-input placeholder="请输入起草组项目" v-model="queryParam.draftingGroupProject" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xxl="6" :xl="6"  :lg="7" :md="8" :sm="24">
               <a-form-item label="关联工作组" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入关联工作组" v-model="queryParam.workingGroupProject" :maxLength='50'></a-input>
+                <a-select
+                  placeholder="请选择关联工作组"
+                  show-search
+                  v-model="queryParam.workingGroupId"
+                  :filter-option="filterOption"
+                >
+                  <a-select-option v-for="item in workingGroupList" :key="item.id" :value="item.id">
+                    {{ item.workingGroupProject }}
+                  </a-select-option>
+                </a-select>
+<!--                <a-input placeholder="请输入关联工作组" v-model="queryParam.workingGroupName" :maxLength='50'></a-input>-->
               </a-form-item>
             </a-col>
             <a-col :xxl="6" :xl="6" :lg="7" :md="8" :sm="24">
@@ -108,16 +118,15 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JYearDate from '@comp/jero/JYearDate'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
-import ProgressBar from '@comp/ProgressBar'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
-import { copyWorkingGroup } from '../../api/incomePaymentsApi'
+import {copyDraftingGroup, getWorkingGroupList} from '../../api/incomePaymentsApi'
 import { getAction } from '../../api/manage'
-import DraftingGroupModule from './modules/DraftingGroupModule';
+import DraftingGroupModule from './modules/DraftingGroupModule'
 
 export default {
   name: 'DraftingGroupManagement',
-  components: { JYearDate, DraftingGroupModule, SelectPrincipal, ProgressBar, PageHeaderTitle },
+  components: { JYearDate, DraftingGroupModule, SelectPrincipal, PageHeaderTitle },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -131,9 +140,9 @@ export default {
         sm: { span: 10 }
       },
       url: {
-        list: '/project/payWorkingGroup/list',
+        list: '/drafting/payDraftingGroup/list',
-        delete: '/project/payWorkingGroup/delete',
+        delete: '/drafting/payDraftingGroup/delete',
-        deleteBatch: '/project/payWorkingGroup/deleteBatch'
+        deleteBatch: '/drafting/payDraftingGroup/deleteBatch'
       },
       columns: [
         {
@@ -148,12 +157,12 @@ export default {
         }, {
           title: '起草组项目',
           align: 'center',
-          dataIndex: 'workingGroupProject',
+          dataIndex: 'draftingGroupProject',
           scopedSlots: { customRender: 'projectName' }
         }, {
           title: '关联工作组',
           align: 'center',
-          dataIndex: 'obj',
+          dataIndex: 'workingGroupName',
           width: 300
         }, {
           title: '负责人A',
@@ -175,10 +184,23 @@ export default {
       lastQueryParam: {
         year: new Date().getFullYear().toString()
       },
+      // 关联工作组下拉
+      workingGroupList: [],
       operateData: [] // 进行操作权限校验时使用的数据
     }
   },
+  created () {
+    this.loadWorkingGroupList()
+  },
   methods: {
+    // 获取工作组下拉列表
+    loadWorkingGroupList () {
+      getWorkingGroupList().then(res => {
+        if (res.success) {
+          this.workingGroupList = res.result || []
+        }
+      })
+    },
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
@@ -271,7 +293,7 @@ export default {
      * @param id
      */
     copyWorkGroup(id) {
-      copyWorkingGroup({ id: id }).then(res => {
+      copyDraftingGroup({ id: id }).then(res => {
         if (res.success) {
           this.$message.success(res.message)
         } else {
@@ -289,8 +311,8 @@ export default {
       this.$router.push({
         path: '/draftingGroup/DraftingGroupMemberUnitMaintenance',
         query: {
-          workingGroupProject: record.workingGroupProject,
+          draftingGroupProject: record.draftingGroupProject,
-          workingGroupProjectId: record.id,
+          draftingGroupProjectId: record.id,
           canOperate: record.checkoutOperation === 1
         }
       })
@@ -325,6 +347,12 @@ export default {
       this.$refs.modalForm.edit(record)
       this.$refs.modalForm.title = '基本信息维护'
       this.$refs.modalForm.disableSubmit = false
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
     }
   }
 }

src/views/draftingGroup/modules/DraftingGroupModule.vue

@@ -17,7 +17,7 @@
           <a-col :span="24">
             <a-form-item label="起草组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <a-input placeholder="请输入起草组项目"
-                       v-decorator="['workingGroupProject',validatorRules.workingGroupProject]"
+                       v-decorator="['draftingGroupProject',validatorRules.draftingGroupProject]"
                        :maxLength='50'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
             </a-form-item>
@@ -113,17 +113,16 @@
 <script>
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
-import JUpload from '@comp/jero/JUpload'
 import JYearDate from '@comp/jero/JYearDate'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import { isRepeat } from '../../../utils/util'
 import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
-import {getAllWorkProjects} from '@api/incomeMeetingApi'
+import { getWorkingGroupList } from '@api/incomePaymentsApi'
 
 export default {
   name: 'DraftingGroupModule',
-  components: { JUpload, JYearDate, SelectPrincipal },
+  components: { JYearDate, SelectPrincipal },
   data() {
     return {
       title: '操作',
@@ -149,8 +148,8 @@ export default {
         sm: { span: 21 }
       },
       validatorRules: {
-        workingGroupProject: {
+        draftingGroupProject: {
-          rules: [{ required: true, message: '请输入项目名称' }],
+          rules: [{ required: true, message: '请输入起草组项目' }],
           validateTrigger: 'blur'
         },
         workingGroupId: {
@@ -175,8 +174,8 @@ export default {
         }
       },
       url: {
-        add: '/project/payWorkingGroup/add',
+        add: '/drafting/payDraftingGroup/add',
-        edit: '/project/payWorkingGroup/edit'
+        edit: '/drafting/payDraftingGroup/edit'
       },
       // 工作组下拉列表
       workingGroupList: [],
@@ -197,7 +196,17 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'workingGroupProject', 'year', 'principalIdA', 'principalIdB', 'convokeNum', 'operationCycle', 'yearChargeA', 'chargeNoticeNoA', 'chargeNoticeAId', 'yearChargeB', 'chargeNoticeNoB', 'chargeNoticeBId', 'missionAndObjectives', 'remarks'))
+        this.form.setFieldsValue(pick(this.model,
+          'draftingGroupProject',
+          'workingGroupId',
+          'year',
+          'principalIdA',
+          'principalIdB',
+          'convokeNum',
+          'operationCycle',
+          'missionAndObjectives',
+          'remarks'
+        ))
         if (!this.model.id) {
           this.form.setFieldsValue({'year': (new Date().getFullYear()).toString()})
         }
@@ -205,7 +214,7 @@ export default {
     },
     // 获取工作组下拉列表
     loadWorkingGroupList () {
-      getAllWorkProjects().then(res => {
+      getWorkingGroupList().then(res => {
         if (res.success) {
           this.workingGroupList = res.result || []
         }