From 0b37c1f2f41ab4afc920fc4afb733e3de200d713 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiaox0053@163.com>
Date: Fri, 18 Nov 2022 11:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8C=85=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=93=E5=8C=85=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/packManagement/PackCompanyList.vue  | 18 +++++------
 .../modules/PackCompanyModule.vue             | 32 ++++++++++---------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 00ec08e..65aae51 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -45,7 +45,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1600}"
+          :scroll="{x: 1500}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -86,7 +86,7 @@
               ref="footTable"
               :rowKey="record=>record.id"
               :columns="columnsFooter"
-              :scroll="{x: 1600}"
+              :scroll="{x: 1500}"
               :dataSource="footerDataSource"
               :showHeader="false"
               :pagination="false"
@@ -139,13 +139,13 @@ const defaultTableColumns = [
     dataIndex: 'packContactTemporaryName',
     scopedSlots: { customRender: 'nameText' }
   },
-  {
-    title: '打包负责人',
-    align: 'center',
-    width: 140,
-    dataIndex: 'packPrincipalName',
-    scopedSlots: { customRender: 'nameText' }
-  },
+  // {
+  //   title: '打包负责人',
+  //   align: 'center',
+  //   width: 140,
+  //   dataIndex: 'packPrincipalName',
+  //   scopedSlots: { customRender: 'nameText' }
+  // },
   {
     title: '打包费用总计',
     align: 'center',
diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue
index 0fb41e6..32da3c9 100644
--- a/src/views/packManagement/modules/PackCompanyModule.vue
+++ b/src/views/packManagement/modules/PackCompanyModule.vue
@@ -66,14 +66,14 @@
               </select-contacts>
             </a-form-item>
           </a-col>
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="打包负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <select-principal placeholder="请选择打包负责人"
-                                v-decorator="['packPrincipalId',validatorRules.packPrincipalId]"
-                                :maxLength='50'>
-              </select-principal>
-            </a-form-item>
-          </a-col>
+<!--          <a-col :xl="12" :sm="24">-->
+<!--            <a-form-item label="打包负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <select-principal placeholder="请选择打包负责人"-->
+<!--                                v-decorator="['packPrincipalId',validatorRules.packPrincipalId]"-->
+<!--                                :maxLength='50'>-->
+<!--              </select-principal>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
         </a-row>
         <a-row>
           <a-col>
@@ -112,11 +112,13 @@ import SelectContacts from '../../../components/company/SelectContacts'
 import JYearDate from '../../../components/jero/JYearDate'
 import { money } from '../../../utils/validate'
 import { addZero } from '../../../utils/util'
-import SelectPrincipal from '@comp/company/SelectPrincipal.vue'
+// import SelectPrincipal from '@comp/company/SelectPrincipal.vue'
 
 export default {
   name: 'PackCompanyModule',
-  components: { CompanySelect, SelectContacts, JYearDate, SelectPrincipal },
+  components: { CompanySelect, SelectContacts, JYearDate,
+    // SelectPrincipal
+  },
   data() {
     return {
       title: '操作',
@@ -167,10 +169,10 @@ export default {
           rules: [{ required: true, message: '请选择打包联系人' }],
           validateTrigger: 'change'
         },
-        packPrincipalId: {
-          rules: [{ required: true, message: '请选择打包负责人' }],
-          validateTrigger: 'change'
-        }
+        // packPrincipalId: {
+        //   rules: [{ required: true, message: '请选择打包负责人' }],
+        //   validateTrigger: 'change'
+        // }
       },
       initContact: null, // 编辑回显的企业联系人信息
       initPackContact: null // 编辑回显的打包联系人信息
@@ -205,7 +207,7 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId'))
+        this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark'))
       })
     },
     close() {