From b86d3b1a999bc4f05b9724803d31767b8c99cac6 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 26 Nov 2018 11:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BA=A4=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=EF=BC=9A=E6=8E=A5=E6=94=B6=E4=BA=BA=E9=83=A8=E9=97=A8=E6=94=B9?=
 =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReceiptConnectionSheet.js                 | 16 ++++++++--
 .../ReceiptConnectionSheet/index.vue          | 31 ++++++++++++-------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/api/PurchasingCenter/ReceiptConnectionSheet.js b/src/api/PurchasingCenter/ReceiptConnectionSheet.js
index e916b988..24c00416 100644
--- a/src/api/PurchasingCenter/ReceiptConnectionSheet.js
+++ b/src/api/PurchasingCenter/ReceiptConnectionSheet.js
@@ -49,8 +49,8 @@ export function deleteInvoice(num1) {
     }
   })
 }
-// 传送人接收人初始化 采购科改16
-export function initPerson() {
+// 传送人初始化 采购科改16
+export function initSender() {
   return request({
     url: '',
     method: 'post',
@@ -61,6 +61,18 @@ export function initPerson() {
     }
   })
 }
+// 接收人初始化 财务部7
+export function initReceiver() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=7'
+    }
+  })
+}
 // 初始化合同号
 export function initContract() {
   return request({
diff --git a/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue b/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue
index f5480480..cc08073c 100644
--- a/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue
+++ b/src/views/PurchasingCenter/ReceiptConnectionSheet/index.vue
@@ -19,7 +19,7 @@
       <span>传送人:</span>
       <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px">
         <el-option
-          v-for="item in selectPerson"
+          v-for="item in sender"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
@@ -27,7 +27,7 @@
       <span>接收人:</span>
       <el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:100px">
         <el-option
-          v-for="item in selectPerson"
+          v-for="item in receiver"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column align="center" label="开票时间" min-width="100px">
           <template slot-scope="scope">
-            {{ scope.row.开票时间 }}
+            {{ scope.row.开票时间 ? scope.row.开票时间 : '—' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="开票金额" min-width="100px">
@@ -96,12 +96,12 @@
         </el-table-column>
         <el-table-column align="center" label="接收人" min-width="80px">
           <template slot-scope="scope">
-            {{ scope.row.接收人姓名==='请选择' ? '' : scope.row.接收人姓名 }}
+            {{ scope.row.接收人姓名==='请选择' ? '—' : scope.row.接收人姓名 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="备注" min-width="200px">
           <template slot-scope="scope">
-            {{ scope.row.备注 }}
+            {{ scope.row.备注 ? scope.row.备注 : '—' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="200px">
@@ -158,7 +158,7 @@
         <el-form-item label="传送人" prop="sendPerson">
           <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
             <el-option
-              v-for="item in selectPerson"
+              v-for="item in sender"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -167,7 +167,7 @@
         <el-form-item label="接收人" prop="receivePerson">
           <el-select v-model="form1.receivePersonValue" placeholder="接收人" size="small" filterable clearable style="width:100px">
             <el-option
-              v-for="item in selectPerson"
+              v-for="item in receiver"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -187,7 +187,7 @@
 </template>
 
 <script>
-import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initContract } from '@/api/PurchasingCenter/ReceiptConnectionSheet'
+import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initSender, initReceiver, initContract } from '@/api/PurchasingCenter/ReceiptConnectionSheet'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -199,7 +199,8 @@ export default {
       invoiceNum: '',
       invoiceTime: '',
       transmitValue: '',
-      selectPerson: [], // 传送人接收人
+      sender: [], // 传送人
+      receiver: [], // 接收人
       recipientValue: '',
       contractNum: '',
       pageCurrent1: 1,
@@ -255,9 +256,17 @@ export default {
           })
         }
       })
-      initPerson().then(response => {
+      initSender().then(response => { // 传送人
         for (let i = 0; i < response.data.length; i++) {
-          this.selectPerson.push({
+          this.sender.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      initReceiver().then(response => { // 接收人
+        for (let i = 0; i < response.data.length; i++) {
+          this.receiver.push({
             label: response.data[i].姓名,
             value: response.data[i].人员编号
           })