[update] 收入合同关联项目组件拆分，普通项目管理module验证

src/api/incomePaymentsApi.js

@@ -22,6 +22,8 @@ const submitAudit = (param) => postAction('/contract/payIncomeContract/submitAud
 const getWorkingGroupListByNotCompany = (param) => getAction('/project/payWorkingGroup/queryListByNotCompany', param)
 // 收入合同存档
 const archiveRevenueContract = (param) => postAction('contract/payIncomeContract/archive', param)
+// 根据部门id获取用户信息
+const queryUserByDepartId = (param) => getAction('/sys/user/listRoleAndDepart', param)
 
 export {
 	getWorkingGroupById,
@@ -34,5 +36,6 @@ export {
   cancelAssociatedProject,
   submitAudit,
   getWorkingGroupListByNotCompany,
-  archiveRevenueContract
+  archiveRevenueContract,
+  queryUserByDepartId
 }

src/views/contractManagement/revenueContract/RevenueContractList.vue

@@ -48,7 +48,7 @@
             </a-col>
             <a-col :xl="7" :lg="8" :md="9" :sm="24">
               <a-form-item label="来款状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-checkbox-group v-model="queryParam.chargeUse" :options="incomePaymentsStatus"/>
+                <a-checkbox-group v-model="queryParam.chargeStatus" :options="incomePaymentsStatus"/>
               </a-form-item>
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="24">
@@ -154,10 +154,10 @@ export default {
       incomePaymentsStatus: [
         {
           label: '全部',
-          value: 1
+          value: 0
         }, {
           label: '到期未付款',
-          value: 2
+          value: 1
         }
       ],
       url: {
@@ -210,8 +210,7 @@ export default {
           title: '合同总金额',
           align: 'center',
           dataIndex: 'contractAmount',
-          width: 250,
+          width: 250
-          scopedSlots: { customRender: 'text' }
         }, {
           title: '状态',
           align: 'center',
@@ -288,9 +287,6 @@ export default {
     handleAudit(id) {
       this.$refs.aduitForm.contractId = id
       this.$refs.aduitForm.open()
-    },
-    aduitOk() {
-
     },
     /**
      * 存档

src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue

@@ -250,6 +250,13 @@
     <select-project-module ref="selectProjectModule"
                            @ok="selectProjectOk"
                            :default-charge-company="selectedCompany"></select-project-module>
+    <!--    会议项目选择-->
+    <select-meeting-project-module ref="selectMeetingProjectModule"
+                                   @ok="selectProjectOk"></select-meeting-project-module>
+
+    <!--    会员项目选择-->
+    <select-member-project-module ref="selectMemberProjectModule"
+                                  @ok="selectProjectOk"></select-member-project-module>
   </div>
 </template>
 
@@ -270,6 +277,8 @@ import { postAction } from '../../../../api/manage'
 import { getRevenueContractById } from '../../../../api/incomePaymentsApi'
 import { duplicateCheck } from '../../../../api/api'
 import AssociatedProject from './AssociatedProject'
+import SelectMeetingProjectModule from './SelectMeetingProjectModule'
+import SelectMemberProjectModule from './SelectMemberProjectModule'
 
 // 普通项目表头
 const generalProjectColumns = [
@@ -382,10 +391,6 @@ const workingProjectColumns = [
     scopedSlots: { customRender: 'rateOfProgress' }
   }
 ]
-// 会议项目表头
-const meetingProjectColumns = []
-// 会员项目表头
-const memberProjectColums = []
 
 export default {
   name: 'RevenueContractModule',
@@ -399,7 +404,9 @@ export default {
     InstallmentForm,
     ProjectTypeSelection,
     SelectProjectModule,
-    AssociatedProject
+    AssociatedProject,
+    SelectMeetingProjectModule,
+    SelectMemberProjectModule
   },
   data() {
     return {
@@ -587,10 +594,14 @@ export default {
         id: value
       }
       getAllUserList(param).then(res => {
-        this.model.departmentName = res.result[0].orgCodeTxt
+        if (res.success) {
-        this.$nextTick(() => {
+          this.model.departmentName = res.result[0].orgCodeTxt
-          this.form.setFieldsValue(pick(this.model, 'departmentName'))
+          this.$nextTick(() => {
-        })
+            this.form.setFieldsValue(pick(this.model, 'departmentName'))
+          })
+        } else {
+          console.log(res.message)
+        }
       })
     },
     /**
@@ -743,6 +754,12 @@ export default {
           }
           this.$refs.selectProjectModule.url.list = this.url.generalProjectList
           title = '普通项目列表'
+          this.$refs.selectProjectModule.pack = this.model.pack
+          this.$refs.selectProjectModule.contractId = this.model.id
+          this.$refs.selectProjectModule.projectType = type
+          this.$refs.selectProjectModule.title = title
+          this.$refs.selectProjectModule.open()
+
           break
         case 2:
           this.$refs.selectProjectModule.columns = workingProjectColumns
@@ -750,23 +767,22 @@ export default {
             companyId: this.selectedCompany.id
           }
           this.$refs.selectProjectModule.url.list = this.url.workingGroupProjectList
+          this.$refs.selectProjectModule.pack = this.model.pack
+          this.$refs.selectProjectModule.contractId = this.model.id
+          this.$refs.selectProjectModule.projectType = type
+          this.$refs.selectProjectModule.title = title
+          this.$refs.selectProjectModule.open()
           title = '工作组项目列表'
           break
         case 3:
-          this.$refs.selectProjectModule.columns = meetingProjectColumns
+          this.$refs.selectMeetingProjectModule.open()
-          this.$refs.selectProjectModule.url.list = this.url.meetingProjectList
-          title = '会议项目列表'
           break
         case 4:
-          this.$refs.selectProjectModule.columns = memberProjectColums
+          this.$refs.selectMemberProjectModule.open()
-          this.$refs.selectProjectModule.url.list = this.url.memberProjectList
-          title = '会员项目列表'
           break
       }
-      this.$refs.selectProjectModule.contractId = this.model.id
+
-      this.$refs.selectProjectModule.projectType = type
+
-      this.$refs.selectProjectModule.title = title
-      this.$refs.selectProjectModule.open()
     },
 
     /**

src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue

@@ -0,0 +1,147 @@
+<template>
+  <j-modal :title="title"
+           :width="width"
+           :visible="visible"
+           :confirmLoading="confirmLoading"
+           switchFullscreen
+           @ok="handleOk"
+           @cancel="handleCancel"
+           cancelText="关闭">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="会议项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入工作组项目" v-model="queryParam.workingGroupProject"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+
+            </a-form-item>
+          </a-col>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!--    操作按钮区域-->
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+    </div>
+    <!--    操作按钮区域-end-->
+
+    <!--    表格区域-->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :scroll="{x: 800}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="false"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange"
+        class="j-table-force-nowrap">
+
+        <template slot="text" slot-scope="text">
+          <j-ellipsis :value="text" :length="18"></j-ellipsis>
+        </template>
+
+        <!--        打包、需要发票、到账、开票、邮寄状态-->
+        <template slot="status" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+        </template>
+
+        <template slot="status-pack" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text"></status-slot>
+        </template>
+      </a-table>
+    </div>
+    <!--    /表格区域-->
+  </j-modal>
+</template>
+
+<script>
+import { JeroListMixin } from '../../../../mixins/JeroListMixin'
+import { associatedProject } from '../../../../api/incomePaymentsApi'
+
+export default {
+  name: 'SelectMeetingProjectModule',
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      title: '会议项目列表',
+      width: 1200,
+      visible: false,
+      confirmLoading: false,
+      columns: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      url: {
+        list: ''
+      },
+      disableMixinCreated: true,
+      contractId: '', // 收入合同id
+    }
+  },
+  methods: {
+    open() {
+      this.loadData()
+      this.visible = true
+    },
+    close() {
+      this.queryParam = {}
+      this.visible = false
+    },
+    handleOk() {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warn('请选择项目后再提交关联')
+        return
+      }
+      let submitData = []
+      let projectItem
+      this.selectedRowKeys.forEach(item => {
+        projectItem = {
+          contractId: this.contractId,
+          projectId: item,
+          projectType: this.projectType
+        }
+        submitData.push(projectItem)
+      })
+      associatedProject(submitData).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.close()
+          this.$emit('ok')
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue

@@ -0,0 +1,147 @@
+<template>
+  <j-modal :title="title"
+           :width="width"
+           :visible="visible"
+           :confirmLoading="confirmLoading"
+           switchFullscreen
+           @ok="handleOk"
+           @cancel="handleCancel"
+           cancelText="关闭">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="会员项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入工作组项目" v-model="queryParam.workingGroupProject"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+
+            </a-form-item>
+          </a-col>
+
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <!--    操作按钮区域-->
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+    </div>
+    <!--    操作按钮区域-end-->
+
+    <!--    表格区域-->
+    <div>
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :scroll="{x: 800}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="false"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange"
+        class="j-table-force-nowrap">
+
+        <template slot="text" slot-scope="text">
+          <j-ellipsis :value="text" :length="18"></j-ellipsis>
+        </template>
+
+        <!--        打包、需要发票、到账、开票、邮寄状态-->
+        <template slot="status" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+        </template>
+
+        <template slot="status-pack" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text"></status-slot>
+        </template>
+      </a-table>
+    </div>
+    <!--    /表格区域-->
+  </j-modal>
+</template>
+
+<script>
+import { associatedProject } from '../../../../api/incomePaymentsApi'
+import { JeroListMixin } from '../../../../mixins/JeroListMixin'
+
+export default {
+  name: 'SelectMemberProjectModule',
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      title: '会议项目列表',
+      width: 1200,
+      visible: false,
+      confirmLoading: false,
+      columns: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      url: {
+        list: ''
+      },
+      disableMixinCreated: true,
+      contractId: '', // 收入合同id
+    }
+  },
+  methods: {
+    open() {
+      this.loadData()
+      this.visible = true
+    },
+    close() {
+      this.queryParam = {}
+      this.visible = false
+    },
+    handleOk() {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warn('请选择项目后再提交关联')
+        return
+      }
+      let submitData = []
+      let projectItem
+      this.selectedRowKeys.forEach(item => {
+        projectItem = {
+          contractId: this.contractId,
+          projectId: item,
+          projectType: this.projectType
+        }
+        submitData.push(projectItem)
+      })
+      associatedProject(submitData).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.close()
+          this.$emit('ok')
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue

@@ -14,12 +14,26 @@
           <template v-if="projectType === 1">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input placeholder="请输入科室" v-model="queryParam.chargeCompanyTemporaryName"></a-input>
+                <!--            :disabled="pack === 0"    -->
+                <a-tree-select
+                  style="width:100%"
+                  :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflow-y': 'auto' }"
+                  :treeData="treeDepartData"
+                  v-model="queryParam.departId"
+                  placeholder="请选择科室"
+                  @change="departChange">
+                </a-tree-select>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <select-principal placeholder="请选择负责人" v-model="queryParam.principalId"></select-principal>
+                <a-select v-model="queryParam.principalId"
+                          show-search
+                          placeholder="请选择负责人"
+                          option-filter-prop="children"
+                          :filter-option="filterOption">
+                  <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{ item.realname }}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -112,17 +126,23 @@
 
 <script>
 import { JeroListMixin } from '../../../../mixins/JeroListMixin'
-import SelectPrincipal from '../../../../components/company/SelectPrincipal'
 import JYearDate from '../../../../components/jero/JYearDate'
 import GeneralProjectModule from '../../../projectManagement/modules/GeneralProjectModule'
 import StatusSlot from '../../../../components/tools/StatusSlot'
-import { associatedProject } from '../../../../api/incomePaymentsApi'
+import { associatedProject, queryUserByDepartId } from '../../../../api/incomePaymentsApi'
 import WorkingGroupMemberUnitModule from '../../../projectManagement/modules/WorkingGroupMemberUnitModule'
 import ProgressBar from '../../../../components/ProgressBar'
+import { queryDepartTreeList } from '../../../../api/api'
 
 export default {
   name: 'SelectProjectModule',
-  components: { SelectPrincipal, JYearDate, GeneralProjectModule, StatusSlot, WorkingGroupMemberUnitModule, ProgressBar },
+  components: {
+    JYearDate,
+    GeneralProjectModule,
+    StatusSlot,
+    WorkingGroupMemberUnitModule,
+    ProgressBar
+  },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -144,15 +164,38 @@ export default {
       contractId: '', // 收入合同id
       url: {
         list: ''
-      }
+      },
+      pack: null,// 是否打包
+      treeDepartData: [], // 部门列表
+      userList: [] // 用户列表
     }
   },
   methods: {
     open() {
       this.loadData()
+      this.loadDepartTreeData()
       this.visible = true
     },
+    /**
+     * 获取科室（部门）数据
+     */
+    loadDepartTreeData() {
+      queryDepartTreeList().then((res) => {
+        if (res.success) {
+          this.treeDepartData = []
+          let treeList = res.result
+          for (let a = 0; a < treeList.length; a++) {
+            let temp = treeList[a]
+            temp.isLeaf = temp.leaf
+            this.treeDepartData.push(temp)
+          }
+        } else {
+          console.log(res.message)
+        }
+      })
+    },
     close() {
+      this.queryParam = {}
       this.visible = false
     },
     handleOk() {
@@ -199,6 +242,28 @@ export default {
           this.$refs.workingGroupMemberForm.disableSubmit = false
           break
       }
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    /**
+     * 部门变化，负责人列表变化
+     * @param value
+     */
+    departChange(value) {
+      let param = {
+        departId: value
+      }
+      queryUserByDepartId(param).then(res => {
+        if (res.success) {
+          this.userList = res.result
+        } else {
+          console.log(res.message)
+        }
+      })
     }
   }
 }

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -224,8 +224,7 @@ export default {
           validateTrigger: 'blur'
         },
         year: {
-          rules: [{ required: true, message: '请选择运行年份' }],
+          rules: [{ required: true, message: '请选择运行年份' }]
-          validateTrigger: 'blur'
         },
         principalId: {
           rules: [{ required: true, message: '请选择负责人' }],
@@ -237,7 +236,7 @@ export default {
         },
         chargeUse: {
           rules: [{ required: true, message: '请选择来款用途' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         contactsId: {
           rules: [{ required: true, message: '请选择联系人' }],
@@ -253,11 +252,11 @@ export default {
         },
         needInvoice: {
           rules: [{ required: true, message: '请选择发票类型' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         chargeWay: {
           rules: [{ required: true, message: '请选择来款方式' }],
-          validateTrigger: 'blur'
+          validateTrigger: 'change'
         },
         contractNum: {
           rules: [{ required: true, message: '请输入合同号' }],