From 0108b9d1c7dcc8d0daba993b76231eb123a02725 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 26 Aug 2021 18:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GeneralProjectManagement.vue              | 44 ++++++++-----------
 .../modules/GeneralProjectModule.vue          | 21 +++++----
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index 7924e61..fac8996 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -16,11 +16,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select placeholder="请选择负责人"
-                        v-model="queryParam.principalId"
-                        :maxLength='50'>
-                <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{ item.username }}</a-select-option>
-              </a-select>
+              <select-principal placeholder="请选择负责人" v-model="queryParam.principalId"></select-principal>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -57,10 +53,7 @@
     <!--    操作按钮区域-->
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-      <a-button type="primary" icon="import">导入</a-button>
-      <a-button type="primary" icon="export">导出</a-button>
-      <a-button type="primary" icon="download">下载模板</a-button>
-      <a-button type="danger" icon="delete">批量删除</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
     </div>
     <!--    操作按钮区域-end-->
 
@@ -97,13 +90,19 @@
           <j-ellipsis :value="text" :length="20"></j-ellipsis>
         </template>
 
+        <!--        打包、需要发票、到账、开票、邮寄状态-->
+        <template slot="icon" slot-scope="text,record">
+          <!--          <img v-if="text === 1">-->
+          <!--          <img v-if="text === 2">-->
+        </template>
+
         <span slot="action" class="action-span-cell" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
         </span>
       </a-table>
     </div>
-    <general-project-module ref="modalForm"></general-project-module>
+    <general-project-module ref="modalForm" @ok="modalFormOk"></general-project-module>
   </a-card>
 </template>
 
@@ -111,11 +110,17 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import JDate from '@comp/jero/JDate'
 import GeneralProjectModule from './modules/GeneralProjectModule'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
   name: 'GeneralProjectManagement',
-  components: { JDate, GeneralProjectModule },
+  components: { JDate, GeneralProjectModule, SelectPrincipal },
   mixins: [JeroListMixin],
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
   data() {
     return {
       labelCol: {
@@ -185,7 +190,8 @@ export default {
           title: '需要发票',
           align: 'center',
           width: 100,
-          dataIndex: 'invoice'
+          dataIndex: 'invoice',
+          scopedSlots: { customRender: 'icon' }
         }, {
           title: '到账',
           align: 'center',
@@ -217,19 +223,7 @@ export default {
         exportXlsUrl: '',
         importExcelUrl: '',
         exportTemplateUrl: ''
-      },
-      userList: [], // 用户管理的所有用户
-    }
-  },
-  created() {
-    this.initUserList()
-  },
-  methods: {
-    /**
-     * 获取所有用户
-     */
-    initUserList() {
-
+      }
     }
   }
 }
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 70d24c4..32e7b95 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -28,12 +28,15 @@
         </a-col>
         <a-col :xl="12" :sm="24">
           <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-select placeholder="请选择负责人"
-                      v-decorator="['principalId',validatorRules.principalId]"
-                      :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.username }}</a-select-option>
-            </a-select>
+            <select-principal placeholder="请选择负责人"
+                              v-decorator="['principalId',validatorRules.principalId]"
+                              :maxLength='50'></select-principal>
+<!--            <a-select placeholder="请选择负责人"-->
+<!--                      v-decorator="['principalId',validatorRules.principalId]"-->
+<!--                      :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.username }}</a-select-option>-->
+<!--            </a-select>-->
           </a-form-item>
         </a-col>
       </a-row>
@@ -177,10 +180,11 @@ import JDate from '@comp/jero/JDate'
 import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
 import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JDate, JUpload, CompanySelect, ContactManagementModule },
+  components: { JDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal },
   data() {
     return {
       title: '操作',
@@ -257,7 +261,7 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'companyName', 'companyAddress', 'companyPhone', 'postalCode', 'bankAccountName', 'openingBank', 'bankAccount', 'dutyCode', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompanyName', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount', 'invoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'remarks'))
       })
     },
     close() {
@@ -305,7 +309,6 @@ export default {
       this.chargeWayType = e.target.value
     },
     companyChange(value) {
-      console.log('---companyChange---', value)
       this.selectedCompany = value
     },
     addContacts() {