From 57f013032025763eb99a647026a5d773aa22c930 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Sun, 26 Sep 2021 14:47:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/StatusSlot.vue           |  5 +-
 .../ArriveAndInvoivingList.vue                | 14 +++++-
 src/views/mailManagement/BillMail.vue         | 41 +++++++++++-----
 src/views/mailManagement/ContractMail.vue     | 43 ++++++++++++-----
 .../packManagement/PackProjectMaintenance.vue | 14 +++++-
 .../GeneralProjectManagement.vue              | 47 ++++++++++++-------
 .../WorkingGroupMemberUnitMaintenance.vue     | 14 +++++-
 7 files changed, 130 insertions(+), 48 deletions(-)

diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 4d5936f..0191007 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -145,12 +145,13 @@ export default {
      */
     showTemplate(item) {
       let result = ''
+      console.log(item)
       // 来款
       if(this.statusKey === 'paymentRecord') {
         result = `${item.paymentDate}到账${item.amountReceived}`
-      } else if(this.statusKey === 'mail') {
-        result = `${item.billDate}新增发票，发票单号：${item.billNo}`
       } else if(this.statusKey === 'bill') {
+        result = `${item.billDate}新增发票，发票单号：${item.billNo}`
+      } else if(this.statusKey === 'mail') {
         result = `${item.sendDate}新增邮寄信息，邮寄单号：${item.postNo}`
       }
       return result
diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 671137c..3fd800e 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -82,6 +82,16 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
           </template>
 
+          <!--          开票-->
+          <template slot="status-bill" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+
+          <!--          邮寄-->
+          <template slot="status-mail" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+          </template>
+
           <template slot="status-pack" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
@@ -232,13 +242,13 @@ export default {
           align: 'center',
           width: 70,
           dataIndex: 'makeInvoice',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-bill' }
         }, {
           title: '邮寄',
           align: 'center',
           width: 70,
           dataIndex: 'mail',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-mail' }
         }, {
           title: '操作',
           dataIndex: 'action',
diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue
index b422bdd..14d16e3 100644
--- a/src/views/mailManagement/BillMail.vue
+++ b/src/views/mailManagement/BillMail.vue
@@ -82,6 +82,10 @@
                         @click="openDetailModal(record)"></j-ellipsis>
           </template>
 
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+          </template>
+
           <span slot="print" slot-scope="text, record" class="action-span-cell">
             <a-button type="primary" :disabled="record.sendMethod === 1 ? false : true">打印</a-button>
           </span>
@@ -98,9 +102,9 @@
   </div>
 </template>
 <script>
-import {mixinDevice} from '@/utils/mixin'
-import {JeroListMixin} from '@/mixins/JeroListMixin'
-import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { RangeDateMixin } from '@/mixins/RangeDateMixin'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/xin.png'
 import MailModal from './modules/MailModal'
@@ -130,6 +134,7 @@ export default {
         {
           title: '序号',
           dataIndex: '',
+          width: 60,
           key: 'rowIndex',
           align: 'center',
           customRender: function (t, r, index) {
@@ -142,45 +147,59 @@ export default {
           ellipsis: true,
           align: 'center',
           dataIndex: 'projectName',
-          scopedSlots: {customRender: 'projectName'}
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '票号',
           align: 'center',
+          width: 200,
           dataIndex: 'billNo',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '开票金额',
           align: 'center',
+          width: 200,
           dataIndex: 'invoiceAmount',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '项目负责人',
           align: 'center',
+          width: 200,
           dataIndex: 'principalName',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '来款单位',
           align: 'center',
+          width: 200,
           dataIndex: 'chargeCompanyName',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '邮寄联系人',
           align: 'center',
+          width: 200,
           dataIndex: 'contactName',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '联系人电话',
           align: 'center',
+          width: 200,
           dataIndex: 'contactMobile',
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '状态',
           align: 'center',
-          dataIndex: 'postStatus_dictText',
+          width: 200,
+          dataIndex: 'postStatus_dictText'
         },
         {
           title: '打印',
+          width: 100,
           align: 'center',
           dataIndex: '',
           scopedSlots: { customRender: 'print' }
@@ -190,20 +209,20 @@ export default {
           align: 'center',
           fixed: 'right',
           width: 160,
-          scopedSlots: {customRender: 'action'}
-        },
+          scopedSlots: { customRender: 'action' }
+        }
       ],
       url: {
         list: '/mail/payMailBill/list',
-        exportXlsUrl: '/mail/payMailBill/exportXls',
-      },
+        exportXlsUrl: '/mail/payMailBill/exportXls'
+      }
     }
   },
   methods: {
     //  查看物流
     goLogistics(record) {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
-      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
     handleAdd: function (record) {
       this.$refs.modalForm.add(record, 1)
@@ -225,7 +244,7 @@ export default {
       }
       console.log('导出参数', param)
       downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue
index f744efc..e42d0f5 100644
--- a/src/views/mailManagement/ContractMail.vue
+++ b/src/views/mailManagement/ContractMail.vue
@@ -64,13 +64,18 @@
             <div class="primary-color" v-html="text"></div>
           </template>
 
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="18"></j-ellipsis>
+          </template>
+
           <span slot="print" slot-scope="text, record" class="action-span-cell">
             <a-button type="primary" :disabled="record.sendMethod === '1' ? false : true">打印</a-button>
           </span>
           <span slot="action" slot-scope="text, record" class="action-span-cell">
             <a @click="handleAdd(record.id)" v-if="record.postStatus === '0'" v-has="'contractMail:mail'">邮寄</a>
             <a @click="handleEdit(record)" v-if="record.postStatus === '1'" v-has="'contractMail:edit'">修改</a>
-            <a @click="goLogistics(record)" v-if="record.postStatus === '1'" v-has="'contractMail:checkLogistics'">查看物流</a>
+            <a @click="goLogistics(record)" v-if="record.postStatus === '1'"
+               v-has="'contractMail:checkLogistics'">查看物流</a>
           </span>
         </a-table>
       </div>
@@ -79,9 +84,9 @@
   </div>
 </template>
 <script>
-import {mixinDevice} from '@/utils/mixin'
-import {JeroListMixin} from '@/mixins/JeroListMixin'
-import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import { mixinDevice } from '@/utils/mixin'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { RangeDateMixin } from '@/mixins/RangeDateMixin'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/xin.png'
 import MailContractModal from './modules/MailContractModal'
@@ -118,47 +123,63 @@ export default {
         {
           title: '合同编号',
           align: 'center',
+          width: 200,
           dataIndex: 'contractNum',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: { customRender: 'htmlSlot' }
         },
         {
           title: '合同名称',
           align: 'center',
+          width: 250,
           dataIndex: 'contractName',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '签订单位',
           align: 'center',
+          width: 200,
           dataIndex: 'signedCompanyTemporaryName',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '负责人',
           align: 'center',
+          width: 200,
           dataIndex: 'principalName',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '合同总金额',
           align: 'center',
+          width: 200,
           dataIndex: 'contractAmount',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '邮寄联系人',
           align: 'center',
+          width: 200,
           dataIndex: 'liaisonMan',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '联系人电话',
           align: 'center',
+          width: 200,
           dataIndex: 'mobile',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '状态',
           align: 'center',
+          width: 200,
           dataIndex: 'postStatus_dictText',
+          scopedSlots: { customRender: 'projectName' }
         },
         {
           title: '打印',
           align: 'center',
+          width: 100,
           dataIndex: '',
           scopedSlots: { customRender: 'print' }
         },
@@ -167,20 +188,20 @@ export default {
           align: 'center',
           fixed: 'right',
           width: 160,
-          scopedSlots: {customRender: 'action'}
-        },
+          scopedSlots: { customRender: 'action' }
+        }
       ],
       url: {
         list: '/payMailContract/payMailContract/list',
-        exportXlsUrl: '/payMailContract/payMailContract/exportXls',
-      },
+        exportXlsUrl: '/payMailContract/payMailContract/exportXls'
+      }
     }
   },
   methods: {
     //  查看物流
     goLogistics(record) {
       const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng'
-      window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
+      window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`)
     },
     handleAdd: function (id) {
       this.$refs.modalForm.add(id)
@@ -202,7 +223,7 @@ export default {
       }
       console.log('导出参数', param)
       downloadFile(this.url.exportXlsUrl, fileName + '.xls', param)
-    },
+    }
   }
 }
 </script>
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 69084b7..6566013 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -103,6 +103,16 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
           </template>
 
+          <!--          开票-->
+          <template slot="status-bill" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+
+          <!--          邮寄-->
+          <template slot="status-mail" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+          </template>
+
           <template slot="status-pack" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
@@ -299,13 +309,13 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'makeInvoice',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-bill' }
         }, {
           title: '邮寄',
           align: 'center',
           width: 80,
           dataIndex: 'mail',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-mail' }
         }, {
           title: '操作',
           dataIndex: 'action',
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index 6dd4ec8..4d93ce8 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -23,7 +23,8 @@
             </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="payment_charge_use" show-search/>
+                <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"
+                                   show-search/>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -62,18 +63,18 @@
       <!--    table表格区域-->
       <div>
         <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :scroll="{x: 1000}"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange"
-            class="j-table-force-nowrap">
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1000}"
+          :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">
@@ -90,14 +91,24 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
           </template>
 
+          <!--          开票-->
+          <template slot="status-bill" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+
+          <!--          邮寄-->
+          <template slot="status-mail" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+          </template>
+
           <template slot="status-pack" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-          <a @click="handleEdit(record)" v-has="'generalProject:edit'">编辑</a>
-          <a @click="handleDelete(record.id)" v-has="'generalProject:delete'">删除</a>
-        </span>
+            <a @click="handleEdit(record)" v-has="'generalProject:edit'">编辑</a>
+            <a @click="handleDelete(record.id)" v-has="'generalProject:delete'">删除</a>
+          </span>
         </a-table>
       </div>
       <general-project-module ref="modalForm" @ok="modalFormOk"></general-project-module>
@@ -209,13 +220,13 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'makeInvoice',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-bill' }
         }, {
           title: '邮寄',
           align: 'center',
           width: 80,
           dataIndex: 'mail',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-mail' }
         }, {
           title: '操作',
           dataIndex: 'action',
diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
index 4fc2898..bfb56a2 100644
--- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue
@@ -116,6 +116,16 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
           </template>
 
+          <!--          开票-->
+          <template slot="status-bill" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+
+          <!--          邮寄-->
+          <template slot="status-mail" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
+          </template>
+
           <template slot="status-pack" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
@@ -286,13 +296,13 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'makeInvoice',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-bill' }
         }, {
           title: '邮寄',
           align: 'center',
           width: 80,
           dataIndex: 'mail',
-          scopedSlots: { customRender: 'status' }
+          scopedSlots: { customRender: 'status-mail' }
         }, {
           title: '操作',
           dataIndex: 'action',