吉永收付款，对账导入增加显示数据10.19

src/components/bill/billDetailList.vue

@@ -16,7 +16,7 @@
       <template slot-scope="scope" slot="menu">
         <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
           v-if="activeName == 'searchList'"
-          :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
+          :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1 || dataList.findIndex(item => item.accId == scope.row.id) !== -1">选择
         </el-button>
         <el-button type="text" icon="el-icon-delete" size="small" @click.stop="removeStagList(scope.row, scope.index)"
           v-else>移除
@@ -54,6 +54,11 @@ export default {
     },
     closeFun: {
       type: Function
+    },
+    // 已经到出去的数据
+    dataList:{
+        type:Array,
+        default:[]
     }
   },
   data() {

src/views/financialManagement/compareBill/receiptSettleDetailsPage.vue

@@ -188,6 +188,7 @@
         top="10vh"
         v-dialog-drag>
         <bill-detail
+            :dataList="dataList"
           :params="params"
           :billType="form.type"
           :flag="1"
@@ -917,7 +918,7 @@
       },
       getGSName(row) {
         this.form.belongCompany = row.cname
-        if (this.category == 2) {
+        // if (this.category == 2) {
           GYSGetBank(row.id).then(res =>{
             this.$set(this.form,"bankList",res.data)
             if (this.form.bankList.length > 0) {
@@ -927,7 +928,7 @@
               this.form.subjectNumber = this.form.bankList[0].subjectNumber
             }
           })
-        }
+        // }
       },
       cellStyle() {
         return "padding:0;height:40px;";

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -115,7 +115,7 @@
       </basic-container>
       <el-dialog title="导入采购" append-to-body class="el-dialogDeep" :visible.sync="billDetailDialog" width="80%"
         :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" top="10vh" v-dialog-drag>
-        <bill-detail :params="params" :billType="billType" :flag="1" @closeFun="closeBillDetail"
+        <bill-detail :dataList="dataList" :params="params" :billType="billType" :flag="1" @closeFun="closeBillDetail"
           @importProMent="importProMent">
         </bill-detail>
       </el-dialog>
@@ -880,7 +880,7 @@ export default {
     },
     getGSName(row) {
       this.form.belongCompany = row.cname
-      if (this.category == 2) {
+      // if (this.category == 2) {
         GYSGetBank(row.id).then(res => {
           this.$set(this.form, "bankList", res.data)
           // console.log(res.data)
@@ -891,7 +891,7 @@ export default {
             this.form.subjectNumber = this.form.bankList[0].subjectNumber
           }
         })
-      }
+      // }
     },
     cellStyle() {
       return "padding:0;height:40px;";

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -208,6 +208,7 @@
         top="10vh"
         v-dialog-drag>
         <bill-detail
+            :dataList="dataList"
           :params="params"
           :billType="billType"
           :flag="1"
@@ -986,7 +987,7 @@
       },
       getGSName(row) {
         this.form.belongCompany = row.cname
-        if (this.category == 2) {
+        // if (this.category == 2) {
           GYSGetBank(row.id).then(res =>{
             this.$set(this.form,"bankList",res.data)
             if (this.form.bankList.length > 0) {
@@ -996,7 +997,7 @@
               this.form.subjectNumber = this.form.bankList[0].subjectNumber
             }
           })
-        }
+        // }
       },
       cellStyle() {
         return "padding:0;height:40px;";