1、人员管理-代理人管理新增推荐人；

2、财务管理-渠道数据导入匹配详情页面新增一些字段
3、财务管理-保司数据导入操作栏新增导出按钮

config/dev.env.js

@@ -5,7 +5,13 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"http://39.98.239.48/web-api"',
-  BASE_URL: '"http://192.168.0.111:8080/"' //测试服务器
+  // BASE_URL: '"http://39.98.239.48/web-api"',//测试服务器
+  // BASE_URL: '"http://192.168.0.111:8080/"' 
+  BASE_URL: '"http://192.168.0.14:8080/"' 
 
 })
+
+
+
+
+

src/http/moudules/cost.js

@@ -123,4 +123,11 @@ export const batchPay= (data) => {
         method: "post",
         data
     })
-}
+}
+export const exportBatchNum= (id) => {
+    return axios({
+        url: "/api/inv/insExternalBills/export/"+id,
+        method: "get",
+        responseType: 'blob'
+    })
+}

src/http/moudules/insCompany.js

@@ -208,6 +208,14 @@ export const updateagreement = (agreementId,data) => {
         data
     })
 }
+// 查系统字典
+export const dicType = (type) => {
+    return axios({
+        url: '/sysDict/dictDetails/'+type,
+        method: "get",
+
+    })
+}
 /** 归属模版模块 */
 //分页获取
     export const pagebelong = (data) => {
@@ -256,3 +264,4 @@ export const getPtlInsAttributionTemplate = (data) => {
     })
 }
 /** 归属模版模块 */
+

src/http/moudules/user.js

@@ -249,10 +249,10 @@ export const getApprovalPass= (id) => {
       method: 'get',
   })
 }
-//用户审核通过接口
-export const getApprovalNotPass= (params) => {
+//获取推荐人
+export const selectfindByreferrerId= (params) => {
   return axios({
-      url: '/user/approvalNotPass',
+      url: 'user/selectfindByreferrerId',
       method: 'get',
       params
   })

src/views/Esm/Esmcompany.vue

@@ -28,19 +28,25 @@
             background: '#F2F7FC',
             fontWeight: '900',
             color: '#606266',
-          }" size="small" @row-click="handleRowClick">
-          <el-table-column prop="name" label="部门管理"> </el-table-column>
-          <el-table-column prop="id" label="编号" width="180">
+          }" size="small"  @row-click="handleRowClick">
+          <el-table-column prop="name" label="供应商名称"> </el-table-column>
+          <el-table-column prop="id" label="编号" >
           </el-table-column>
-          <el-table-column prop="address" label="状态" width="180">
+          <el-table-column prop="address" label="保司类型">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.openQuote == '1'" type="primary">开启</el-tag>
               <el-tag v-if="scope.row.openQuote == '0' || scope.row.openQuote == null" type="success">关闭</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间">
-          </el-table-column>
-          <el-table-column label="操作" fixed="right" width="280">
+          <!-- <el-table-column prop="address" label="状态" width="180">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.openQuote == '1'" type="primary">开启</el-tag>
+              <el-tag v-if="scope.row.openQuote == '0' || scope.row.openQuote == null" type="success">关闭</el-tag>
+            </template>
+          </el-table-column> -->
+          <!-- <el-table-column prop="createTime" label="创建时间">
+          </el-table-column> -->
+          <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" size="mini" icon="el-icon-edit" @click="handleTableEdit(scope.row)">修改</el-button>
               <el-button type="text" size="mini" icon="el-icon-plus" @click="handleAddCompany(scope.row)">新增</el-button>
@@ -56,9 +62,10 @@
     <el-dialog v-dialogDrag :title="dialogTitle" :visible.sync="dialogVisible" width="900px" @close="closeVisible"
       :close-on-click-modal="false">
       <el-form :model="dataForm" :rules="rules" ref="dataForm" label-width="120px" size="small">
-        <el-row v-if="operType == 'ADD2'">
-          <el-form-item label="选择公司地区">
-            <el-cascader size="small" v-model="area" :options="areaList" :props="optionProps"
+        <el-row >
+          <el-col :span="8" v-if="operType == 'ADD2'">
+            <el-form-item label="选择公司地区" prop="area">
+            <el-cascader size="small" v-model="dataForm.area" :options="areaList" :props="optionProps"
               @change="areaHandleChange"></el-cascader>
             <!-- <el-cascader
               size="small"
@@ -70,27 +77,40 @@
               clearable
             ></el-cascader> -->
           </el-form-item>
+        </el-col>
+          <el-col :span="8">
+            <el-form-item label="保司类型" prop="type">
+              <el-select v-model="dataForm.type" placeholder="请选择供应商类型">
+                <el-option
+                  v-for="item in typeOptions"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictValue">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="保险公司编码" prop="id">
+            <el-form-item label="供应商编码" prop="id">
               <el-input v-model="dataForm.id" :disabled="!(operType == 'ADD1')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="保险公司名称" prop="name">
+            <el-form-item label="供应商名称" prop="name">
               <el-input v-model="dataForm.name"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="dataForm.parentId != '0'">
-            <el-form-item label="上级保险公司" prop="parentId">
+            <el-form-item label="上级供应商" prop="parentId">
               <el-input v-model="dataForm.parentId" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="保险公司简称" prop="namesimple">
+            <el-form-item label="供应商简称" prop="namesimple">
               <el-input v-model="dataForm.namesimple"></el-input>
             </el-form-item>
           </el-col>
@@ -125,14 +145,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="报价开关">
               <el-switch v-model="value" @change="companyChange" active-color="#13ce66">
               </el-switch>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" style="width: 100%">
@@ -215,12 +235,13 @@ export default {
           },
         },
       },
+      typeOptions:[],
       columns: [
-        { prop: "id", label: "保险公司编码", minWidth: 80, sortable: false },
-        { prop: "name", label: "保险公司名称", minWidth: 80, sortable: false },
+        { prop: "id", label: "供应商编码", minWidth: 80, sortable: false },
+        { prop: "name", label: "供应商名称", minWidth: 80, sortable: false },
         {
           prop: "namesimple",
-          label: "保险公司简称",
+          label: "供应商简称",
           minWidth: 80,
           sortable: false,
         },
@@ -247,7 +268,7 @@ export default {
         id: [
           {
             required: true,
-            message: "请选择地区生成保险公司编码",
+            message: "请选择地区生成供应商编码",
             trigger: "blur",
           },
           {
@@ -256,11 +277,14 @@ export default {
             trigger: "blur",
           },
         ],
+        area: [
+          { required: true, message: "请选择供应商名称", trigger: "change" },
+        ],
         name: [
-          { required: true, message: "请输入保险公司名称", trigger: "blur" },
+          { required: true, message: "请输入供应商名称", trigger: "blur" },
         ],
         namesimple: [
-          { required: true, message: "请输入保险公司简称", trigger: "blur" },
+          { required: true, message: "请输入供应商简称", trigger: "blur" },
         ],
       },
 
@@ -404,15 +428,19 @@ export default {
 
     handleAddType() {
       // 添加保险总公司
-      this.operType = "ADD2";
+      this.operType = "ADD3";
       this.dialogTitle = "新增保险总公司";
       this.dataForm.parentId = "0";
       this.dialogVisible = true;
       this.imgList1 = [];
       this.uploadDisabled = false;
+      this.$api.insCompany.dicType("supplierTypeEnum").then(res=>{
+        if(res.code==200){
+          this.typeOptions=res.data.ddList
+        }
+      })
     },
     handleAddCompany(row) {
-      console.log(row);
       this.operType = "ADD2";
       this.dialogTitle = "新增保险分公司";
       this.dataForm.parentId = row.id;
@@ -490,9 +518,10 @@ export default {
     },
     //提交确认
     submitForm(formName) {
+      console.log(this.dataForm,1111111 )
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.operType == "ADD1" || this.operType == "ADD2") {
+          if (this.operType == "ADD1" || this.operType == "ADD2" || this.operType == "ADD3") {
             if (this.operType == "ADD1") {
               if (this.dataForm.id.length != 6) {
                 return this.$message({
@@ -544,7 +573,6 @@ export default {
     //     .catch((_) => {});
     // },
     closeVisible() {
-      this.area = "";
       this.$refs.dataForm.resetFields();
       for (let key in this.dataForm) {
         this.dataForm[key] = "";

src/views/FinancialManagement/CostVerification/Baosi.vue

@@ -36,13 +36,14 @@
         </template>
       </el-table-column>
       
-      <template slot="operate" slot-scope="scope"> 
+      <template slot="operate" slot-scope="scope" > 
         <el-button
             v-if="scope.row.importStatus == 1"
             size="mini"
             type="primary"
             @click="modifyFun(scope.row)"
           >修改</el-button>
+        
           <div style="display: inline-block;">
             <el-upload
               class="upload"
@@ -66,7 +67,11 @@
             type="primary"
             @click="deleteFun(scope.row)"
           >删除</el-button>
-         
+          <el-button
+            size="mini"
+            type="primary"
+            @click="exportNum(scope.row)"
+          >导出</el-button>
     </template>
     </templateTable>
     <el-dialog
@@ -290,7 +295,8 @@ export default {
         ],
         loading:true,
         operateShow:true,
-        isPaginationShow:true
+        isPaginationShow:true,
+        operationWidth:'150'
         // optBtns:[
         //   {
         //     type:'primary',
@@ -313,7 +319,8 @@ export default {
       {
         name:'标准模板导入',
         click: () => {return this.standardImportFun()}
-      }],
+      },
+     ],
       InsCompanyList: [],
       queryFrom: {
         pageNum: 1,
@@ -391,6 +398,7 @@ export default {
         }
       });
     },
+    // 删除
     deleteFun(row) {
       this.$confirm("确认删除？")
         .then(() => {
@@ -570,6 +578,27 @@ export default {
           this.$message.error(res.msg);
         }
       });
+  },
+  async exportNum(row){
+    window.open("http://192.168.0.111:8080/api/inv/insExternalBills/export/"+row.id)
+    // let res = await this.$api.cost.exportBatchNum(row.id);
+    //   const blob = new Blob([res.data]);
+    //   const fileName = "测试.xlsx";
+    //   if ("download" in document.createElement("a")) {
+    //     // 非IE下载
+    //     const elink = document.createElement("a");
+    //     elink.download = fileName;
+    //     elink.style.display = "none";
+    //     elink.href = URL.createObjectURL(blob);
+    //     document.body.appendChild(elink);
+    //     elink.click();
+    //     URL.revokeObjectURL(elink.href); // 释放URL 对象
+    //     document.body.removeChild(elink);
+    //   } else {
+    //     // IE10+下载
+    //     navigator.msSaveBlob(blob, fileName);
+    //   }
+    
   }
 }
 };

src/views/FinancialManagement/CostVerification/Channel.vue

@@ -360,7 +360,7 @@
     </el-dialog>
     <el-dialog
       v-dialogDrag
-      title="详情修改"
+      title="详情匹配"
       :visible.sync="dialogBVatchUpdata"
       width="55%"
       @close="closdialogBVatceVisible"
@@ -420,6 +420,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商业费用（保司）：">
+              <el-input :disabled="true" v-model="mateform.cipCost2" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="商业费用（渠道）：">
+              <el-input v-model="mateform.cipCost1" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="交强费用（保司）：">
+              <el-input :disabled="true" v-model="mateform.mliftaCost2" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="交强费用（渠道）：">
+              <el-input v-model="mateform.mliftaCost1" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="车船税费用（保司）：">
+              <el-input :disabled="true" v-model="mateform.vavtCost2" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="车船税费用（渠道）：">
+              <el-input v-model="mateform.vavtCost1" size="small"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogBVatchUpdata = false">取消修改</el-button>

src/views/PeopleManage/Agent/AgentManage.vue

@@ -163,8 +163,19 @@
             </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="推荐人" prop="referrerId">
+              <el-select
+              style="width:200px"
+                v-model="formData.referrerId"
+                placeholder="请选择"
+              >
+              <el-option v-for="val in recommenderOptions" :label="val.name" :value="val.id" :key="val.id"></el-option>
+            </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
-      </el-form>
+      </el-form>  
       <span slot="footer" class="dialog-footer" >
         <el-button
           size="small"
@@ -264,6 +275,7 @@ export default {
           }
         ]
       },
+      recommenderOptions:[],
       pageData:{
         pageNum: 1,
         pageSize: 10,
@@ -409,9 +421,12 @@ export default {
     },
     //联级选择器触发事件
     handleChange(val) {
-      this.formData.deptId=val
       if (val&&val.length !== 0) {
         this.formData.deptId = val.at(-1);
+        this.formData.referrerId=''
+        this.$api.user.selectfindByreferrerId({deptId:this.formData.deptId }).then((res) => {
+          this.recommenderOptions=res.data
+        });
       }
      
     },
@@ -447,18 +462,22 @@ export default {
       this.findPage(data)
     },
     handleTableEdit(params) {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.option = res.data;
-      });
       this.$api.user.getUserDatail(params.userId).then((result) => {
         if(result.code==200){
+          this.$api.dept.findDeptTree().then((res) => {
+            this.option = res.data;
+          });
             result.data.status+=''
           this.formData=result.data
           this.formData.password=''
+          this.dialogTitle = "编辑代理人";
+          this.dialogVisible = true;
+        }
+        else{
+          this.$message.error(result.msg);
         }
       })
-      this.dialogTitle = "编辑代理人";
-      this.dialogVisible = true;
+     
     },
     // 删除单个人员
     handleTableDeleteFlag(data) {
@@ -472,6 +491,9 @@ export default {
               });
               this.findPage();
             }
+            else{
+              this.$message.error(res.msg);
+        }
           });
         })
         .catch(() => {});
@@ -482,6 +504,9 @@ export default {
       this.$api.dept.findDeptTree().then((res) => {
         this.option = res.data;
       });
+      this.$api.user.selectfindByreferrerId({deptId:this.deptId}).then((res) => {
+        this.recommenderOptions=res.data
+      });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
@@ -507,7 +532,6 @@ export default {
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
-      var that = this;
       this.$confirm("确认关闭？")
         .then((_) => {
           done();
@@ -541,11 +565,14 @@ export default {
             .then(() => {
               // this.formData.deptIdCom= this.formData.deptId 
               // this.formData.deptId =  this.formData.deptId.at(-1);
+              if(this.formData.referrerId){
+                this.formData.referrerName =this.recommenderOptions.find(val=>this.formData.referrerId==val.id).name
+              }
               this.$api.user.saveOrUpdate(this.formData).then((res) => {
-                if (res.code == 200) {
+                if (res.code == 200) {  
                   this.$message({
                     message: "操作成功",
-                    type: "success",
+                    type: "success", 
                   });
                   this.dialogVisible = false;
                   this.$refs["formData"].resetFields();
@@ -558,13 +585,14 @@ export default {
                 }
               });
             })
-            .catch(() => {
-              this.$message({
-                type: "info",
-                message: "已取消提交",
-              });
-            });
+         
         } 
+        else{
+            this.$message({
+              type: "info",
+              message: "已取消提交",
+            });
+        }
       });
     },
   },