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

src/http/moudules/retail.js

@@ -27,8 +27,17 @@ export const findById = (id) => {
 }
 //分销列表删除（单个）
 export const retailIdDelete = (id) => {
-  return axios({
-      url: '/esmRetail/deleteRetail?id=' + id,
-      method: 'get'
-  })
+    return axios({
+        url: '/esmRetail/deleteRetail?id=' + id,
+        method: 'get'
+    })
+}
+
+//批量设置分销
+export const saveRetailBatch = (data) => {
+    return axios({
+        url: '/esmRetail/batchSetData',
+        method: 'post',
+        data
+    })
 }

src/http/moudules/task.js

@@ -1800,3 +1800,20 @@ export const queryPageTelemarketingLinkAgent = (data) => {
     data
   })
 }
+
+//外部订单审核列表
+export const orderCheckPage = (data) => {
+  return axios({
+    url: "/api/externalOrder/orderCheckPage",
+    method: "post",
+    data
+  })
+}
+
+//外部订单删除
+export const orderDelete = (id) => {
+  return axios({
+    url: "/api/externalOrder/orderDelete?id=" + id,
+    method: "get",
+  })
+}

src/views/Core/KtCommonTable.vue

@@ -25,7 +25,11 @@
       style="width: 100%"
       :row-class-name="tableRowClassName"
     >
-      <el-table-column type="expand" v-if="showSysUserAccountCardList" style="display: flex;">
+      <el-table-column
+        type="expand"
+        v-if="showSysUserAccountCardList"
+        style="display: flex"
+      >
         <template slot-scope="scope">
           <el-table
             :data="scope.row.sysUserAccountCardList"
@@ -50,27 +54,88 @@
             </el-table-column>
             <el-table-column prop="bankNumber" label="银行卡号" style="flex: 1">
             </el-table-column>
-            <el-table-column prop="realUserName" label="真实姓名" style="flex: 1">
+            <el-table-column
+              prop="realUserName"
+              label="真实姓名"
+              style="flex: 1"
+            >
             </el-table-column>
-            <el-table-column prop="auditStatus" label="审核状态" style="flex: 1">
+            <el-table-column
+              prop="auditStatus"
+              label="审核状态"
+              style="flex: 1"
+            >
               <template slot-scope="scope1">
-                <span>{{ scope1.row.auditStatus == 0 ? '未审核' : scope1.row.auditStatus == '1' ? '审核通过' : scope1.row.auditStatus == '2' ? '审核驳回' : scope1.row.auditStatus }}</span>
+                <span>{{
+                  scope1.row.auditStatus == 0
+                    ? "未审核"
+                    : scope1.row.auditStatus == "1"
+                    ? "审核通过"
+                    : scope1.row.auditStatus == "2"
+                    ? "审核驳回"
+                    : scope1.row.auditStatus
+                }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="delFlag" label="是否解绑" style="flex: 1" width="150">
+            <el-table-column
+              prop="delFlag"
+              label="是否解绑"
+              style="flex: 1"
+              width="150"
+            >
               <template slot-scope="scope1">
                 <el-row>
                   <el-col :span="8">
-                    <span style="margin-right: 20px;">{{ scope1.row.delFlag == '0' ? '未解绑' : '已解绑' }}</span>
+                    <span style="margin-right: 20px">{{
+                      scope1.row.delFlag == "0" ? "未解绑" : "已解绑"
+                    }}</span>
                   </el-col>
                   <el-col :span="8">
-                    <el-button v-if="scope1.row.delFlag == '0'" type="text" size="mini" @click="handleBreak(scope.$index, scope.row, scope1.$index, scope1.row)">解绑</el-button>
+                    <el-button
+                      v-if="scope1.row.delFlag == '0'"
+                      type="text"
+                      size="mini"
+                      @click="
+                        handleBreak(
+                          scope.$index,
+                          scope.row,
+                          scope1.$index,
+                          scope1.row
+                        )
+                      "
+                      >解绑</el-button
+                    >
                   </el-col>
                   <el-col :span="8">
-                    <el-button v-if="scope1.row.delFlag == '1'" type="text" size="mini" @click="handleRebind(scope.$index, scope.row, scope1.$index, scope1.row)">重绑</el-button>
+                    <el-button
+                      v-if="scope1.row.delFlag == '1'"
+                      type="text"
+                      size="mini"
+                      @click="
+                        handleRebind(
+                          scope.$index,
+                          scope.row,
+                          scope1.$index,
+                          scope1.row
+                        )
+                      "
+                      >重绑</el-button
+                    >
                   </el-col>
                   <el-col :span="8">
-                    <el-button type="text" size="mini" @click="handleTimeLine(scope.$index, scope.row, scope1.$index, scope1.row)">轨迹</el-button>
+                    <el-button
+                      type="text"
+                      size="mini"
+                      @click="
+                        handleTimeLine(
+                          scope.$index,
+                          scope.row,
+                          scope1.$index,
+                          scope1.row
+                        )
+                      "
+                      >轨迹</el-button
+                    >
                   </el-col>
                 </el-row>
               </template>
@@ -87,7 +152,8 @@
           showBatchDelete ||
           showBatchSettled ||
           showBatchPrint ||
-          customToolseletted
+          customToolseletted ||
+          select
         "
       ></el-table-column>
       <el-table-column
@@ -111,7 +177,13 @@
           :type="column.type"
           :formatter="column.formatter"
           :sortable="column.sortable ? column.sortable : false"
-          v-if="column.signIcon || column.isImg || column.isBtn || column.isSex || column.isStatus"
+          v-if="
+            column.signIcon ||
+            column.isImg ||
+            column.isBtn ||
+            column.isSex ||
+            column.isStatus
+          "
         >
           <template slot-scope="scope">
             <el-switch
@@ -138,16 +210,35 @@
             />
             <el-tag
               v-if="column.isSex && scope.row[column.prop]"
-              :type="scope.row[column.prop] == '女' ? 'danger' : scope.row[column.prop] == '男' ? '' : 'danger'"
-              effect="plain">
+              :type="
+                scope.row[column.prop] == '女'
+                  ? 'danger'
+                  : scope.row[column.prop] == '男'
+                  ? ''
+                  : 'danger'
+              "
+              effect="plain"
+            >
               {{ scope.row[column.prop] }}
             </el-tag>
-            
+
             <el-tag
               v-if="column.isStatus"
-              :type="scope.row[column.prop] == '在职' ? 'success' : scope.row[column.prop] == '离司' ? 'info' : scope.row[column.prop] == '入司待审核' ? 'warning' : scope.row[column.prop] == '离司待审核' ? 'warning' : scope.row[column.prop] == '修改待审核' ? 'warning' : 'danger'"
-              
-              effect="plain">
+              :type="
+                scope.row[column.prop] == '在职'
+                  ? 'success'
+                  : scope.row[column.prop] == '离司'
+                  ? 'info'
+                  : scope.row[column.prop] == '入司待审核'
+                  ? 'warning'
+                  : scope.row[column.prop] == '离司待审核'
+                  ? 'warning'
+                  : scope.row[column.prop] == '修改待审核'
+                  ? 'warning'
+                  : 'danger'
+              "
+              effect="plain"
+            >
               {{ scope.row[column.prop] }}
             </el-tag>
           </template>
@@ -298,15 +389,25 @@
             :type="button9Type"
             @click="handleButton9(scope.$index, scope.row)"
           />
-          <el-button type="text" size="small" v-if="buttonDropdown.length>0">
+          <el-button type="text" size="small" v-if="buttonDropdown.length > 0">
             <el-dropdown trigger="click">
               <span class="el-dropdown-link">
                 更多
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-for="val in buttonDropdown" :key="val.label">
-                  <el-button style="width:100%" size="mini" type="text"  v-if="!val.hide || (val.hide && val.hide(scope.row))"  @click="val.click(scope.row)">{{ val.label }}</el-button>
+                <el-dropdown-item
+                  v-for="val in buttonDropdown"
+                  :key="val.label"
+                >
+                  <el-button
+                    style="width: 100%"
+                    size="mini"
+                    type="text"
+                    v-if="!val.hide || (val.hide && val.hide(scope.row))"
+                    @click="val.click(scope.row)"
+                    >{{ val.label }}</el-button
+                  >
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -382,6 +483,10 @@ export default {
     KtButton,
   },
   props: {
+    select: {
+      type: Boolean,
+      default: false,
+    },
     tableHeights: {
       type: Number,
     },
@@ -449,27 +554,27 @@ export default {
       type: String,
     },
     button7Status: {
-      type: String
+      type: String,
     },
     button8Name: {
       type: String,
     },
     button8Status: {
-      type: String
+      type: String,
     },
     button9Name: {
       type: String,
     },
     button9Status: {
-      type: String
+      type: String,
     },
     button10Name: {
       type: String,
     },
     button10Status: {
-      type: String
+      type: String,
     },
-    buttonDropdown:{
+    buttonDropdown: {
       type: Array,
       default: () => [],
     },
@@ -639,7 +744,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
       },
-      taskPool:false
+      taskPool: false,
     };
   },
   methods: {
@@ -649,12 +754,11 @@ export default {
       // } else if (!!row.fieldName24 && row.fieldName24.indexOf("已") >= 0) {
       // return "successRow";
       // }
-      if(!!this.taskPool){
-        if(row.row.isExternal===1){
-            return "flagRow";
-        }
-        else{
-          return ''
+      if (!!this.taskPool) {
+        if (row.row.isExternal === 1) {
+          return "flagRow";
+        } else {
+          return "";
         }
       }
       this.$emit("tableRowClassName", row);
@@ -761,8 +865,8 @@ export default {
         index: index,
         row: row,
         i: i,
-        r: r
-      })
+        r: r,
+      });
     },
 
     handleTimeLine: function (index, row, i, r) {
@@ -770,16 +874,16 @@ export default {
         index: index,
         row: row,
         i: i,
-        r: r
-      })
+        r: r,
+      });
     },
     handleRebind: function (index, row, i, r) {
       this.$emit("handleRebind", {
         index: index,
         row: row,
         i: i,
-        r: r
-      })
+        r: r,
+      });
     },
     // 删除
     handleDelete: function (index, row) {
@@ -993,10 +1097,10 @@ export default {
 </script>
 
 <style scoped>
-/deep/ .el-table__fixed-body .el-table__fixed-right  {
+/deep/ .el-table__fixed-body .el-table__fixed-right {
   background-color: #f0f0f0; /* 你想要的背景色 */
 }
-/deep/ .table-fiexd{
+/deep/ .table-fiexd {
   background: #fff !important;
 }
 
@@ -1020,39 +1124,38 @@ export default {
 .el-table .successRow {
   background: #f0f9eb;
 }
-.el-dropdown-link{
+.el-dropdown-link {
   cursor: pointer;
   color: var(--themeColor);
   font-size: 12px;
 }
-
 </style>
 <style lang="scss" scoped>
 /deep/ .el-tag--plain {
-  background: rgba(93,125,255,0.1);
+  background: rgba(93, 125, 255, 0.1);
   border-radius: 4px;
-  border: 1px solid #5D7DFF;
+  border: 1px solid #5d7dff;
 }
 /deep/ .el-tag--plain.el-tag--danger {
-  background: rgba(240,85,82,0.1);
+  background: rgba(240, 85, 82, 0.1);
   border-radius: 4px 4px 4px 4px;
-  border: 1px solid #F05552;
+  border: 1px solid #f05552;
 }
 /deep/ .el-tag--plain.el-tag--info {
-  background: rgba(158,158,158,0.1);
+  background: rgba(158, 158, 158, 0.1);
   border-radius: 4px 4px 4px 4px;
-  border: 1px solid #9E9E9E;
+  border: 1px solid #9e9e9e;
 }
 
 /deep/ .el-tag--plain.el-tag--success {
-  background: rgba(81,189,44,0.1);
+  background: rgba(81, 189, 44, 0.1);
   border-radius: 4px 4px 4px 4px;
-  border: 1px solid #51BD2C;
+  border: 1px solid #51bd2c;
 }
- 
+
 /deep/ .el-tag--plain.el-tag--warning {
-  background: rgba(242,153,47,0.1);
+  background: rgba(242, 153, 47, 0.1);
   border-radius: 4px 4px 4px 4px;
-  border: 1px solid #F2992F;
+  border: 1px solid #f2992f;
 }
 </style>

src/views/DistributionManage/CarInsurance/DistributionManage.vue

@@ -1,19 +1,30 @@
 <template>
   <div>
-    <el-main ref="elMain" style="padding: 0px;">
-      <Split :gutterSize="2" style="height: calc(100vh - 120px);">
+    <el-main ref="elMain" style="padding: 0px">
+      <Split :gutterSize="2" style="height: calc(100vh - 120px)">
         <!-- 左侧树Start -->
         <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
             <div>
               <el-checkbox v-model="containsSubDept">包含下级机构</el-checkbox>
 
-              <kt-button style="margin-left: 15px;margin-bottom: 10px;" icon="el-icon-plus" label="添加分销" type="primary"
-                perms="sys:distributionManage:add" @click="handleAddButton" />
+              <kt-button
+                style="margin-left: 15px; margin-bottom: 10px"
+                icon="el-icon-plus"
+                label="添加分销"
+                type="primary"
+                perms="sys:distributionManage:add"
+                @click="handleAddButton"
+              />
             </div>
             <el-divider></el-divider>
 
-            <tree :setting="ztreeSetting" :nodes="ztreeNodes" @onClick="onZTreeClick" @onCreated="onZTreeCreated" />
+            <tree
+              :setting="ztreeSetting"
+              :nodes="ztreeNodes"
+              @onClick="onZTreeClick"
+              @onCreated="onZTreeCreated"
+            />
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -25,86 +36,202 @@
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="分销级别">
-                    <el-select style="100%" clearable size="small" v-model="queryFrom.retailtype" placeholder="请选择">
+                    <el-select
+                      clearable
+                      size="small"
+                      v-model="queryFrom.retailtype"
+                      placeholder="请选择"
+                    >
                       <el-option label="一级分销" value="1"></el-option>
                       <el-option label="二级分销" value="2"></el-option>
-                      <!--<el-option label="三级分销" value="3"></el-option>-->
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :span="5">
+                  <el-form-item label="业务来源">
+                    <el-select
+                      clearable
+                      size="small"
+                      v-model="queryFrom.source"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="val in organizationSourceoptions"
+                        :key="val.dictValue"
+                        :label="val.dictTag"
+                        :value="val.dictValue"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <!-- <el-col :span="5">
+                  <el-form-item label="机构">
+                    <el-select
+                      clearable
+                      size="small"
+                      v-model="queryFrom.retailtype"
+                      placeholder="请选择"
+                    >
+                      <el-option label="一级分销" value="1"></el-option>
+                      <el-option label="二级分销" value="2"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col> -->
                 <el-col :span="4">
                   <el-form-item label="">
-                    <el-button size="small" type="primary" @click="queryInfo">查询</el-button>
+                    <el-button size="small" type="primary" @click="queryInfo"
+                      >查询</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="batchOperation"
+                      :disabled="selectIds.length < 1"
+                      >批量设置</el-button
+                    >
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </el-row>
 
-
-          <kt-common-table permsEdit="sys:distributionManage:edit" permsDelete="sys:distributionManage:delete"
-            :data="pageResult" :columns="columns" editButtonName="编辑" deleteButtonName="删除" :showBatchDelete="false"
-            @findPage="findPage" @handleEdit="handleTableEdit" deleteName="批量删除" @handleDeleteFlag="handleTableDeleteFlag"
-            @handleDelete="handleTableBatchDelete">
+          <kt-common-table
+            permsEdit="sys:distributionManage:edit"
+            permsDelete="sys:distributionManage:delete"
+            :data="pageResult"
+            :columns="columns"
+            editButtonName="编辑"
+            deleteButtonName="删除"
+            :showBatchDelete="false"
+            @findPage="findPage"
+            @handleEdit="handleTableEdit"
+            deleteName="批量删除"
+            @handleDeleteFlag="handleTableDeleteFlag"
+            @handleDelete="handleTableBatchDelete"
+            :select="true"
+            @selectionChange="selectionChange"
+          >
+            <template slot="scope">
+              {{ 123 }}
+            </template>
           </kt-common-table>
         </SplitArea>
         <!-- 右侧列表页面End -->
       </Split>
     </el-main>
 
-    <el-dialog v-dialogDrag title="分销管理" :visible.sync="dialogVisible" width="1200px" @close="closeDialog"
-      :before-close="handleDialogBefore">
+    <el-dialog
+      v-dialogDrag
+      title="分销管理"
+      :visible.sync="dialogVisible"
+      width="1200px"
+      @close="closeDialog"
+      :before-close="handleDialogBefore"
+    >
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="行政信息" name="first">
           <el-form label-width="120px">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构编码">
-                  <el-input size="medium" style="width: 100%;" :value="deptInfo.id" disabled></el-input>
+                  <el-input
+                    size="medium"
+                    style="width: 100%"
+                    :value="deptInfo.id"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="机构名称">
-                  <el-input size="medium" style="width: 100%;" :value="deptInfo.name" disabled></el-input>
+                  <el-input
+                    size="medium"
+                    style="width: 100%"
+                    :value="deptInfo.name"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上级机构编码">
-                  <el-input size="medium" style="width: 100%;" :value="deptInfo.parentId" disabled></el-input>
+                  <el-input
+                    size="medium"
+                    style="width: 100%"
+                    :value="deptInfo.parentId"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构类型">
-                  <el-select size="medium" style="width: 100%;" disabled :value="deptInfo.comtype" placeholder="请选择">
-                    <el-option v-for="item in comtypeoptions" :key="item.label" :label="item.label"
-                      :value="item.value"></el-option>
+                  <el-select
+                    size="medium"
+                    style="width: 100%"
+                    disabled
+                    :value="deptInfo.comtype"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in comtypeoptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="机构级别">
-                  <el-select size="medium" style="width: 100%;" disabled :value="deptInfo.comlevel" placeholder="请选择">
-                    <el-option v-for="item in comleveloptions" :key="item.label" :label="item.label"
-                      :value="item.value"></el-option>
+                  <el-select
+                    size="medium"
+                    style="width: 100%"
+                    disabled
+                    :value="deptInfo.comlevel"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in comleveloptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="机构性质">
-                  <el-select size="medium" style="width: 100%;" disabled :value="deptInfo.comattribute" placeholder="请选择">
-                    <el-option v-for="item in comattributeoptions" :key="item.label" :label="item.label"
-                      :value="item.value"></el-option>
+                  <el-select
+                    size="medium"
+                    style="width: 100%"
+                    disabled
+                    :value="deptInfo.comattribute"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in comattributeoptions"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="机构地址" style="width: 100%;">
-                  <el-input size="medium" type="textarea" :rows="3" style="width: 100%;"
-                    :autosize="{ minRows: 3, maxRows: 4 }" placeholder="请输入内容" :value="deptInfo.address" disabled>
+                <el-form-item label="机构地址" style="width: 100%">
+                  <el-input
+                    size="medium"
+                    type="textarea"
+                    :rows="3"
+                    style="width: 100%"
+                    :autosize="{ minRows: 3, maxRows: 4 }"
+                    placeholder="请输入内容"
+                    :value="deptInfo.address"
+                    disabled
+                  >
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -112,53 +239,95 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="团队编码">
-                  <el-input size="medium" style="width: 100%;" :value="deptInfo.teamid" disabled></el-input>
+                  <el-input
+                    size="medium"
+                    style="width: 100%"
+                    :value="deptInfo.teamid"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="团队名称">
-                  <el-input size="medium" style="width: 100%;" :value="deptInfo.teamname" disabled></el-input>
+                  <el-input
+                    size="medium"
+                    style="width: 100%"
+                    :value="deptInfo.teamname"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-
-
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="分佣设置" name="second">
           <el-form v-model="distributionForm" label-width="120px">
             <el-form-item label="分销方式:">
-              <el-radio-group v-model="distributionForm.retailtype" @change="retailtypeChange">
-                <el-row style="margin: 15px 0px;"><el-radio label="1">一级分销</el-radio></el-row>
-                <el-row style="margin: 15px 0px;"><el-radio label="2">二级分销</el-radio></el-row>
-                <el-row style="margin: 15px 0px;"><el-radio label="3">三级分销</el-radio></el-row>
-                <el-row style="margin: 15px 0px;"><el-radio label="0">无分销分式</el-radio></el-row>
+              <el-radio-group
+                v-model="distributionForm.retailtype"
+                @change="retailtypeChange"
+              >
+                <el-row style="margin: 15px 0px"
+                  ><el-radio label="1">一级分销</el-radio></el-row
+                >
+                <el-row style="margin: 15px 0px"
+                  ><el-radio label="2">二级分销</el-radio></el-row
+                >
+                <el-row style="margin: 15px 0px"
+                  ><el-radio label="3">三级分销</el-radio></el-row
+                >
+                <el-row style="margin: 15px 0px"
+                  ><el-radio label="0">无分销分式</el-radio></el-row
+                >
               </el-radio-group>
             </el-form-item>
           </el-form>
 
-          <el-table :data="retailSettingForm" border style="width: 100%" :span-method="arraySpanMethod">
+          <el-table
+            :data="retailSettingForm"
+            border
+            style="width: 100%"
+            :span-method="arraySpanMethod"
+          >
             <el-table-column label="佣金级别" align="center" prop="retailLevel">
               <template slot-scope="scope">
                 {{ scope.row.retailLevel }}级佣金
               </template>
             </el-table-column>
-            <el-table-column label="佣金比例(%)" align="center" prop="retailRate">
+            <el-table-column
+              label="佣金比例(%)"
+              align="center"
+              prop="retailRate"
+            >
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.retailRate" :precision="2" :min="0" :step="0.01"
-                  :max="100"></el-input-number>
+                <el-input-number
+                  v-model="scope.row.retailRate"
+                  :precision="2"
+                  :min="0"
+                  :step="0.01"
+                  :max="100"
+                ></el-input-number>
               </template>
             </el-table-column>
             <el-table-column label="说明" align="center" width="700">
               <template slot-scope="scope">
                 <template v-if="distributionForm.retailtype == 1">
-                  <img src="@/assets/image/distribution/distribution1.png" width="600px" />
+                  <img
+                    src="@/assets/image/distribution/distribution1.png"
+                    width="600px"
+                  />
                 </template>
                 <template v-if="distributionForm.retailtype == 2">
-                  <img src="@/assets/image/distribution/distribution2.png" width="600px" />
+                  <img
+                    src="@/assets/image/distribution/distribution2.png"
+                    width="600px"
+                  />
                 </template>
                 <template v-if="distributionForm.retailtype == 3">
-                  <img src="@/assets/image/distribution/distribution3.png" width="600px" />
+                  <img
+                    src="@/assets/image/distribution/distribution3.png"
+                    width="600px"
+                  />
                 </template>
               </template>
             </el-table-column>
@@ -166,30 +335,115 @@
         </el-tab-pane>
       </el-tabs>
 
-
       <span slot="footer" class="dialog-footer" v-if="activeTabs == 'second'">
         <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="comfirmRetail">确 定</el-button>
+        <el-button size="small" type="primary" @click="comfirmRetail"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
+    <el-dialog
+      v-dialogDrag
+      title="分销管理"
+      :visible.sync="batcnVisible"
+      width="1200px"
+      @close="closeDialog"
+      :before-close="handleDialogBefore"
+    >
+      <el-tabs v-model="activeTabs">
+        <el-form v-model="distributionForm" label-width="120px">
+          <el-form-item label="分销方式:">
+            <el-radio-group
+              v-model="distributionForm.retailtype"
+              @change="retailtypeChange"
+            >
+              <el-row style="margin: 15px 0px"
+                ><el-radio label="1">一级分销</el-radio></el-row
+              >
+              <el-row style="margin: 15px 0px"
+                ><el-radio label="2">二级分销</el-radio></el-row
+              >
+              <el-row style="margin: 15px 0px"
+                ><el-radio label="3">三级分销</el-radio></el-row
+              >
+              <el-row style="margin: 15px 0px"
+                ><el-radio label="0">无分销分式</el-radio></el-row
+              >
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          :data="retailSettingForm"
+          border
+          style="width: 100%"
+          :span-method="arraySpanMethod"
+        >
+          <el-table-column label="佣金级别" align="center" prop="retailLevel">
+            <template slot-scope="scope">
+              {{ scope.row.retailLevel }}级佣金
+            </template>
+          </el-table-column>
+          <el-table-column label="佣金比例(%)" align="center" prop="retailRate">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.retailRate"
+                :precision="2"
+                :min="0"
+                :step="0.01"
+                :max="100"
+              ></el-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column label="说明" align="center" width="700">
+            <template slot-scope="scope">
+              <template v-if="distributionForm.retailtype == 1">
+                <img
+                  src="@/assets/image/distribution/distribution1.png"
+                  width="600px"
+                />
+              </template>
+              <template v-if="distributionForm.retailtype == 2">
+                <img
+                  src="@/assets/image/distribution/distribution2.png"
+                  width="600px"
+                />
+              </template>
+              <template v-if="distributionForm.retailtype == 3">
+                <img
+                  src="@/assets/image/distribution/distribution3.png"
+                  width="600px"
+                />
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tabs>
 
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="batcnVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="comfirmBatch"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import Cookies from "js-cookie"
+import Cookies from "js-cookie";
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-import tree from "@/components/ztree.vue";  // 机构树组件
-import KtCommonTable from "@/views/Core/KtCommonTable.vue";//表格组件
-import CommonUtil from "@/utils/comutil.js"
+import tree from "@/components/ztree.vue"; // 机构树组件
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+import CommonUtil from "@/utils/comutil.js";
+import { create } from "tinymce";
 export default {
   components: {
     KtButton,
     tree,
-    KtCommonTable
+    KtCommonTable,
   },
   data() {
-
     return {
       peopleid: "",
       peopledeptid: "",
@@ -204,17 +458,17 @@ export default {
       ztreeObj: null,
       ztreeSetting: {
         check: {
-          enable: false
+          enable: false,
         },
         data: {
           simpleData: {
             enable: true,
-            pIdKey: "parentId"
-          }
+            pIdKey: "parentId",
+          },
         },
         view: {
-          showIcon: false
-        }
+          showIcon: false,
+        },
       },
       ztreeNodes: [],
       currentTreeNode: null,
@@ -235,102 +489,233 @@ export default {
 
       distributionForm: {
         id: "",
-        retailtype: '', //分销方式
-        disrate1: 0,   //一级分销比例
-        disrate2: 0,   //二级分销比例
-        disrate3: 0,   //三级分销比例ss
-        creator: '',    //创建人
-        createtime: "",//创建时间
+        retailtype: "", //分销方式
+        disrate1: 0, //一级分销比例
+        disrate2: 0, //二级分销比例
+        disrate3: 0, //三级分销比例ss
+        creator: "", //创建人
+        createtime: "", //创建时间
       },
       // 弹出框 End--------
 
       // 右侧列表查询数据Start
       queryFrom: {
-        "retailtype": ""
+        retailtype: "",
+        source: "",
       },
       pageResult: {},
-      pageRequest: {  //查询的默认条件
+      pageRequest: {
+        //查询的默认条件
         pageNum: 1,
         pageSize: 20,
         columnFilters: {
-          "deptid": {
-            "name": "deptid",
-            "value": ''
+          deptid: {
+            name: "deptid",
+            value: "",
           },
-          "containsSubDept": {
-            "name": "containsSubDept",
-            "value": "1"
+          containsSubDept: {
+            name: "containsSubDept",
+            value: "1",
           },
-          "retailtype": {
-            "name": "retailtype",
-            "value": ""
+          retailtype: {
+            name: "retailtype",
+            value: "",
+          },
+          source: {
+            name: "source",
+            value: "",
           },
           // "status":{
           //   "name":"status",
           //   "value":"2"
           // }
-        }
+        },
       },
-      columns: [ // 数据列
+      columns: [
+        // 数据列
         { prop: "id", label: "分销编码", minWidth: 80, sortable: false },
         { prop: "deptid", label: "团队编码", minWidth: 80, sortable: false },
         { prop: "deptname", label: "团队名称", minWidth: 80, sortable: false },
-        { prop: "retailtype", label: "分销方式", minWidth: 80, sortable: false },
-        { prop: "disrate1", label: "一级佣金比例", minWidth: 80, sortable: false },
-        { prop: "disrate2", label: "二级佣金比例", minWidth: 80, sortable: false },
-        { prop: "disrate3", label: "三级佣金比例", minWidth: 80, sortable: false },
+        {
+          prop: "source",
+          label: "业务来源",
+          minWidth: 80,
+          sortable: false,
+          formatter: this.managementSourceFormatter,
+        },
+        {
+          prop: "retailtype",
+          label: "分销方式",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "disrate1",
+          label: "一级佣金比例",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "disrate2",
+          label: "二级佣金比例",
+          minWidth: 80,
+          sortable: false,
+        },
+        {
+          prop: "disrate3",
+          label: "三级佣金比例",
+          minWidth: 80,
+          sortable: false,
+        },
         // { prop: "display",label: "是否显示用佣金",minWidth: 80,sortable: false},
         // { prop: "paytype",label: "提现方式",minWidth: 120,sortable: false},
         // { prop: "minamount",label: "最少提现额度",minWidth: 120,sortable: false},
         // { prop: "maxamount",label: "每日提现上限",minWidth: 100,sortable: false},
         // { prop: "status", label: "状态", minWidth: 70, sortable: false},
         { prop: "creator", label: "创建人", minWidth: 100, sortable: false },
-        { prop: "createtime", label: "创建时间", minWidth: 100, sortable: false }
+        {
+          prop: "createtime",
+          label: "创建时间",
+          minWidth: 100,
+          sortable: false,
+        },
       ],
+      selectIds: [],
+      batcnVisible: false,
+      organizationSourceoptions: [],
       // 右侧列表查询数据End
-    }
+    };
   },
 
   mounted() {
-    this.findLeftTreeData();// 获取机构树的数据
+    this.findLeftTreeData(); // 获取机构树的数据
     //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240);// 初始化树的宽度
+    this.changeTreeWidth(240); // 初始化树的宽度
   },
   watch: {
-    containsSubDept() { // 监听是否包含下级
-      this.pageRequest.columnFilters.containsSubDept.value = this.containsSubDept ? "1" : "0";
+    containsSubDept() {
+      // 监听是否包含下级
+      this.pageRequest.columnFilters.containsSubDept.value = this
+        .containsSubDept
+        ? "1"
+        : "0";
       this.findPage();
-    }
+    },
   },
   created() {
-    this.peopleid = Cookies.get('user');
-    if (this.peopleid != 'admin') {
-      this.peopledeptid = Cookies.get('user').split('D')[0];
+    this.peopleid = Cookies.get("user");
+    if (this.peopleid != "admin") {
+      this.peopledeptid = Cookies.get("user").split("D")[0];
       this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
     } else {
-      this.peopledeptid = '9';
+      this.peopledeptid = "9";
       this.pageRequest.columnFilters.deptid.value = this.peopledeptid;
     }
     //获取所有下拉框数据(字典)
     this.getDictItems("comlevel");
     this.getDictItems("comattribute");
     this.getDictItems("comtype");
+    this.$api.insCompany.dicType("organizationSource").then((res) => {
+      if (res.code == 200) {
+        this.columns.forEach((e) => {
+          if (e.prop == "source") {
+            e.options = res.data.ddList;
+          }
+        });
+        this.organizationSourceoptions = res.data.ddList;
+      }
+    });
   },
   methods: {
+    managementSourceFormatter(row, column) {
+      let source = row.source;
+      switch (source) {
+        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:
+      }
+    },
+    //批量设置
+    batchOperation() {
+      this.batcnVisible = true;
+    },
+    comfirmBatch() {
+      if (this.distributionForm.retailtype == "") {
+        return this.$message.info("请选择分销方式");
+      }
+      // if(this.distributionForm.display=''){
+      //   return this.$message.info("请选择是否显示佣金");
+      // }]
+      // if(this.distributionForm.paytype.length==0){
+      //    return this.$message.info("请选择提现方式");
+      // }
+
+      let param = {};
+      Object.assign(param, this.distributionForm);
+      // param.deptid = this.deptInfo.teamid;
+      // param.deptname = this.deptInfo.teamname;
+      // param.paytype = param.paytype.toString();
+
+      param.disrate1 = "";
+      param.disrate2 = "";
+      param.disrate3 = "";
+
+      for (let i = 0; i < this.retailSettingForm.length; i++) {
+        param["disrate" + this.retailSettingForm[i].retailLevel] =
+          this.retailSettingForm[i].retailRate;
+      }
+
+      this.$api.retail
+        .saveRetailBatch({
+          disrate1: param.disrate1,
+          disrate2: param.disrate2,
+          disrate3: param.disrate3,
+          retailLevel: param.retailLevel,
+          ids: this.selectIds,
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("操作成功");
+            this.findPage();
+            this.batcnVisible = false;
+          } else {
+            this.$message.info("操作失败 " + res.msg);
+          }
+        })
+        .catch((err) => {
+          this.$message.error("操作失败");
+        });
+    },
+    selectionChange({ selections }) {
+      // console.log(selections);
+      this.selectIds = selections.map((v) => {
+        return v.deptid;
+      });
+      // console.log(this.selectIds);
+    },
     /**Split 开始 */
     changeTreeWidth(widthVal) {
       // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(widthVal / this.$refs.elMain.$el.clientWidth * 100);
-      this.rightSplitWidth = 100 - (this.leftSplitWidth)
+      this.leftSplitWidth = Math.ceil(
+        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
+      );
+      this.rightSplitWidth = 100 - this.leftSplitWidth;
     },
     /**Split 结束 */
     getDictItems(typeName) {
       //--数据字典--
-      this.$api.dict.findByLableName(typeName).then((response) => {
-        this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-      }).catch((error) => {
-        this[typeName + "options"] = [];
-      })
+      this.$api.dict
+        .findByLableName(typeName)
+        .then((response) => {
+          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
+        })
+        .catch((error) => {
+          this[typeName + "options"] = [];
+        });
     },
     //--left tree begin-------
     findLeftTreeData: function () {
@@ -339,7 +724,7 @@ export default {
         this.treeDataRecursion(res.data, 2);
         this.ztreeNodes = res.data;
       });
-      this.$api.dept.findTree().then(res => {
+      this.$api.dept.findTree().then((res) => {
         this.ztreeNodes = res.data;
       });
     },
@@ -349,7 +734,7 @@ export default {
       one = one || 0;
       one++;
       for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
+        if (data[i].comlevel == 5 && data[i].managementSource != num) {
           data.splice(i, 1);
           i = i - 1;
         } else {
@@ -373,41 +758,42 @@ export default {
 
     // 查询Start
     queryInfo(val) {
-      this.pageRequest.columnFilters.retailtype.value = this.queryFrom.retailtype;
+      this.pageRequest.columnFilters.retailtype.value =
+        this.queryFrom.retailtype;
+      this.pageRequest.columnFilters.source.value = this.queryFrom.source;
       this.pageRequest.pageNum = 1;
       this.findPage();
     },
     // 查询End
 
-
     // 右侧工具方法Start
     handleAddButton() {
       if (this.currentTreeNode == null) {
         return this.$message.info("请选择门店下团队");
       }
-      this.activeTabs = 'first'
+      this.activeTabs = "first";
       // 查询机构信息
-      this.$api.dept.getDeptById(this.currentTreeNode.id).then(res => {
-        if ((res.data.deptType == 'D') && (res.data.id.indexOf('M') >= 0)) {
-          this.$api.dept.getDeptById(res.data.parentId).then(result => {
+      this.$api.dept.getDeptById(this.currentTreeNode.id).then((res) => {
+        if (res.data.deptType == "D" && res.data.id.indexOf("M") >= 0) {
+          this.$api.dept.getDeptById(res.data.parentId).then((result) => {
             this.deptInfo = result.data;
             this.deptInfo.teamid = res.data.id;
             this.deptInfo.teamname = res.data.name;
             this.dialogVisible = true;
-          })
+          });
         } else {
           return this.$message.info("请选择门店下团队");
         }
-      })
+      });
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
       var that = this;
-      this.$confirm('确认关闭？')
-        .then(_ => {
+      this.$confirm("确认关闭？")
+        .then((_) => {
           done();
         })
-        .catch(_ => { });
+        .catch((_) => {});
     },
 
     // 右侧列表的方法Start
@@ -417,17 +803,20 @@ export default {
         this.pageRequest.pageNum = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      this.$api.retail.findPage(this.pageRequest).then((res) => {
-        this.pageResult = res.data;
-      }).then(data != null ? data.callback : '')
+      this.$api.retail
+        .findPage(this.pageRequest)
+        .then((res) => {
+          this.pageResult = res.data;
+        })
+        .then(data != null ? data.callback : "");
     },
     //编辑
     handleTableEdit(data) {
-      let dataObj = Object.assign({}, data.row)
-      console.log(dataObj)
-      var deptid = dataObj.deptid.split('D')[0];
-      this.$api.dept.getDeptById(deptid).then(res => {
-        if (res.code = 200) {
+      let dataObj = Object.assign({}, data.row);
+      console.log(dataObj);
+      var deptid = dataObj.deptid.split("D")[0];
+      this.$api.dept.getDeptById(deptid).then((res) => {
+        if ((res.code = 200)) {
           this.deptInfo = res.data;
           this.deptInfo.teamid = dataObj.deptid;
           this.deptInfo.teamname = dataObj.deptname;
@@ -436,33 +825,31 @@ export default {
           this.retailSettingForm = [];
           for (let i = 0; i < dataObj.retailtype; i++) {
             this.retailSettingForm.push({
-              retailLevel: (i + 1),
-              retailRate: dataObj['disrate' + (i + 1)]
-            })
+              retailLevel: i + 1,
+              retailRate: dataObj["disrate" + (i + 1)],
+            });
           }
           this.dialogVisible = true;
         } else {
           this.$message.info("加载失败");
         }
-
-      })
+      });
       return;
     },
     // 批量删除人员
-    handleTableBatchDelete(data) {
-    },
+    handleTableBatchDelete(data) {},
     // 删除单个人员
     handleTableDeleteFlag(data) {
       this.$api.retail.retailIdDelete(data.row.id).then((res) => {
-        if (res.code == '200') {
+        if (res.code == "200") {
           this.findPage();
           this.$message({
-            type: 'success',
+            type: "success",
             message: res.msg,
           });
         } else {
           this.$message({
-            type: 'error',
+            type: "error",
             message: res.msg,
           });
         }
@@ -487,13 +874,11 @@ export default {
       // this.distributionForm.minamount=1;
       // this.distributionForm.maxamount=1000;
       // this.distributionForm.commission=0;
-      this.distributionForm.creator = '';
-      this.distributionForm.createtime = '';
+      this.distributionForm.creator = "";
+      this.distributionForm.createtime = "";
     },
     // 提交
-    submitForm() {
-
-    },
+    submitForm() {},
 
     // 新增或修改的弹出框End
 
@@ -503,9 +888,9 @@ export default {
       this.retailSettingForm = [];
       for (let i = 0; i < e; i++) {
         this.retailSettingForm.push({
-          retailLevel: (i + 1),
-          retailRate: 0
-        })
+          retailLevel: i + 1,
+          retailRate: 0,
+        });
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -520,12 +905,12 @@ export default {
         const _col_1 = _row_1 > 0 ? 1 : 0; //如果被合并了_row=0则它这个列需要取消
         return {
           rowspan: _row_1,
-          colspan: _col_1
-        }
+          colspan: _col_1,
+        };
       }
     },
     comfirmRetail() {
-      if (this.distributionForm.retailtype == '') {
+      if (this.distributionForm.retailtype == "") {
         return this.$message.info("请选择分销方式");
       }
       // if(this.distributionForm.display=''){
@@ -541,45 +926,48 @@ export default {
       param.deptname = this.deptInfo.teamname;
       // param.paytype = param.paytype.toString();
 
-      param.disrate1 = '';
-      param.disrate2 = '';
-      param.disrate3 = '';
+      param.disrate1 = "";
+      param.disrate2 = "";
+      param.disrate3 = "";
 
       for (let i = 0; i < this.retailSettingForm.length; i++) {
-        param['disrate' + this.retailSettingForm[i].retailLevel] = this.retailSettingForm[i].retailRate;
+        param["disrate" + this.retailSettingForm[i].retailLevel] =
+          this.retailSettingForm[i].retailRate;
       }
 
-      this.$api.retail.saveRetail(param).then(res => {
-        if (res.code == 200) {
-          this.$message.success("操作成功");
-          this.findPage()
-          this.dialogVisible = false;
-        } else {
-          this.$message.info("操作失败 " + res.msg);
-        }
-
-      }).catch(err => {
-        this.$message.error("操作失败")
-      })
+      this.$api.retail
+        .saveRetail(param)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("操作成功");
+            this.findPage();
+            this.dialogVisible = false;
+          } else {
+            this.$message.info("操作失败 " + res.msg);
+          }
+        })
+        .catch((err) => {
+          this.$message.error("操作失败");
+        });
       // 新增分销End
-      this.$api.retail.saveRetail(param).then(res => {
-        if (res.code == 200) {
-          this.$message.success("操作成功");
-          this.findPage()
-          this.dialogVisible = false;
-        } else {
-          this.$message.info("操作失败 " + res.msg);
-        }
-
-      }).catch(err => {
-        this.$message.error("操作失败")
-      })
-    }
+      this.$api.retail
+        .saveRetail(param)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$message.success("操作成功");
+            this.findPage();
+            this.dialogVisible = false;
+          } else {
+            this.$message.info("操作失败 " + res.msg);
+          }
+        })
+        .catch((err) => {
+          this.$message.error("操作失败");
+        });
+    },
     // 新增分销End
-
-
-  }
-}
+  },
+};
 </script>
 
 <style scoped>

src/views/Letter/Wallet/AutoInsuranceDetails.vue

@@ -155,11 +155,12 @@ export default {
       productsTypeoptions: [],
       autoInsuranceResult: [],
       autoInsuranceColumns: [
+        { prop: "userId", label: "工号", minWidth: 160 },
         { prop: "orderNo", label: "任务号", minWidth: 160,  },
         { prop: "subOrderNo", label: "订单号", minWidth: 160, },
         { prop: "companyName", label: "投保公司", minWidth: 160 },
 
-        { prop: "userId", label: "工号", minWidth: 160 },
+        
         { prop: "userName", label: "姓名", minWidth: 160 },
         { prop: "signingTime", label: "签单时间", minWidth: 160 },
         { prop: "licenseNo", label: "车牌号", minWidth: 160 },

src/views/Letter/Wallet/ExpenditureDetails.vue

@@ -27,7 +27,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="筛选日期">
+          <el-form-item label="交易时间">
             <el-date-picker size="small" v-model="formQuery.datetime" type="datetimerange" range-separator="至"
               style="width: 100%;" value-format="yyyy-MM-dd" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
@@ -54,6 +54,14 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="签单日期">
+            <el-date-picker size="small" value-format="yyyy-MM-dd" v-model="dateTime" style="width: 100%"  clearable
+              @change="dataTmeChange" type="daterange" align="left" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
         <el-col :span="3" :offset="9" class="flex j-end">
           <el-button size="small" type="primary" style="background-color: #2D4D89;border-color:#2D4D89;"
             @click="exportDetails">导出</el-button>
@@ -68,6 +76,7 @@
     }">
       <template>
         <el-table-column prop="subOrderNo" label="订单编号" align="center"></el-table-column>
+        <el-table-column prop="signingTime" label="签单时间" align="center"></el-table-column>
         <el-table-column prop="createTime" label="交易时间" align="center"></el-table-column>
         <el-table-column prop="auditiingId" label="交易号" align="center"></el-table-column>
         <el-table-column prop="licenseNo" label="车牌号" align="center"></el-table-column>
@@ -238,6 +247,7 @@ export default {
   // 数据存放区域
   data() {
     return {
+      dateTime:[],
       orderInfo: {
         //选中的订单
         ownerinfo: {},
@@ -266,7 +276,9 @@ export default {
         totalSize: 0,
         businessSegmentsType: '0',
         incomeAndExpensesType: '0',
-        transactionType: '0'
+        transactionType: '0',
+        signBeginDate: "",
+        signEndDate: "",
       },
       searchType: "",
       userId: Cookies.get("user"),
@@ -515,10 +527,27 @@ export default {
         this.formQuery.startDate = this.formQuery.datetime[0];
         this.formQuery.endDate = this.formQuery.datetime[1];
       }
+      if (
+        this.dateTime.length == 0
+      ) {
+        (this.formQuery.signBeginDate = ""),
+          (this.formQuery.signEndDate = "");
+      } else {
+        this.formQuery.signBeginDate = this.dateTime[0];
+        this.formQuery.signEndDate = this.dateTime[1];
+      }
       this.formQuery.pageNum = 1
       this.FindPage()
     },
-
+    dataTmeChange(val) {
+      if (val) {
+        this.formQuery.signBeginDate = val[0];
+        this.formQuery.signEndDate = val[1];
+      } else {
+        this.formQuery.signBeginDate = "";
+        this.formQuery.signEndDate = "";
+      }
+    },
     screenType(option, val) {
       if (val) {
         return this[option + "options"].find(item => {

src/views/Task/External/Check.vue

@@ -0,0 +1,230 @@
+<template>
+  <!--布局容器-->
+  <div class="InvoicedAndSettled" style="width: 99%; margin-top: 0px">
+    <templateTable
+      :formList="formList"
+      :searchData.sync="searchData"
+      :tableConfig="tableConfig"
+      :data="tableData"
+      @findPage="getList"
+      @handleSearchList="handleSearchList"
+      :pagination="pageData"
+    >
+    </templateTable>
+    <detailsDialog  title="详情" ref="detailsDialog" :visible.sync="backupVisible" :before-close="handleClose" :orderInfo.sync="orderInfo" :Feepermissions="false"></detailsDialog>
+  </div>
+</template>
+<script>
+import templateTable from "@/components/TemplateTable/index.vue";
+import detailsDialog from "@/views/Core/components/detailsDialog.vue";
+import { mapState } from "vuex";
+
+export default {
+  name: "baosi",
+  components: { templateTable, detailsDialog},
+  created() {},
+  computed: {
+    ...mapState({
+      perms: (state) => state.user.perms,
+    }),
+  },
+  data() {
+    return {
+      orderInfo: {
+        //选中的订单
+        ownerinfo: {},
+        carinfo: {},
+        applyinfo: {},
+        insureinfo: {},
+        kindinfo: [],
+        riskinfo: [],
+        ownerinfo: {},
+        orderCommissionVo: {},
+        extendInfo: {}
+      },
+      feeOrderNewVoList: {},
+      queryOrders:{},
+      fileList: [],
+      searchData: {},
+      formList: [
+        {
+          label: "订单号",
+          prop: "id",
+          type: "input",
+        },
+        {
+          label: "车牌号",
+          prop: "licenseno",
+          type: "input",
+        },
+      ],
+      tableConfig: {
+        columns: [
+          {
+            prop: "id",
+            label: "订单号",
+            type: "text",
+          },
+          {
+            prop: "auditname",
+            label: "审核人",
+            type: "text",
+          },
+          {
+            prop: "licenseno",
+            label: "车牌号",
+            type: "text",
+          },
+          //   {
+          //     prop: "rejectinfo",
+          //     label: "驳回原因",
+          //     type: "text",
+          //   },
+          {
+            prop: "jqpremium",
+            label: "交强保费",
+            type: "text",
+          },
+          {
+            prop: "sypremium",
+            label: "商业保费",
+            type: "text",
+          },
+          {
+            prop: "taxamount",
+            label: "车船税",
+            type: "text",
+          },
+          {
+            prop: "sumpremium",
+            label: "保费合计",
+            type: "text",
+          },
+        ],
+        loading: true,
+        isPaginationShow: true,
+        optBtns: [
+          {
+            type: "primary",
+            label: "详情",
+            click: (row, index) => {
+              return this.haldNewDetail(row);
+            },
+          },
+        ],
+      },
+      tableData: [],
+      pageData: {
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0
+      },
+      backupVisible: false,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 查询
+    handleSearchList(data) {
+      this.getList(data);
+    },
+
+    //列表数据
+    getList(data) {
+      this.tableConfig.loading = true;
+      this.$api.task.orderCheckPage({ ...this.pageData, ...data }).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.data.records;
+          this.pageData.pageNum = res.data.pageNum;
+          this.pageData.pageSize = res.data.pageSize;
+          //this.pageData.totalSize = res.data.total;
+          this.tableConfig.loading = false;
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    handleClose() {
+      this.backupVisible = false;
+    },
+
+    handleSizeChange(val) {
+      this.pageData.pageSize = val;
+      this.getList();
+    },
+    tableCurrentChange(val) {
+      this.pageData.pageNum = val;
+      this.getList();
+    },
+    haldNewDetail(row) {
+      let params = {
+        companyId: row.id
+      };
+      this.$api.letter.getByCompanyId(params).then(res => {
+        if (res.code == 200) {
+          this.licenseNo = res.data.licenseno; //车牌号
+          this.inscompany = res.data.inscompany; //保险公司
+          if (res.data.accidentInfo) {
+            res.data.accidentInfo.constructor === Object
+              ? [res.data.accidentInfo]
+              : res.data.accidentInfo;
+          }
+          Object.assign(this.orderInfo, res.data);
+          if (this.orderInfo.riskinfo && this.orderInfo.riskinfo.length > 0) {
+            for (let i = 0; i < this.orderInfo.riskinfo.length; i++) {
+              if (this.orderInfo.riskinfo[i].riskCode == "0510") {
+                for (let j = 0; j < this.orderInfo.kindinfo.length; j++) {
+                  for (let m = 0; m < this.global.insureList.length; m++) {
+                    if (
+                      this.orderInfo.kindinfo[j].kindCode ==
+                      this.global.insureList[m].kindCode
+                    ) {
+                      this.global.insureList[
+                        m
+                      ].coveragePremium = this.orderInfo.kindinfo[
+                        j
+                      ].coveragePremium;
+                      if (this.orderInfo.kindinfo[j].kindCode == "B") {
+                        this.global.insureList[9].amtList[0].value = this.orderInfo.kindinfo[
+                          j
+                        ].amount;
+                      }
+                      if (this.orderInfo.kindinfo[j].kindCode == "A") {
+                        this.global.insureList[m].amount = "1";
+                      } else if (this.global.insureList[m].kindCode == "D4") {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].unitAmount;
+                      } else if (
+                        this.global.insureList[m].isMainRisk ||
+                        this.global.insureList[m].kindCode == "BD" ||
+                        this.global.insureList[m].kindCode == "L"
+                      ) {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].amount;
+                      } else {
+                        this.global.insureList[
+                          m
+                        ].amount = this.orderInfo.kindinfo[j].deductibleRate;
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          this.$refs.detailsDialog.setBackupVisible(true);
+        } else {
+          this.$message.error("订单获取失败");
+        }
+      });
+    },
+  }
+ };
+</script>
+      
+<style scoped lang="scss">
+</style>

src/views/Task/External/RejectOrder.vue

@@ -117,6 +117,13 @@ export default {
               return this.haldNewDetail(row);
             },
           },
+          {
+            type: "primary",
+            label: "刪除",
+            click: (row, index) => {
+              return this.haldDelete(row);
+            },
+          },
         ],
       },
       tableData: [],
@@ -182,6 +189,35 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
+    haldDelete(row){
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.task.orderDelete(row.id).then((res) => {
+            if (res.code == "200") {
+              this.$message({
+                type: "success",
+                message: res.msg,
+              });
+              this.findPage();
+            } else {
+              this.$message({
+                type: "error",
+                message: res.msg,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    }
   },
 };
 </script>