Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1,7 +1,6 @@
 <template>
   <dev>
     <el-card class="box-card">
-
       <el-form ref="userDataForm" :rules="rules" :model="formData" size="medium" label-width="100px">
         <div class="head">
           <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
@@ -71,13 +70,11 @@
           </el-col>
         </el-row>
       </el-form>
-
     </el-card>
 
 
 
     <el-card class="box-card">
-
       <el-form :model="formData" size="medium" label-width="100px">
         <el-row gutter="15">
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
@@ -446,6 +443,17 @@
                 <el-table-column prop="guaranteeNo" label="保函号码" width="180" />
                 <el-table-column prop="guaranteeDate" label="保函日期" width="180" />
                 <el-table-column prop="invoiceHeader" label="发票抬头" width="180" />
+                <el-table-column prop="uscc" label="税号" width="180" />
+                <el-table-column prop="address" label="地址" width="180" />
+                <el-table-column prop="attnName" label="联系人姓名" width="180" />
+                <el-table-column prop="attnTel" label="联系人电话" width="180" />
+                <el-table-column prop="email" label="电子邮箱" width="180" />
+                <el-table-column prop="taxpayerNature" label="纳税人性质" width="180" />
+                <el-table-column prop="taxRate" label="增值税税率" width="180" />
+                <el-table-column prop="invoiceType" label="发票类型" width="180" />
+                <el-table-column prop="accountBankCny" label="人民币账户银行" width="180" />
+                <el-table-column prop="accountBankUsd" label="美元账户银行" width="180" />
+                <el-table-column prop="accountNoUsd" label="美元银行账号" width="180" />
                 <el-table-column prop="version" label="版本" width="180" />
                 <el-table-column prop="status" label="状态" width="180">
                   <template slot-scope="scope">
@@ -454,6 +462,12 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="remarks" label="备注" width="180" />
+                <el-table-column fixed="right" label="操作" width="180">
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope)">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="不良记录" name="bljl">
@@ -485,10 +499,7 @@
       </el-form>
     </el-card>
 
-
-
-
-    <el-dialog title="窗口" :visible.sync="corpsAttnDialogVisible" :append-to-body="true" width="40%"
+    <el-dialog :title="dialogTitle" :visible.sync="corpsAttnDialogVisible" :append-to-body="true" width="40%"
       :before-close="handleClose">
 
       <el-form ref="corpsAttnForm" :rules="corpsAttnRules" :model="corpsAttnForm" label-width="120px">
@@ -612,6 +623,42 @@
           <el-form-item label="发票抬头" prop="invoiceHeader">
             <el-input v-model="corpsAttnForm.invoiceHeader"></el-input>
           </el-form-item>
+          <el-form-item label="税号" prop="uscc">
+            <el-input v-model="corpsAttnForm.uscc"></el-input>
+          </el-form-item>
+          <el-form-item label="地址" prop="address">
+            <el-input v-model="corpsAttnForm.address"></el-input>
+          </el-form-item>
+          <el-form-item label="联系人姓名" prop="attnName">
+            <el-input v-model="corpsAttnForm.attnName"></el-input>
+          </el-form-item>
+          <el-form-item label="联系人电话" prop="attnTel">
+            <el-input v-model="corpsAttnForm.attnTel"></el-input>
+          </el-form-item>
+          <el-form-item label="电子邮箱" prop="email">
+            <el-input v-model="corpsAttnForm.email"></el-input>
+          </el-form-item>
+          <el-form-item label="纳税人性质" prop="taxpayerNature">
+            <el-input v-model="corpsAttnForm.taxpayerNature"></el-input>
+          </el-form-item>
+          <el-form-item label="增值税税率" prop="taxRate">
+            <el-input v-model="corpsAttnForm.taxRate"></el-input>
+          </el-form-item>
+          <el-form-item label="发票类型" prop="invoiceType">
+            <el-input v-model="corpsAttnForm.invoiceType"></el-input>
+          </el-form-item>
+          <el-form-item label="人民币账户银行" prop="accountBankCny">
+            <el-input v-model="corpsAttnForm.accountBankCny"></el-input>
+          </el-form-item>
+          <el-form-item label="人民币银行账号" prop="accountNoCny">
+            <el-input v-model="corpsAttnForm.accountNoCny"></el-input>
+          </el-form-item>
+          <el-form-item label="美元账户银行" prop="accountBankUsd">
+            <el-input v-model="corpsAttnForm.accountBankUsd"></el-input>
+          </el-form-item>
+          <el-form-item label="美元银行账号" prop="accountNoUsd">
+            <el-input v-model="corpsAttnForm.accountNoUsd"></el-input>
+          </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="corpsAttnForm.status" placeholder="请选择状态" :style="{ width: '100%' }">
               <el-option label="正常" :value="0"></el-option>
@@ -628,6 +675,8 @@
         <el-button type="primary" @click="corpsAttnAddConfirm">确 定</el-button>
       </span>
     </el-dialog>
+
+
   </dev>
 </template>
 <script>
@@ -683,6 +732,7 @@ export default {
       enterpriseTypeDict: [],
       // 对话框
       // 客户联系人对话框
+      dialogTitle: '窗口',
       corpsAttnDialogVisible: false,
       corpsAttnDialogIndex: null,
       formData: {
@@ -937,6 +987,16 @@ export default {
     // 客户联系人新建
     corpsAttnAdd() {
       this.corpsAttnDialogVisible = true
+
+      if (this.activeName == 'khlxk') {
+        this.dialogTitle = "客户联系人"
+      } else if (this.activeName == 'yhxx') {
+        this.dialogTitle = "银行信息"
+      } else if (this.activeName == 'fj') {
+        this.dialogTitle = "附件"
+      } else if (this.activeName == 'fptt') {
+        this.dialogTitle = "发票抬头"
+      }
     },
     // 确认
     corpsAttnAddConfirm() {
@@ -1130,6 +1190,8 @@ export default {
 }
 
 .box-card {
-  width: 480px;
+  margin: 10px;
+  margin-bottom: 0;
+  box-shadow: 0 0 0 red;
 }
 </style>

src/views/iosBasicData/bcorps/index.vue

@@ -19,6 +19,7 @@
           </el-col>
           <el-col :span="19">
               <basic-container class="page-crad">
+                             <!-- :on-change="handleChange" -->
                   <avue-crud :option="option"
                              :table-loading="loading"
                              :data="data"
@@ -46,9 +47,17 @@
                                      size="small"
                                      icon="el-icon-delete"
                                      plain
-                                     v-if="permission.bcorps_delete"
                                      @click="handleDelete">删 除
                           </el-button> -->
+                            <el-button size="small" type="primary" @click="handleGet" >下载模版</el-button>
+                            <!-- <el-upload :action="'/api/blade-los/bcorps/importBCorps'" :auto-upload="false" :show-file-list="false" action="action">
+                              <el-button  size="small" type="primary">导入 excel</el-button>
+                            </el-upload> -->
+                            <el-upload class="upload-demo" :action="'/api/blade-los/bcorps/importBCorps'" :headers="headers" :show-file-list="false"
+                              :on-success="onSuccess" :on-error="onError"
+                            >
+                              <el-button size="small" type="primary">点击上传</el-button>
+                            </el-upload>
                       </template>
                       <template slot-scope="{ row, index }" slot="menu">
                           <el-button type="text" size="small" @click.stop="editOpen(row)">
@@ -97,8 +106,9 @@
 </template>
 
 <script>
+import { getToken } from "@/util/auth";
 import detailPage from "./detailsPage";
-  import {getBcorpsList, getBcorpsDetail, addBcorps, updateBcorps, removeBcorps} from "@/api/iosBasicData/bcorps";
+  import {getBcorpsList, getBcorpsDetail, addBcorps, updateBcorps, removeBcorps, downLoadBcorpsTemplate} from "@/api/iosBasicData/bcorps";
   import {mapGetters} from "vuex";
   import {bcorpstypedefineList} from "@/api/iosBasicData/bcorpstypedefine"
   import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue";
@@ -109,6 +119,7 @@ import detailPage from "./detailsPage";
   },
     data() {
       return {
+        headers: { "Blade-Auth": "Bearer " + getToken() },
           // 类别弹窗的开启
           corpTypeVisible:false,
           treeOption: {
@@ -146,12 +157,14 @@ import detailPage from "./detailsPage";
           height:'auto',
           calcHeight: 30,
           tip: false,
+          excelBtn:true,
           searchShow: true,
           searchMenuSpan: 24,
           border: true,
           index: true,
           viewBtn: true,
           selection: true,
+          addBtnText: '新建客户',
           dialogClickModal: false,
           column: [
             {
@@ -928,6 +941,32 @@ import detailPage from "./detailsPage";
           this.bcorpstypedefineListfun()
       },
     methods: {
+      // 导入
+      // handleChange(file, fileLis) {
+      //   console.log('daoru');
+      //   // this.$Export.xlsx(file.raw)
+      //   //   .then(data => {
+      //   //     this.data=data.results;
+      //   //   })
+      // },
+      // 下载模板
+      handleGet() {
+        window.open(
+          `/api/blade-los/bcorps/exportBCorps/template?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      },
+      // 上传成功
+      onSuccess(response, file, fileList) {
+        this.onLoad(this.page);
+      },
+      onError(err, file, fileList) {
+        err += ''
+        // console.log(JSON.stringify(err.match(/{(\S*)}/)[1]));
+        var data = err.match(/{(\S*)}/)[1]
+        this.$message.error(data.split("msg\":")[1]);
+      },
       // 左侧点击回调
         nodeClick(data){
             console.log(data,904)