Revert "去掉打包添加打包负责人字段"

This reverts commit 0b37c1f2f4.

src/views/packManagement/PackCompanyList.vue

@@ -45,7 +45,7 @@
           bordered
           rowKey="id"
           :columns="columns"
-          :scroll="{x: 1500}"
+          :scroll="{x: 1600}"
           :dataSource="dataSource"
           :pagination="ipagination"
           :loading="loading"
@@ -86,7 +86,7 @@
               ref="footTable"
               :rowKey="record=>record.id"
               :columns="columnsFooter"
-              :scroll="{x: 1500}"
+              :scroll="{x: 1600}"
               :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',

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,13 +112,11 @@ 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: '操作',
@@ -169,10 +167,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 // 编辑回显的打包联系人信息
@@ -207,7 +205,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'))
+        this.form.setFieldsValue(pick(this.model, 'company', 'companyContactId', 'packYear', 'packChargeTotal', 'packContactId', 'packChargeRemark', 'remark', 'packPrincipalId'))
       })
     },
     close() {