Browse Source

修改bug

wangzhuo 1 year ago
parent
commit
d0727ec5eb
2 changed files with 134 additions and 21 deletions
  1. 25 8
      src/views/iosBasicData/bcorps/detailsPage.vue
  2. 109 13
      src/views/iosBasicData/bcorps/index.vue

+ 25 - 8
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -51,8 +51,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="英文名称" prop="enName">
-              <el-input v-model="formData.enName" placeholder="请输入英文名称" clearable :style="{ width: '100%' }">
+            <el-form-item label="信用代码" prop="enName">
+              <el-input v-model="formData.uscc" placeholder="请输入统一社会信用代码" clearable :style="{ width: '100%' }">
               </el-input>
             </el-form-item>
           </el-col>
@@ -63,12 +63,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <!-- <el-form-item label="英文地址" prop="enAddr">
+              <el-input v-model="formData.enAddr" placeholder="请输入英文地址" clearable :style="{ width: '100%' }">
+              </el-input>
+            </el-form-item> -->
+          </el-col>
+        </el-row>
+
+        <el-row gutter="15">
+          <el-col :span="8">
+            <el-form-item label="英文名称" prop="enName">
+              <el-input v-model="formData.enName" placeholder="请输入英文名称" clearable :style="{ width: '100%' }">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="英文地址" prop="enAddr">
               <el-input v-model="formData.enAddr" placeholder="请输入英文地址" clearable :style="{ width: '100%' }">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
+
+
       </el-form>
     </el-card>
 
@@ -187,7 +204,7 @@
               <el-col :span="8">
                 <el-form-item label="PS规则" prop="psRate">
                   <!-- <el-input v-model="formData.psRate" placeholder="请输入PS规则" clearable :style="{ width: '100%' }"> -->
-                  <el-input-number v-model="corpsAttnForm.sort" controls-position="right" @change="handleChange" :min="0"
+                  <el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"
                     :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>
                   </el-input>
                 </el-form-item>
@@ -513,6 +530,9 @@
           <el-form-item label="联系方式" prop="attn">
             <el-input v-model="corpsAttnForm.attn"></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="tel">
             <el-input v-model="corpsAttnForm.tel"></el-input>
           </el-form-item>
@@ -522,22 +542,19 @@
           <el-form-item label="公司地址" prop="addr">
             <el-input v-model="corpsAttnForm.addr"></el-input>
           </el-form-item>
-          <el-form-item label="用户" prop="userId">
+          <!-- <el-form-item label="用户" prop="userId">
             <search-query ref="SearchQuery" :datalist="userOptions" title="用户" :filterable="true" :clearable="true"
               :remote="true" :forParameter="{ key: 'id', label: 'realName', value: 'id', disabled: 'workingStatus' }"
               :disabledStatus="1" @remoteMethod="userListfun" @corpChange="userChange">
               <user></user>
             </search-query>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="性别" prop="sex">
             <el-select v-model="corpsAttnForm.sex" placeholder="请选择性别" :style="{ width: '100%' }">
               <el-option label="男" value="男"></el-option>
               <el-option label="女" value="女"></el-option>
             </el-select>
           </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="status">
             <el-select v-model="corpsAttnForm.status" placeholder="请选择状态" :style="{ width: '100%' }">
               <el-option label="正常" :value="0"></el-option>

+ 109 - 13
src/views/iosBasicData/bcorps/index.vue

@@ -21,21 +21,50 @@
         <basic-container class="page-crad">
           <!-- :on-change="handleChange" -->
           <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            id="out-table" :header-cell-class-name="headerClassName" :before-open="beforeOpen" v-model="form" ref="crud"
-            @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
-            @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-            @size-change="sizeChange" @refresh-change="refreshChange"
+            id="out-table" :header-cell-class-name="headerClassName" :search.sync="search" :before-open="beforeOpen"
+            v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
+            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 304)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 304)" @on-load="onLoad">
-            <template slot="menuLeft">
 
-              <el-button type="primary" size="small" icon="el-icon-bottom" @click="excelBox = true">导入
+
+
+            <template slot="code" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.code" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+            <template slot="uscc" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.uscc" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+            <template slot="cnName" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.cnName" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+            <template slot="enName" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.enName" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+            <template slot="cnAddr" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.cnAddr" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+            <template slot="enAddr" slot-scope="scope">
+              <avue-text-ellipsis :text="scope.row.enAddr" :height="30" use-tooltip placement="top">
+                <small slot="more">...</small>
+              </avue-text-ellipsis>
+            </template>
+
+            <template slot="menuLeft">
+              <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
               </el-button>
-              <!-- <el-button size="small" type="primary" @click="handleGet" >下载模版</el-button>
-                            <el-upload style="display: flex;" :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> -->
+              <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
             </template>
             <template slot-scope="{ row, index }" slot="menu">
               <el-button type="text" size="small" @click.stop="editOpen(row)">
@@ -117,6 +146,7 @@ export default {
         }
       },
       excelForm: {},
+      search: {},
       excelLoading: false,
       excelOption: {
         submitBtn: false,
@@ -405,7 +435,7 @@ export default {
           },
           {
             label: "客户类型",
-            prop: "corpType",
+            prop: "corpTypeName",
             rules: [{
               required: true,
               message: "请输入客户类型",
@@ -954,6 +984,69 @@ export default {
     //   //     this.data=data.results;
     //   //   })
     // },
+    // 导出
+    handleExport() {
+      // let params = { ...this.search }
+      // let queryParams = Object.assign({}, params, {
+      //   corpsTypeId: this.treeDeptId,
+      //   corpType: customerParameter.code
+      // });
+      // console.log(this.website.tokenHeader)
+
+      var condition = ''
+
+      for (const key in this.search) {
+        var value = this.search[key]
+        if (value) {
+          condition += `&${key}=${this.search[key]}`
+        }
+      }
+
+      console.log(condition);
+
+      this.$confirm('是否导出客户资料?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+          `/api/blade-los/bcorps/exportBCorps?${this.website.tokenHeader
+          }=${getToken()}${condition}`
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
+        });
+      })
+
+      // queryParams.code = queryParams.code ? queryParams.code : ''
+      // queryParams.cname = queryParams.cname ? queryParams.cname : ''
+      // queryParams.belongtoarea = queryParams.belongtoarea ? queryParams.belongtoarea : ''
+      // queryParams.belongtocompany = queryParams.belongtocompany ? queryParams.belongtocompany : ''
+      // queryParams.attn = queryParams.attn ? queryParams.attn : ''
+      // queryParams.goodtypes = queryParams.goodtypes ? queryParams.goodtypes : ''
+      // queryParams.creditLevel = queryParams.creditLevel ? queryParams.creditLevel : ''
+      // queryParams.adminProfiles = queryParams.adminProfiles ? queryParams.adminProfiles : ''
+      // queryParams.corpsTypeId = queryParams.corpsTypeId ? queryParams.corpsTypeId : ''
+      // console.log(queryParams)
+
+      // this.$confirm('是否导出客户资料?', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   window.open(
+      //     `/api/blade-los/bcorps/exportBCorps?${this.website.tokenHeader
+      //     }=${getToken()}&code=${queryParams.code}&cname=${queryParams.cname}&belongtoarea=${queryParams.belongtoarea}&belongtocompany=${queryParams.belongtocompany}&attn=${queryParams.attn}&goodtypes=${queryParams.goodtypes}&creditLevel=${queryParams.creditLevel}&adminProfiles=${queryParams.adminProfiles}&corpsTypeId=${queryParams.corpsTypeId}&corpType=KH`
+      //   );
+      // }).catch(() => {
+      //   this.$message({
+      //     type: 'info',
+      //     message: '已取消' //
+      //   });
+      // })
+    },
     // 下载模板
     handleGet() {
       window.open(
@@ -981,7 +1074,10 @@ export default {
     },
     // 左侧点击回调
     nodeClick(data) {
-      console.log(data, 904)
+      var reqiestData = this.search;
+      // // console.log(data, 904)
+      reqiestData.corpType = data.id
+      this.onLoad(this.page, reqiestData);
     },
     // 获取客户类别
     bcorpstypedefineListfun() {