[update] 收入合同关联普通、工作组项目组件拆分;支出合同税率修改

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

@@ -11,51 +11,38 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row>
           <!--          普通项目管理查询-->
-          <template v-if="projectType === 1">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-tree-select
-                  style="width:100%"
-                  :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflow-y': 'auto' }"
-                  :treeData="treeDepartData"
-                  v-model="queryParam.departId"
-                  placeholder="请选择科室"
-                  :disabled="pack === 0"
-                  @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">
-                <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">
-              <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
-              </a-form-item>
-            </a-col>
-          </template>
-
-          <!--          工作组项目查询-->
-          <template v-if="projectType === 2">
-            <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">
-                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-tree-select
+                style="width:100%"
+                :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflow-y': 'auto' }"
+                :treeData="treeDepartData"
+                v-model="queryParam.departId"
+                placeholder="请选择科室"
+                :disabled="pack === 0"
+                @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">
+              <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">
+            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+            </a-form-item>
+          </a-col>
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
@@ -66,6 +53,7 @@
         </a-row>
       </a-form>
     </div>
+    <!--    /查询区域-->
 
     <!--    操作按钮区域-->
     <div class="table-operator">
@@ -98,11 +86,6 @@
           <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
         </template>
 
-        <!--        进度-->
-        <template slot="rateOfProgress" slot-scope="text">
-          <progress-bar :data="text"></progress-bar>
-        </template>
-
         <template slot="status-pack" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
@@ -116,13 +99,6 @@
                             :default-charge-way="2"
                             :is-contract-num-disabled="true"
                             @ok="modalFormOk"></general-project-module>
-    <!--    工作组项目新增-->
-    <working-group-member-unit-module ref="workingGroupMemberForm"
-                                      @ok="modalFormOk"
-                                      v-bind="$attrs"
-                                      :disabled-charge-company="true"
-                                      :is-contract-num-disabled="true"
-                                      :default-charge-way="2"></working-group-member-unit-module>
   </j-modal>
 </template>
 
@@ -132,8 +108,6 @@ import JYearDate from '../../../../components/jero/JYearDate'
 import GeneralProjectModule from '../../../projectManagement/modules/GeneralProjectModule'
 import StatusSlot from '../../../../components/tools/StatusSlot'
 import { associatedProject, queryUserByDepartId } from '../../../../api/incomePaymentsApi'
-import WorkingGroupMemberUnitModule from '../../../projectManagement/modules/WorkingGroupMemberUnitModule'
-import ProgressBar from '../../../../components/ProgressBar'
 import { queryDepartTreeList } from '../../../../api/api'
 
 export default {
@@ -141,18 +115,41 @@ export default {
   components: {
     JYearDate,
     GeneralProjectModule,
-    StatusSlot,
-    WorkingGroupMemberUnitModule,
-    ProgressBar
+    StatusSlot
   },
   mixins: [JeroListMixin],
+  props: {
+    // 部门id，用于查询
+    departId: {
+      type: String,
+      requird: false,
+      default: null
+    },
+    // 打包状态
+    pack: {
+      type: Number,
+      requird: false,
+      default: null
+    },
+    // 收入合同id
+    contractId: {
+      type: String,
+      requird: false,
+      default: null,
+    },
+    // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目
+    projectType: {
+      type: Number,
+      requird: false,
+      default: null
+    }
+  },
   data() {
     return {
-      title: '操作',
+      title: '普通项目列表',
       width: 1200,
       visible: false,
       confirmLoading: false,
-      columns: [],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 }
@@ -161,22 +158,107 @@ export default {
         xs: { span: 24 },
         sm: { span: 10 }
       },
-      projectType: null, // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目
       disableMixinCreated: true,
-      contractId: '', // 收入合同id
       url: {
-        list: ''
+        list: '/project/payCommonProject/listAll'
       },
-      pack: null,// 是否打包
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '来款项目',
+          align: 'center',
+          width: 200,
+          dataIndex: 'chargeProject',
+          scopedSlots: { customRender: 'projectName' }
+        }, {
+          title: '来款用途',
+          align: 'center',
+          width: 180,
+          dataIndex: 'chargeUse_dictText',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '来款单位',
+          align: 'center',
+          width: 200,
+          dataIndex: 'chargeCompanyTemporaryName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '应收金额',
+          align: 'center',
+          width: 100,
+          dataIndex: 'receivableAmount'
+        }, {
+          title: '实收金额',
+          align: 'center',
+          width: 100,
+          dataIndex: 'paidAmount'
+        }, {
+          title: '负责人',
+          align: 'center',
+          width: 140,
+          dataIndex: 'principalName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '企业联系人',
+          align: 'center',
+          width: 140,
+          dataIndex: 'contactsTemporaryName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '打包',
+          align: 'center',
+          width: 80,
+          dataIndex: 'pack',
+          scopedSlots: { customRender: 'status-pack' }
+        }, {
+          title: '需要发票',
+          align: 'center',
+          width: 80,
+          dataIndex: 'needInvoice',
+          scopedSlots: { customRender: 'status-pack' }
+        }, {
+          title: '到账',
+          align: 'center',
+          width: 80,
+          dataIndex: 'inAccount',
+          scopedSlots: { customRender: 'status' }
+        }, {
+          title: '开票',
+          align: 'center',
+          width: 80,
+          dataIndex: 'makeInvoice',
+          scopedSlots: { customRender: 'status' }
+        }, {
+          title: '邮寄',
+          align: 'center',
+          width: 80,
+          dataIndex: 'mail',
+          scopedSlots: { customRender: 'status' }
+        }
+      ],
       treeDepartData: [], // 部门列表
-      userList: [] // 用户列表
+      userList: [], // 用户列表
+    }
+  },
+  // 部门id变化时绑定查询条件
+  watch: {
+    departId(val) {
+      this.queryParam.departId = val
     }
   },
   methods: {
     open() {
-      this.loadData()
       this.loadDepartTreeData()
       this.visible = true
+      this.loadData()
     },
     /**
      * 获取科室（部门）数据
@@ -230,21 +312,12 @@ export default {
       this.close()
     },
     /**
-     * 打开不同类型项目的新增module
+     * 打开新增module
      */
     handleAdd() {
-      switch (this.projectType) {
-        case 1:
-          this.$refs.generalProjectForm.add()
-          this.$refs.generalProjectForm.title = '新增'
-          this.$refs.generalProjectForm.disableSubmit = false
-          break
-        case 2:
-          this.$refs.workingGroupMemberForm.add()
-          this.$refs.workingGroupMemberForm.title = '新增'
-          this.$refs.workingGroupMemberForm.disableSubmit = false
-          break
-      }
+      this.$refs.generalProjectForm.add()
+      this.$refs.generalProjectForm.title = '新增'
+      this.$refs.generalProjectForm.disableSubmit = false
     },
     // 下拉框的搜索
     filterOption(input, option) {
@@ -267,7 +340,15 @@ export default {
           console.log(res.message)
         }
       })
-    }
+    },
+    /**
+     * 重置
+     */
+    searchReset() {
+      this.lastQueryParam = {}
+      this.queryParam.departId = this.departId
+      this.loadData(1)
+    },
   }
 }
 </script>