From 41bb5e4aa7eee7468bf71a82eedf90bd9dc5d1af Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 30 Aug 2021 08:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/company/SelectContacts.vue     |   5 +-
 .../modules/BusinessManagementModule.vue      |   2 +-
 .../ConferenceMaintenance.vue                 |  30 +-
 .../GeneralProjectManagement.vue              |   2 +-
 .../MemberUnitMaintenance.vue                 | 297 ++++++++++++++++++
 .../WorkingGroupProjectManagement.vue         |  27 +-
 .../modules/GeneralProjectModule.vue          |  16 +-
 7 files changed, 346 insertions(+), 33 deletions(-)
 create mode 100644 src/views/projectManagement/MemberUnitMaintenance.vue

diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue
index 951a661..dccddc6 100644
--- a/src/components/company/SelectContacts.vue
+++ b/src/components/company/SelectContacts.vue
@@ -3,7 +3,10 @@
   <div>
     <a-row>
       <a-col :span="20">
-        <a-select :value="value" v-bind="$attrs" v-on="$listeners">
+        <a-select :value="value"
+                  v-bind="$attrs"
+                  v-on="$listeners"
+                  show-search>
           <a-select-option v-for="item in contactsList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
         </a-select>
       </a-col>
diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue
index 8b617c9..8634b41 100644
--- a/src/views/businessManagement/modules/BusinessManagementModule.vue
+++ b/src/views/businessManagement/modules/BusinessManagementModule.vue
@@ -41,7 +41,7 @@
             <a-form-item label="邮政编码" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
               <a-input placeholder="请输入邮政编码"
                        v-decorator="['postalCode', validatorRules.postalCode]"
-                       :maxLength='50'
+                       :maxLength='6'
                        @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
               <a class="search-postcode" href="https://www.youbianku.com" target="_blank">查询邮编</a>
             </a-form-item>
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index babde15..f91a8a8 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -1,7 +1,11 @@
 <template>
-  <a-card>
-    <a-button @click="backWorkingGroupProject">返回</a-button>
-    <span>{{ workingGroupProject }}</span>
+  <a-card :bordered="false">
+    <div class="title">
+      <a-icon type="left" :style="{ fontSize: '22px' }" @click="backWorkingGroupProject"></a-icon>
+      <span class="title-text">{{ workingGroupProject }}</span>
+    </div>
+    <div class="divider"></div>
+
     <!--    查询区域-->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -104,6 +108,11 @@ export default {
       },
     }
   },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
   created() {
     this.workingGroupProject = this.$route.query.workingGroupProject
     this.workingGroupProjectId = this.$route.query.workingGroupProjectId
@@ -120,4 +129,19 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
+.title {
+
+  &-text {
+    padding-left: 1rem;
+    font-size: 18px;
+    line-height: 22px;
+  }
+}
+
+.divider {
+  height: 1px;
+  background-color: #cccccc;
+  margin: 15px -24px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index fac8996..b3f8e5a 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -21,7 +21,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="sex"/>
+              <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
diff --git a/src/views/projectManagement/MemberUnitMaintenance.vue b/src/views/projectManagement/MemberUnitMaintenance.vue
new file mode 100644
index 0000000..e2b6f89
--- /dev/null
+++ b/src/views/projectManagement/MemberUnitMaintenance.vue
@@ -0,0 +1,297 @@
+<template>
+  <a-card :bordered="false">
+    <!--    标题区域-->
+    <div class="title">
+      <a-icon type="left" :style="{ fontSize: '22px' }" @click="backWorkingGroupProject"></a-icon>
+      <span class="title-text">{{ workingGroupProject }}</span>
+    </div>
+    <div class="divider"></div>
+    <!--    /标题区域-->
+
+    <!--    工作组信息区域-->
+    <div class="work-group-detail">
+      <div class="work-group-detail-item work-group-detail-item-small" v-for="item in detailTitleList"
+           :key="item.title">
+        <div class="work-group-detail-item-title">{{ item.title }}:</div>
+        <div class="work-group-detail-item-content"></div>
+      </div>
+      <div class="work-group-detail-item">
+        <div class="work-group-detail-item-title">任务及目标:</div>
+        <div class="work-group-detail-item-content"></div>
+      </div>
+      <div class="work-group-detail-item">
+        <div class="work-group-detail-item-title">备注:</div>
+        <div class="work-group-detail-item-content"></div>
+      </div>
+    </div>
+    <!--    /工作组信息区域-->
+
+    <!--    查询区域-->
+    <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">
+              <j-date show-type="year" date-format="YYYY" placeholder="请选择年份" v-model="queryParam.year"></j-date>
+            </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">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--    /查询区域-->
+
+    <!--    操作按钮区域-->
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="handleAdd">添加成员</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+                @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downTemplate('企业管理导入模板')">下载模板</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+      <a-button type="primary" @click="">设置收费通知</a-button>
+    </div>
+    <!--    /操作按钮区域-end-->
+
+    <!--    table表格区域-->
+    <div>
+      <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1500}"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+        <!--        工作组名称-->
+<!--        <template slot="projectName" slot-scope="text, record">-->
+<!--          <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>-->
+<!--        </template>-->
+
+        <template slot="text" slot-scope="text,record">
+          <j-ellipsis :value="text" :length="20"></j-ellipsis>
+        </template>
+
+        <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <a @click="goConferenceMaintenance(record)">会议维护</a>
+          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDelete(record.id)">删除</a>
+        </span>
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import JDate from '@comp/jero/JDate'
+
+export default {
+  name: 'MemberUnitMaintenance',
+  components: { JDate },
+  mixins: [JeroListMixin],
+  computed: {
+    importExcelUrl: function () {
+      return `${ window._CONFIG['domianURL'] }/${ this.url.importExcelUrl }`
+    },
+  },
+  data() {
+    return {
+      workingGroupProject: '',
+      workingGroupProjectId: '',
+      detailTitleList: [
+        {
+          title: '工作组项目名称',
+          fieldName: ''
+        }, {
+          title: '负责人A',
+          fieldName: ''
+        }, {
+          title: '负责人B',
+          fieldName: ''
+        }, {
+          title: '每年召开次数',
+          fieldName: ''
+        }, {
+          title: '运行周期',
+          fieldName: ''
+        }, {
+          title: '本年应收款A',
+          fieldName: ''
+        }, {
+          title: '收费通知号A',
+          fieldName: ''
+        }, {
+          title: '收费通知A',
+          fieldName: ''
+        }, {
+          title: '本年应收款B',
+          fieldName: ''
+        }, {
+          title: '收费通知号B',
+          fieldName: ''
+        }, {
+          title: '收费通知B',
+          fieldName: ''
+        }
+      ],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      url: {
+        list: '',
+        delete: '',
+        deleteBatch: '',
+        exportXlsUrl: '',
+        importExcelUrl: '',
+        downTemplateUrl: ''
+      },
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '成员单位',
+          align: 'center',
+          dataIndex: 'workingGroupProject',
+          scopedSlots: { customRender: 'projectName' }
+        }, {
+          title: '企业联系人',
+          align: 'center',
+          width: 180,
+          dataIndex: 'principalNameA'
+        }, {
+          title: '应收金额',
+          align: 'center',
+          dataIndex: '',
+          width: 180,
+        }, {
+          title: '实收金额',
+          align: 'center',
+          dataIndex: '',
+          width: 180,
+        }, {
+          title: '打包',
+          align: 'center',
+          width: 100,
+          dataIndex: 'packaging'
+        }, {
+          title: '需要发票',
+          align: 'center',
+          width: 100,
+          dataIndex: 'invoice',
+          scopedSlots: { customRender: 'icon' }
+        }, {
+          title: '到账',
+          align: 'center',
+          width: 100,
+          dataIndex: 'inAccount'
+        }, {
+          title: '开票',
+          align: 'center',
+          width: 100,
+          dataIndex: 'makeInvoice'
+        }, {
+          title: '邮寄',
+          align: 'center',
+          width: 100,
+          dataIndex: 'mail'
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 180,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+    }
+  },
+  created() {
+    this.workingGroupProject = this.$route.query.workingGroupProject
+    this.workingGroupProjectId = this.$route.query.workingGroupProjectId
+  },
+  methods: {
+    backWorkingGroupProject() {
+      this.$router.push({
+        path: '/projectManagement/WorkingGroupProjectManagement'
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.title {
+
+  &-text {
+    padding-left: 1rem;
+    font-size: 18px;
+    line-height: 22px;
+  }
+}
+
+.divider {
+  height: 1px;
+  background-color: #cccccc;
+  margin: 15px -24px;
+}
+
+.work-group-detail {
+  display: flex;
+  flex-wrap: wrap;
+  padding-bottom: 20px;
+
+  &-item-small {
+    width: 33.3% !important;
+  }
+
+  &-item {
+    display: flex;
+    padding: 5px 5px;
+    width: 100%;
+
+    &-title {
+      flex-shrink: 0;
+      color: #9e9e9e;
+    }
+
+    &-content {
+      padding-left: 5px;
+      word-break: break-all;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index c8eedf5..c57b86d 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -52,26 +52,10 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange"
           class="j-table-force-nowrap">
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <j-ellipsis
-              @click.native="uploadFile(record.chargeNoticeFileId)"
-              style="color:#219AFF;cursor: pointer"
-              :value="text"
-              :length="20"/>
-        </template>
 
         <!--        工作组名称-->
         <template slot="projectName" slot-scope="text, record">
-          <div class="project-name">{{ text }}</div>
+          <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
         </template>
 
         <!--        进度-->
@@ -183,6 +167,15 @@ export default {
           workingGroupProjectId: record.id
         }
       })
+    },
+    goMemberUnitMaintenance(record) {
+      this.$router.push({
+        path: '/projectManagement/MemberUnitMaintenance',
+        query: {
+          workingGroupProject: record.workingGroupProject,
+          workingGroupProjectId: record.id
+        }
+      })
     }
   }
 }
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index be3bd0d..223683e 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -47,7 +47,7 @@
         <a-col :xl="12" :sm="24">
           <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag v-decorator="['chargeUse',validatorRules.chargeUse]" placeholder="请选择来款用途"
-                               dictCode="sex"/>
+                               dictCode="payment_charge_use"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -89,15 +89,11 @@
         </a-col>
         <a-col :xl="12" :sm="24">
           <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-select placeholder="请选择发票类型"
-                      v-decorator="['invoice',validatorRules.invoice]"
-                      :maxLength='50'
-                      @change="e => {e.target.value = (e.target.value + '').trim()}">
-              <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{
-                  item.invoice
-                }}
-              </a-select-option>
-            </a-select>
+            <j-dict-select-tag v-decorator="['invoice',validatorRules.invoice]"
+                               :maxLength='50'
+                               :triggerChange="true"
+                               placeholder="请选择发票类型"
+                               dictCode="invoice_type"/>
           </a-form-item>
         </a-col>
       </a-row>