Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"', //凯森
   // BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
@@ -18,7 +18,7 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http://192.168.0.250:8080/"',//
   // BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
   // BASE_URL: '"http://192.168.0.52:8080/"',//贺礼霄
-  // BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
+  BASE_URL: '"http:///192.168.0.55:8080/"',// 董鑫
   CONSOLE_BASE_URL: '"http://localhost:8080/"', //控制台测试服务器
   // CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台正式服务器
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址

src/assets/css/common.css

@@ -124,9 +124,9 @@
 
 .el-button--primary,
 .el-button--primary:focus {
-  background-color: var(--themeColor) !important;
+  background-color: var(--themeColor) ;
   color: #fff;
-  border-color: var(--themeColor) !important;
+  border-color: var(--themeColor) ;
 }
 
 .el-button--primary.is-plain {
@@ -141,13 +141,7 @@
   border-color: var(--themeColorHover);
 }
 
-.el-button--primary.is-plain:hover,
-.el-button--primary.is-disabled,
-.el-button--primary.is-disabled:hover {
-  background-color: #D2D2D2;
-  color: var(--themeColor);
-  border-color: #D2D2D2;
-}
+
 
 .el-tabs__active-bar,
 .el-date-table td.start-date span,
@@ -220,7 +214,13 @@
 .el-button--primary.is-plain:focus {
   background-color: #C8CDD9;
 }
-
+.el-button--primary.is-plain:hover,
+.el-button--primary.is-disabled,
+.el-button--primary.is-disabled:hover {
+  background-color: #D2D2D2;
+  color: var(--themeColor);
+  border-color: #D2D2D2;
+}
 .themeColor {
   color: var(--themeColor);
 }

src/components/Form/retrievalForm.vue

@@ -135,11 +135,11 @@ export default {
   },
   created() {
     this.fields.forEach((field) => {
-      if(this.dateType!="3"){
+      if(this.dateType=="1"){
         if (field.label === "报价时间" && !this.formData[field.list]) {
           this.$set(this.formData, field.list, [
-          '',
-            '',
+            this.currentDate,
+            this.currentDate,
           ]);
           this.$set(this.formData, field.name[0], '');
           this.$set(this.formData, field.name[1], '');
@@ -152,7 +152,7 @@ export default {
           this.$set(this.formData, field.name[0], '');
           this.$set(this.formData, field.name[1], '');
         }
-      }else{
+      }else if(this.dateType=="3"){
         if (field.label === "报价时间" && !this.formData[field.list]) {
           this.$set(this.formData, field.list, [
             '',

src/http/moudules/sys.js

@@ -374,4 +374,11 @@ export const sysChannelCostAudit = (data) => {
         method: 'post',
         data
     })
+}
+export const sysChannelCostSettle = (data) => {
+    return axios({
+        url: '/sysChannelCost/settle/',
+        method: 'post',
+        data
+    })
 }

src/http/moudules/task.js

@@ -98,7 +98,7 @@ export const savePolicy = (data) => {
 //待核保/核保退回原因查看接口
 export const viewReason = (subNoOrder) => {
   return axios({
-    url: '/insurance/underwriting/cause/'+subNoOrder,
+    url: '/insurance/underwriting/cause/' + subNoOrder,
     method: 'get',
   })
 }
@@ -1068,9 +1068,9 @@ export const findPtlAgreementList = () => {
   })
 }
 // 后线人员协议配置-编辑回显协议列表
-export const findPtlAgreementListNew = () => {
+export const findPtlAgreementListNew = (data) => {
   return axios({
-    url: "/sysUserLinkPtlAgreement/findPtlAgreementListNew",
+    url: "/sysUserLinkPtlAgreement/findPtlAgreementListNew?type=" + data.type,
     method: "get",
   })
 }

src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -84,7 +84,7 @@
                     >
                     <el-button
                       size="small"
-                      type="primary"
+                      :type="selectIds.length < 1 ? 'danger' : 'primary'"
                       @click="batchOperation"
                       :disabled="selectIds.length < 1"
                       >批量设置</el-button
@@ -111,9 +111,6 @@
             :select="true"
             @selectionChange="selectionChange"
           >
-            <template slot="scope">
-              {{ 123 }}
-            </template>
           </kt-common-table>
         </SplitArea>
         <!-- 右侧列表页面End -->
@@ -840,19 +837,24 @@ export default {
     handleTableBatchDelete(data) {},
     // 删除单个人员
     handleTableDeleteFlag(data) {
-      this.$api.retail.retailIdDelete(data.row.id).then((res) => {
-        if (res.code == "200") {
-          this.findPage();
-          this.$message({
-            type: "success",
-            message: res.msg,
-          });
-        } else {
-          this.$message({
-            type: "error",
-            message: res.msg,
-          });
-        }
+      console.log(data);
+      this.$confirm("确认删除该条数据吗?", "提示", {
+        type: "warning",
+      }).then(() => {
+        this.$api.retail.retailIdDelete(data.row.id).then((res) => {
+          if (res.code == "200") {
+            this.findPage();
+            this.$message({
+              type: "success",
+              message: res.msg,
+            });
+          } else {
+            this.$message({
+              type: "error",
+              message: res.msg,
+            });
+          }
+        });
       });
     },
     // 右侧列表的方法End

src/views/FinancialManagement/AddInvestment.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
         <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-            @getList="getList" :btnGroup="btnGroup" @handleSearchList="handleSearchList" :pagination="page">
+            @selectionChange="selectionChange" @getList="getList" :btnGroup="btnGroup" @handleSearchList="handleSearchList"
+            :pagination="page">
         </templateTable>
         <el-dialog title="编辑" width="60%" :visible.sync="dialogVisibleadd">
             <templateForm ref="templateForm" :ruleForm="ruleForm" :formData="formData" :inline="false" :rules="rules"
@@ -11,6 +12,19 @@
                 <el-button type="primary" size="small" @click="sumbit">确 定</el-button>
             </span>
         </el-dialog>
+        <el-dialog :visible.sync="dialogVisibleradio" width="30%">
+            <el-upload style="margin-bottom: 10px" class="upload-demo" action="#" :limit="1" accept=".png, .jpg, .jpeg"
+                :auto-upload="false" :on-change="drivingupload" :show-file-list="false" list-type="picture-card"
+                ref="upload1">
+                <img v-if="imageUrl" :src="imageUrl" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <div slot="tip" class="el-upload__tip">请上传凭证</div>
+            </el-upload>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="small" @click="dialogVisibleradio = false">取消</el-button>
+                <el-button size="small" type="primary" @click="settlement">确定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -22,6 +36,9 @@ export default {
     components: { templateTable, templateForm },
     data() {
         return {
+            imageUrl: '',
+            dialogVisibleradio: false,
+            selectionList: [],
             formData: {},
             dialogVisible: false,
             dialogVisibleadd: false,
@@ -42,6 +59,13 @@ export default {
                 {
                     name: '导出',
                     click: () => this.export()
+                },
+                {
+                    name: '批量结算',
+                        disabled:()=>{
+                            return this.selectionList.length==0
+                        },
+                    click: () => this.batch()
                 }
             ],
             formList: [
@@ -156,6 +180,21 @@ export default {
                         label: "渠道名称",
                         type: "text"
                     },
+                    {
+                        prop: "settleStatus",
+                        label: "结算状态",
+                        type: "statMap",
+                        options: [
+                            {
+                                label: '未结算',
+                                value: '0'
+                            },
+                            {
+                                label: '已结算',
+                                value: '1'
+                            }
+                        ]
+                    },
                     {
                         prop: "leaderName",
                         label: "维护人员",
@@ -331,6 +370,7 @@ export default {
                 loading: true,
                 isPaginationShow: true,
                 operationWidth: 300,
+                isCheckBox: true,
                 optBtns: [
                     {
                         type: "primary",
@@ -339,16 +379,16 @@ export default {
                             return this.handleTableUpload(row);
                         },
                     },
-                    {
-                        type: "primary",
-                        label: "审核通过",
-                        hide: (row) => {
-                            return !row.status
-                        },
-                        click: (row, index) => {
-                            return this.handleTableAudit(row);
-                        },
-                    },
+                    // {
+                    //     type: "primary",
+                    //     label: "审核通过",
+                    //     hide: (row) => {
+                    //         return !row.status
+                    //     },
+                    //     click: (row, index) => {
+                    //         return this.handleTableAudit(row);
+                    //     },
+                    // },
                     {
                         type: "primary",
                         label: "删除",
@@ -359,7 +399,8 @@ export default {
 
                 ],
             },
-            seachData: {}
+            seachData: {},
+            voucherNumber: ''
         };
     },
     created() {
@@ -367,6 +408,56 @@ export default {
 
     },
     methods: {
+        selectionChange(val, ref) {
+            if (val.length!==0) {
+                if (val.find(e=>e.settleStatus == 0) ) {
+                    this.selectionList = val;
+                }
+                else {
+                    this.$message({
+                        message: '请选择未结算的数据',
+                        type: 'warning'
+                    });
+                }
+            }
+
+        },
+        drivingupload(file, fileList) {
+            this.$refs.upload1.clearFiles();
+            let file1 = file.raw;
+            let files = window.URL.createObjectURL(file1); //转临时路径
+            this.imageUrl = files;
+            const params = new FormData(); // 声明formData数据类型
+            params.append("multipartFile", file1);
+            params.append("type", "image");
+            this.$api.letter.uploadFile(params).then((res) => {
+                if (res.code == "200") {
+                    this.voucherNumber = res.data.id
+                } else {
+                    this.$message.error(res.msg);
+                }
+            });
+        },
+        settlement() {
+            this.$api.sys
+                .sysChannelCostSettle({
+                    voucherNumber: this.voucherNumber,
+                    ids: this.selectionList.map((val) => val.id),
+                })
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.$message({
+                            message: res.msg || "保存成功",
+                            type: "success",
+                        });
+                        this.getList();
+                        this.dialogVisibleradio = false
+                        this.selectionList = [];
+                    } else {
+                        this.$message.error(res.msg);
+                    }
+                });
+        },
         jqCostsProportionFun(val) {
             this.formData.jqJtPremium = (Number(val) * Number(this.formData.jqPremium)).toFixed(2)
         },
@@ -407,6 +498,11 @@ export default {
                     }
                 });
         },
+        batch() {
+            this.dialogVisibleradio = true
+            this.imageUrl = '';
+            this.voucherNumber=''
+        },
         // 查询
         handleSearchList(data) {
             this.seachData = data
@@ -491,4 +587,14 @@ export default {
     }
 };
 </script>
-<style lang="scss" scoped></style>
+<style scoped>
+.upload-demo {
+    display: inline-block;
+    margin-left: 5px;
+}
+
+.avatar {
+    width: 100%;
+    height: 100%;
+}
+</style>

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -329,7 +329,9 @@
         <el-table-column prop="syOtherCostsPremium" label="商业跟单金额">
         </el-table-column>
       </el-table>
-      <footer style="margin-top: 15px;display: flex;justify-content: flex-end;">
+      <footer
+        style="margin-top: 15px; display: flex; justify-content: flex-end"
+      >
         <el-button type="primary" @click="confrimBatch">确认</el-button>
       </footer>
     </el-dialog>
@@ -986,7 +988,7 @@ export default {
         });
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew().then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },
@@ -1158,15 +1160,16 @@ export default {
       this.tableDataRadio = {};
       this.fileListRadio = [];
     },
-    confrimBatch(){
-      this.$api.task.batchOperation({resultList:this.tableDataRadio.resultList}).then((res) => {
-        if (res.code == 200) {
-          this.$message.success('操作成功')
+    confrimBatch() {
+      this.$api.task
+        .batchOperation({ resultList: this.tableDataRadio.resultList })
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("操作成功");
 
-          this.dialogVisibleradio = false;
-          
-        } 
-      });
+            this.dialogVisibleradio = false;
+          }
+        });
     },
     drivinguploadRadio(file, fileList) {
       this.fileListRadio = [];

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -152,6 +152,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -397,6 +414,23 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataAdd.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -977,12 +1011,18 @@ export default {
         ],
       },
       dockingPersonOption: [],
+      addTypeList: [],
     };
   },
   created() {
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
+    this.$api.dict.findByLableName("add_type").then((res) => {
+      if (res.code === 200) {
+        this.addTypeList = res.data;
+      }
+    });
     this.findPage();
     this.getDicType("productsType"); //险种类型
     this.getDicType("agreementType"); //险种类型
@@ -1021,7 +1061,7 @@ export default {
   },
   methods: {
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew().then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -322,6 +322,23 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataAdd.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -396,6 +413,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataEdit.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -892,12 +926,18 @@ export default {
       dialogVisibleprogress: false,
       dialogVisibleEdit: false,
       formDataEdit: {},
+      addTypeList: [],
     };
   },
   created() {
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
+    this.$api.dict.findByLableName("add_type").then((res) => {
+      if (res.code === 200) {
+        this.addTypeList = res.data;
+      }
+    });
     this.getDicType("productsType"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");
@@ -933,6 +973,7 @@ export default {
         noSuperviseCostsPremiums: row.noSuperviseCostsPremiums,
         id: row.id,
         agreementId: row.agreementId,
+        addType: row.addType,
       };
       this.dialogVisibleEdit = true;
     },
@@ -976,7 +1017,7 @@ export default {
         });
     },
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew().then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "2" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -123,13 +123,180 @@
       width="55%"
       :before-close="handleClose"
     >
-      <el-form ref="form" :model="formDataList" label-width="130px">
+      <el-form
+        ref="form"
+        :model="formDataList"
+        label-width="130px"
+        :rules="rulesAdd"
+      >
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="签单日期" prop="signDate">
+              <el-date-picker
+                v-model="formDataList.signDate"
+                type="date"
+                placeholder="选择日期"
+                size="small"
+                value-format="yyyy-MM-dd"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车牌号" prop="licenseno">
+              <el-input
+                v-model="formDataList.licenseno"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="被保险人">
+              <el-input
+                v-model="formDataList.insuredName"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="险种">
+              <el-select
+                v-model="formDataList.riskcode"
+                placeholder="选择险种"
+                size="small"
+              >
+                <el-option
+                  v-for="item in riskcodeList"
+                  :key="item.dictValue"
+                  :label="item.dictTag"
+                  :value="item.dictTag"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保司机构">
+              <el-cascader
+                ref="partnerCompaniesCascader"
+                @change="partnerCompaniesFun"
+                v-model="formDataList.partnerCompaniesId"
+                size="small"
+                :show-all-levels="false"
+                ize="small"
+                :options="ztreeNodes"
+                :props="optionProps"
+                clearable
+                filterable
+              ></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="保险公司" prop="companyId">
+              <el-select
+                v-model="formDataList.companyId"
+                placeholder="选择保险公司"
+                size="small"
+                filterable
+              >
+                <el-option
+                  v-for="(item, index) in InsCompanyList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="协议选择">
+              <el-select
+                size="small"
+                v-model="formDataList.agreementId"
+                placeholder="请选择协议类型"
+                style="width: 100%"
+                filterable
+              >
+                <el-option
+                  v-for="item in agreementTypeoptions"
+                  :key="item.dictValue"
+                  :label="item.agreementName"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交强保单号" prop="policyno">
+              <el-input
+                v-model="formDataList.policyno"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业保单号" prop="syPolicyno">
+              <el-input
+                v-model="formDataList.syPolicyno"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保单号" prop="noPolicyno">
+              <el-input
+                v-model="formDataList.noPolicyno"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="交强保费">
+              <el-input
+                v-model="formDataList.jqPremium"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业保费">
+              <el-input
+                v-model="formDataList.syPremium"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车船税">
+              <el-input
+                v-model="formDataList.taxamount"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车保费">
+              <el-input
+                v-model="formDataList.noPremium"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="交强手续费比例">
               <el-input
                 v-model="formDataList.jqSuperviseCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -138,6 +305,7 @@
               <el-input
                 v-model="formDataList.sySuperviseCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -146,14 +314,17 @@
               <el-input
                 v-model="formDataList.noSuperviseCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="交强跟单比例">
               <el-input
                 v-model="formDataList.jqOtherCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -162,6 +333,7 @@
               <el-input
                 v-model="formDataList.syOtherCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -170,43 +342,84 @@
               <el-input
                 v-model="formDataList.noOtherCostsProportion"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="协议选择">
-              <el-select
+            <el-form-item label="交强应收比例">
+              <el-input
+                v-model="formDataList.jqReceivableProportion"
+                class="inputType"
                 size="small"
-                v-model="formDataList.agreementId"
-                placeholder="请选择协议类型"
-                style="width: 100%"
-                filterable
-              >
-                <el-option
-                  v-for="item in agreementTypeoptions"
-                  :key="item.dictValue"
-                  :label="item.agreementName"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="手续费金额">
+            <el-form-item label="商业应收比例">
+              <el-input
+                v-model="formDataList.syReceivableProportion"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车应收比例">
+              <el-input
+                v-model="formDataList.noReceivableProportion"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="跟单金额" prop="otherFeevalue">
+              <el-input
+                v-model="formDataList.otherFeevalue"
+                class="inputType"
+                size="small"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="手续费金额" prop="commissionFeevalue">
               <el-input
-                v-model="formDataList.ptCommissionFeevalue"
+                v-model="formDataList.commissionFeevalue"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
-            <el-form-item label="跟单费金额">
+            <el-form-item label="应收金额">
               <el-input
-                v-model="formDataList.ptOtherFeevalue"
+                v-model="formDataList.receivableAmount"
                 class="inputType"
+                size="small"
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -400,6 +613,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
             <el-form-item label="协议选择">
               <el-select
@@ -593,6 +807,23 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataListAdd.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -1207,6 +1438,7 @@ export default {
           { required: true, message: "请输入手续费金额", trigger: "blur" },
         ],
       },
+      addTypeList: [],
     };
   },
 
@@ -1219,6 +1451,11 @@ export default {
         this.$message.error(res.msg);
       }
     });
+    this.$api.dict.findByLableName("add_type").then((res) => {
+      if (res.code === 200) {
+        this.addTypeList = res.data;
+      }
+    });
     this.$api.insCompany.dicType("productsType").then((res) => {
       if (res.code == 200) {
         this.formList.forEach((filed) => {
@@ -1241,6 +1478,7 @@ export default {
     };
     this.$api.insCompany.findLeftInsTree(params).then((res) => {
       this.ztreeNodes = res.data;
+      console.log(this.ztreeNodes);
     });
     this.agrmentlist();
   },
@@ -1354,7 +1592,7 @@ export default {
     },
 
     agrmentlist() {
-      this.$api.task.findPtlAgreementListNew().then((res) => {
+      this.$api.task.findPtlAgreementListNew({ type: "1" }).then((res) => {
         this.agreementTypeoptions = res.data;
       });
     },
@@ -1704,6 +1942,7 @@ export default {
     },
     haldUpload(row) {
       this.formDataId = row.id;
+      // this.formDataList = { ...row };
       this.dialogVisibleDetail = true;
       this.$api.task.plyFeeId(row.id).then((res) => {
         if (res.code == 200) {

src/views/Letter/Wallet/ExpenditureDetails.vue

@@ -62,7 +62,9 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="3" :offset="9" class="flex j-end">
+      </el-row>
+      <el-row>
+          <el-col :span="12" :offset="12" class="flex j-end" style="margin-bottom: 10px;">
           <el-button size="small" type="primary" style="background-color: #2D4D89;border-color:#2D4D89;"
             @click="exportDetails">导出</el-button>
           <el-button size="small" type="primary" @click="onSubmit">查询</el-button>
@@ -528,6 +530,7 @@ export default {
         this.formQuery.endDate = this.formQuery.datetime[1];
       }
       if (
+        this.dateTime == undefined ||
         this.dateTime.length == 0
       ) {
         (this.formQuery.signBeginDate = ""),

src/views/PeopleManage/PcLoginRecord.vue

@@ -32,11 +32,17 @@
         <span>代理</span>
         <el-switch v-model="sourcedl" @change="sourcedlChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">在线</span>
+        <el-switch v-model="lineZx" @change="onLineChange">
+        </el-switch> -->
       </div>
       <div>
         <span>渠道</span>
         <el-switch v-model="sourceqd" @change="sourceqdChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">离线</span>
+        <el-switch v-model="lineLx" @change="offlineChange">
+        </el-switch> -->
       </div>
     </div>
     <div v-if="infoWindowVisible" class="infohis-window" >
@@ -255,7 +261,9 @@ export default {
       onlineHisData:'',
       radius:'100000',
       markers: [],
-
+      lineZx:null,
+      lineLx:null,
+      status:null
     };
   },
   mounted() {
@@ -586,6 +594,20 @@ export default {
       this.source = 1
       this.initMap();
     },
+    onLineChange(val) {
+      if (val) {
+        this.lineLx = null
+      }
+      this.status = 1
+      this.initMap();
+    },
+    offlineChange(val) {
+      if (val) {
+        this.lineZx = null
+      }
+      this.status = 0
+      this.initMap();
+    },
     handleClose() {
       this.infoWindowVisible = false;
     },
@@ -667,7 +689,7 @@ export default {
                   id: item.id,
                   userId: item.userId,
                   address: item.address,
-                  leaderName: item.leaderName,
+                  leaderName: item.leaderName?item.leaderName:'无',
                   // onlineImg: item.status ? "Frame-1(2).png" : "Frame(2).png",
                   onlineImg: "Frame-1(2).png",
                   operationTime: item.operationTime,
@@ -811,8 +833,8 @@ export default {
     padding: 3px;
   }
 
-  span::before {
-    content: '';
+  span:first-child::before {
+      content: '';
     display: inline-block;
     width: 9px;
     height: 9px;
@@ -830,7 +852,7 @@ export default {
   }
 
   span {
-    margin-right: 15px;
+    margin-right: 5px;
   }
 }
 

src/views/PeopleManage/UserMap.vue

@@ -32,11 +32,17 @@
         <span>代理</span>
         <el-switch v-model="sourcedl" @change="sourcedlChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">在线</span>
+        <el-switch v-model="lineZx" @change="onLineChange">
+        </el-switch> -->
       </div>
       <div>
         <span>渠道</span>
         <el-switch v-model="sourceqd" @change="sourceqdChange">
         </el-switch>
+        <!-- <span style="margin-left: 15px;">离线</span>
+        <el-switch v-model="lineLx" @change="offlineChange">
+        </el-switch> -->
       </div>
     </div>
     <div v-if="infoWindowVisible" class="infohis-window" >
@@ -251,6 +257,10 @@ export default {
       historyDate: '',
       onlineData:'',
       onlineHisData:'',
+      lineZx:null,
+      lineLx:null,
+      status:null
+
     };
   },
   mounted() {
@@ -473,6 +483,20 @@ export default {
       this.source = 1
       this.initMap();
     },
+    // onLineChange(val) {
+    //   if (val) {
+    //     this.lineLx = null
+    //   }
+    //   this.status = 1
+    //   this.initMap();
+    // },
+    // offlineChange(val) {
+    //   if (val) {
+    //     this.lineZx = null
+    //   }
+    //   this.status = 0
+    //   this.initMap();
+    // },
     handleClose() {
       this.infoWindowVisible = false;
     },
@@ -750,7 +774,7 @@ export default {
     padding: 3px;
   }
 
-  span::before {
+  span:first-child::before {
     content: '';
     display: inline-block;
     width: 9px;
@@ -769,7 +793,7 @@ export default {
   }
 
   span {
-    margin-right: 15px;
+    margin-right: 5px;
   }
 }
 

src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"

src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -106,6 +106,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -118,7 +119,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage"
@@ -113,6 +113,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -124,7 +125,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -87,6 +87,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
@@ -99,7 +100,7 @@ export default {
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -108,6 +108,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -120,7 +121,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"

src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -107,6 +107,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -119,7 +120,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -5,6 +5,7 @@
       @submit="handleFormSubmit"
       @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"
+      :dateType="1"
     ></retrievalForm>
     <kt-common-table
       :data="pageResult"
@@ -183,6 +184,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -194,7 +196,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     };
   },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -225,6 +225,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
@@ -237,7 +238,7 @@ export default {
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage"
@@ -112,6 +112,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -124,7 +125,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/ElectricSales/AgentPoolChannel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
@@ -81,6 +81,7 @@ export default {
         { prop: "product", label: "投保险种", minWidth: 100 },
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -92,7 +93,7 @@ export default {
 
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/ElectricSales/AgentPoolChannel1.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -105,6 +105,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -117,7 +118,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/ElectricSales/AgentPoolChannel2.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage"
@@ -113,6 +113,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -124,7 +125,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/ElectricSales/AgentPoolChannel3.vue

@@ -87,6 +87,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
@@ -99,7 +100,7 @@ export default {
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/ElectricSales/AgentPoolChannel4.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -109,6 +109,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -121,7 +122,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"

src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
@@ -104,6 +104,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -116,7 +117,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse" :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage"
@@ -113,6 +113,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -125,7 +126,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -84,6 +84,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
@@ -96,7 +97,7 @@ export default {
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         {prop: "underwritingStatus", label: "核保通过方式", minWidth: 180, formatter: this.underwritingMethodFormatter },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
+    <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"  :dateType="1"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
@@ -109,6 +109,7 @@ export default {
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -121,7 +122,7 @@ export default {
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
         { label: "原因", minWidth: 180, formatter: this.failureReasonFormatter },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
       ],
     }
   },

src/views/Task/mixin.js

@@ -124,6 +124,34 @@ export const mixin = { // 导出混入对象
           type: 'date',
           list: 'signList'
         },
+        {
+          name: 'leaderName',
+          label: '管理人',
+          type: 'input',
+          Retained: true,
+        },
+        {
+          name: 'entryStatus',
+          label: '录入来源',
+          type: 'select',
+          Retained: true,
+          optionsIabel: "label",
+          optionsValue: "value",
+          options: [
+            {
+              label: "车险录入",
+              value: "1",
+            },
+            {
+              label: "代客录单",
+              value: "2",
+            },
+            {
+              label: "外部订单",
+              value: "3",
+            },
+          ],
+        },
       ],
       loading: false,
       queryFrom: {},
@@ -134,6 +162,7 @@ export const mixin = { // 导出混入对象
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -145,7 +174,8 @@ export const mixin = { // 导出混入对象
 
         { prop: "jypremium", label: "驾意险保费", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 },
+       
       ],
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
@@ -153,6 +183,7 @@ export const mixin = { // 导出混入对象
         { prop: "username", label: "业务员姓名", minWidth: 180 },
         { prop: "leaderName", label: "管理人", minWidth: 160, },
         { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "entryStatus", label: "录入来源", minWidth: 160, formatter: this.entryStatusFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
@@ -164,7 +195,7 @@ export const mixin = { // 导出混入对象
         // { prop: "isExternal", label: "外部订单", formatter: this.isExternalFormatter},
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         { prop: "userid", label: "业务员工号", minWidth: 180 },
-        { prop: "createtime", label: "录单日期", minWidth: 160 },
+        { prop: "createtime", label: "报价时间", minWidth: 160 }
       ],
       statusoptions: "",
       dialogVisible: false,
@@ -1229,6 +1260,18 @@ export const mixin = { // 导出混入对象
         default:
       }
     },
+    entryStatusFormatter(row, column) {
+      let entryStatus = row.entryStatus;
+      switch (entryStatus) {
+        case 1:
+          return <el-tag>车险录入</el-tag>
+        case 2:
+          return <el-tag type="success">代客录单</el-tag>
+        case 3:
+          return <el-tag type="warning">外部订单</el-tag>
+        default:
+      }
+    },
     //核保原因
     failureReasonFormatter(row,column){
       let id=row.subOrderId;