分销明细顺序，业务来源文字

src/views/Core/components/detailsDialogPro.vue

@@ -528,19 +528,14 @@
               }">
               <el-table-column prop="insuranceType" label="等级"></el-table-column>
               <el-table-column prop="userName" label="接收人"></el-table-column>
-              <el-table-column prop="jqRetailPremiums" label="交强分销费">
-                <template slot-scope="scope" >
-                  <span>￥{{ scope.row.jqRetailPremiums }}</span>
-                </template>
-              </el-table-column>
               <el-table-column prop="jqRetailProportion" label="交强分销比例">
                 <template slot-scope="scope" >
                   <span>{{ scope.row.jqRetailProportion }}%</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="syRetailPremiums" label="商业险分销费">
+              <el-table-column prop="jqRetailPremiums" label="交强分销费">
                 <template slot-scope="scope" >
-                  <span>￥{{ scope.row.syRetailPremiums }}</span>
+                  <span>￥{{ scope.row.jqRetailPremiums }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="syRetailProportion" label="商业分销比例">
@@ -548,16 +543,21 @@
                   <span>{{ scope.row.syRetailProportion }}%</span>
                 </template>  
               </el-table-column>
-              <el-table-column prop="noRetailPremiums" label="非车险分销费">
+              <el-table-column prop="syRetailPremiums" label="商业险分销费">
                 <template slot-scope="scope" >
-                  <span>￥{{ scope.row.noRetailPremiums }}</span>
-                </template>  
+                  <span>￥{{ scope.row.syRetailPremiums }}</span>
+                </template>
               </el-table-column>
               <el-table-column prop="noRetailProportion" label="非车分销比例">
                 <template slot-scope="scope" >
                   <span>{{ scope.row.noRetailProportion }}%</span>
                 </template>    
               </el-table-column>
+              <el-table-column prop="noRetailPremiums" label="非车险分销费">
+                <template slot-scope="scope" >
+                  <span>￥{{ scope.row.noRetailPremiums }}</span>
+                </template>  
+              </el-table-column>
               <el-table-column prop="amount" label="金额">
                 <template slot-scope="scope" >
                   <span>￥{{ scope.row.totalRetailPremiums }}</span>

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -27,17 +27,17 @@
         label="订单号"
         align="center"
       ></el-table-column>
-      <el-table-column
-        prop="username"
-        label="业务员"
-        align="center"
-        width="200"
-      >
+      <el-table-column prop="username" label="业务员工号" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.userid }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="username" label="业务员名称" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.username }}({{ scope.row.userid }})</span>
+          <span>{{ scope.row.username }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="managementSource" label="机构来源" align="center">
+      <el-table-column prop="managementSource" label="业务来源" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.managementSource == '渠道'">渠道</el-tag>
           <el-tag v-if="scope.row.managementSource == '个代'" type="success"
@@ -304,7 +304,7 @@ export default {
         },
         {
           name: "managementSource",
-          label: "机构来源",
+          label: "业务来源",
           type: "select",
           options: [],
           optionsIabel: "dictTag",

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -6,12 +6,17 @@
       @expand-change="handleRowChange" ref="expandTable" :row-class-name="tableRowClassName"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
       <el-table-column prop="subOrderId" label="订单号" align="center"></el-table-column>
-      <el-table-column prop="username" label="业务员" align="center" width="200">
+      <el-table-column prop="username" label="业务员工号" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.username }}({{ scope.row.userid }})</span>
+          <span>{{ scope.row.userid }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="managementSource" label="机构来源" align="center">
+      <el-table-column prop="username" label="业务员名称" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.username }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="managementSource" label="业务来源" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.managementSource == '渠道'">渠道</el-tag>
           <el-tag v-if="scope.row.managementSource == '个代'" type="success">个代</el-tag>
@@ -171,7 +176,7 @@ export default {
         },
         {
           name: 'managementSource',
-          label: '机构来源',
+          label: '业务来源',
           type: 'select',
           options: [],
           optionsIabel: "dictTag",

src/views/Sys/Deptall.vue

@@ -44,10 +44,10 @@
                 placeholder="请输入机构编码"
               ></el-input>
             </el-form-item>
-            <el-form-item label="来源：">
+            <el-form-item label="业务来源：">
               <el-select
                 v-model="managementSource"
-                placeholder="选择来源"
+                placeholder="选择业务来源"
                 clearable
               >
                 <el-option
@@ -125,7 +125,7 @@
           </el-table-column>
           <el-table-column
             prop="managementSource"
-            label="来源"
+            label="业务来源"
             align="center"
             width="150"
           >
@@ -301,7 +301,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="来源" prop="managementSource">
+            <el-form-item label="业务来源" prop="managementSource">
               <el-select
                 :disabled="operType == 'EDIT'"
                 style="width: 100%"
@@ -708,12 +708,12 @@ export default {
         managementSource: [
           {
             required: true,
-            message: "来源不能为空",
+            message: "业务来源不能为空",
             trigger: "blur",
           },
           {
             pattern: /^[1-3]$/,
-            message: "来源不能为空",
+            message: "业务来源不能为空",
             trigger: "blur",
           },
         ],

src/views/Task/mixin.js

@@ -124,8 +124,10 @@ export const mixin = { // 导出混入对象
       pageResult: {},
       columns: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
-        { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
-        { prop: "managementSource", label: "机构来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "userid", label: "业务员工号", minWidth: 180 },
+        { prop: "username", label: "业务员姓名", minWidth: 180 },
+        // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
+        { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },
@@ -136,8 +138,10 @@ export const mixin = { // 导出混入对象
       ],
       columns1: [
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
-        { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
-        { prop: "managementSource", label: "机构来源", minWidth: 160, formatter: this.managementSourceFormatter },
+        { prop: "userid", label: "业务员工号", minWidth: 180 },
+        { prop: "username", label: "业务员姓名", minWidth: 180 },
+        // { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
+        { prop: "managementSource", label: "业务来源", minWidth: 160, formatter: this.managementSourceFormatter },
         // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
         // { prop: "agreementName", label: "协议", minWidth: 160 },