Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/audit.vue

@@ -40,8 +40,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -57,7 +57,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -104,19 +104,9 @@
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
@@ -183,8 +173,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option label="1" value="1"></el-option>
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
+                    :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -199,7 +190,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -246,19 +237,9 @@
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
@@ -326,8 +307,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option label="1" value="1"></el-option>
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
+                    :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -342,7 +324,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -389,19 +371,9 @@
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column prop="auditUser" label="驳回人" width="120"></el-table-column>
@@ -473,8 +445,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option label="1" value="1"></el-option>
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
+                    :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -489,7 +462,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -538,19 +511,9 @@
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="problemReason" label="疑问原因" width="120"></el-table-column>
           <el-table-column prop="problemTime" label="疑问订单时间" width="120"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员信息" width="120"></el-table-column>
-          <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
@@ -680,7 +643,7 @@ const initList = (type) => {
       quotationTimeStart: firstForm.value?.quotationTime?.[0],
       quotationTimeEnd: firstForm.value?.quotationTime?.[1],
       signingTimeStart: firstForm.value?.signingTime?.[0],
-      signingTimeEnd: firstForm.value?.insurName?.[1],
+      signingTimeEnd: firstForm.value?.signingTime?.[1],
       auditStatus: type,
       isProblem: 0
     }
@@ -693,7 +656,7 @@ const initList = (type) => {
       quotationTimeStart: firstForm.value?.quotationTime?.[0],
       quotationTimeEnd: firstForm.value?.quotationTime?.[1],
       signingTimeStart: firstForm.value?.signingTime?.[0],
-      signingTimeEnd: firstForm.value?.insurName?.[1],
+      signingTimeEnd: firstForm.value?.signingTime?.[1],
       isProblem: 1
     }
   }
@@ -731,7 +694,9 @@ const handleToDetail = (scope, bool, index) => {
     }
   })
 }
-
+const handleChange = (val) => {
+  firstForm.value.deptId = val[val.length - 1]
+}
 const handleCancel = (scope) => {
   api.financeApi.updateToUnQuestionOrder(scope.row.orderNo).then((res: any) => {
     if (res.code == 200) {

src/views/finance/index.vue

@@ -40,8 +40,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -57,7 +57,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -193,8 +193,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -210,7 +210,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -347,8 +347,8 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
@@ -364,7 +364,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -503,8 +503,9 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="保险公司">
-                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable>
-                  <el-option label="1" value="1"></el-option>
+                <el-select v-model="firstForm.companyId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
+                    :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -519,7 +520,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出单机构">
-                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option"
+                <el-cascader clearable style="width: 100%" v-model="firstForm.deptId" :options="option" @change="handleChange"
                   :props="tableProps"></el-cascader>
               </el-form-item>
             </el-col>
@@ -751,7 +752,9 @@ const updateSigningTime = (row) => {
     }
   })
 }
-
+const handleChange = (val) => {
+  firstForm.value.deptId = val[val.length - 1]
+}
 const handleCancel = (scope) => {
   api.financeApi.updateToUnQuestionOrder(scope.row.orderNo).then((res: any) => {
     if (res.code == 200) {
@@ -781,6 +784,9 @@ const initData = (type) => {
       isProblem: 1
     }
   }
+  if(type == '0'){
+    obj.allTodoReceive = true;
+  }
   api.financeApi.auditList(obj).then((res: any) => {
     if (res.code == 200) {
       switch (type) {

src/views/platform/index.vue

@@ -164,7 +164,7 @@
           <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column label="应收手续费" width="100">
+          <el-table-column label="应收金额" width="100">
             <template #default="scope">
               {{ scope.row.productId === '0330' || scope.row.productId === '0330034002' || scope.row.productId ===
                 '034002' ? scope.row.jqSuperviseCostsPremiums : scope.row.productId === '034001' || scope.row.productId