完善经销商

anrui-base/anrui-base-ui/src/api/jichuxinxi/baseaffiliatcompany.js

@@ -132,55 +132,12 @@ export function submit(data) {
   })
 }
 
-// 流程审批（同意）
-export function complete (params) {
+// 禁用、开启
+export function setRiskState(data) {
   return request({
-    url: '/base/v1/basedistributor/complete',
+    url: '/base/v1/basedistributor/setRiskState',
     method: 'post',
-    data: params,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-// 流程审批（驳回）
-export function reject (params) {
-  return request({
-    url: '/base/v1/basedistributor/reject',
-    method: 'post',
-    data: params,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-// 流程审批（终止）
-export function breakProcess (params) {
-  return request({
-    url: '/base/v1/basedistributor/breakProcess',
-    method: 'post',
-    data: params,
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-// 流程审批（撤回）
-export function revokeProcess (params) {
-  return request({
-    url: '/base/v1/basedistributor/revokeProcess',
-    method: 'post',
-    data: params,
+    data: data,
     headers: { 'Content-Type': 'application/json' }
   })
 }
-// 审批流程（同意）获取下一环节
-export function getNextNodesForSubmit (data) {
-  return request({
-    url: '/base/v1/basedistributor/getNextNodesForSubmit',
-    method: 'get',
-    params: data
-  })
-}
-// 审批流程（驳回）获取上一环节
-export function getPreviousNodesForReject (data) {
-  return request({
-    url: '/base/v1/basedistributor/getPreviousNodesForReject',
-    method: 'get',
-    params: data
-  })
-}

anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagement.vue

@@ -7,27 +7,46 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="140px" class="tab-header">
+              <el-form-item label="状态">
+                <el-select v-model="listQuery.params.filingStateKey" class="filter-item" clearable placeholder="请选择">
+                  <el-option v-for="item in filingState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="风控状态">
+                <el-select v-model="listQuery.params.riskStateKey" class="filter-item" clearable placeholder="请选择">
+                  <el-option v-for="item in riskState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.company" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="销售部门">
+                <el-input v-model="listQuery.params.dept" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="销售专员">
+                <el-input v-model="listQuery.params.saesman" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
               <el-form-item label="经销商名称">
-                <el-input v-model="listQuery.params.disName" placeholder="请输入经销商名称" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.disName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="统一社会信用代码">
-                <el-input v-model="listQuery.params.registNum" placeholder="请输入统一社会信用代码" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.registNum" placeholder="" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="实际控制人姓名">
-                <el-input v-model="listQuery.params.legalName" placeholder="请输入实际控制人姓名" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.legalName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="级别">
-                <el-select v-model="listQuery.params.disLevelKey" class="filter-item" clearable placeholder="请选择状态">
+                <el-select v-model="listQuery.params.disLevelKey" class="filter-item" clearable placeholder="请选择">
                   <el-option v-for="item in disLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="是否担保">
-                <el-select v-model="listQuery.params.isGuaranteeKey" class="filter-item" clearable placeholder="请选择是否担保">
+                <el-select v-model="listQuery.params.isGuaranteeKey" class="filter-item" clearable placeholder="请选择">
                   <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.key"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="所属经销商">
-                <el-select v-model="listQuery.params.pdistributorSid" class="addinputw" placeholder="请选择所属经销商" clearable>
+                <el-select v-model="listQuery.params.pdistributorSid" class="addinputw" placeholder="请选择" clearable>
                   <el-option v-for="item in pDistributorSid_list" :key="item.sid" :label="item.disName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
@@ -64,11 +83,31 @@
                 <el-button size="mini" type="primary" @click="toInfo(row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="state" label="状态" width="120" align="center">
+            <el-table-column label="状态" width="120" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.state }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="风控状态" width="120" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.riskState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分公司" width="120" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.company }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售部门" width="120" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.dept }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售专员" width="120" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.saesman }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="所属经销商" width="180" align="center"> <!-- ? -->
               <template slot-scope="scope">
                 <span>{{ scope.row.pdistributorName }}</span>
@@ -138,7 +177,7 @@
 </template>
 
 <script>
-import { deleteBySids, getOneLevelList, pagerList } from '@/api/jichuxinxi/baseaffiliatcompany'
+import { deleteBySids, getOneLevelList, pagerList, setRiskState } from '@/api/jichuxinxi/baseaffiliatcompany'
 import { getOrgSidByPath, typeValues } from '@/api/jichuxinxi/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -193,6 +232,20 @@ export default {
           btnKey: 'toReport',
           btnLabel: '报备'
         },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: '',
+          btnKey: 'toForbidden',
+          btnLabel: '禁用'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toEnable',
+          btnLabel: '启用'
+        },
         {
           type: 'info',
           size: 'small',
@@ -209,6 +262,30 @@ export default {
       FormLoading: false,
       listLoading: false,
       pDistributorSid_list: [],
+      filingState_list: [
+        {
+          dictKey: '0',
+          dictValue: '正常'
+        },
+        {
+          dictKey: '1',
+          dictValue: '禁用'
+        }
+      ],
+      riskState_list: [
+        {
+          dictKey: '0',
+          dictValue: '未备案'
+        },
+        {
+          dictKey: '1',
+          dictValue: '已备案'
+        },
+        {
+          dictKey: '2',
+          dictValue: '备案中'
+        }
+      ],
       // 是否是担保人
       options: [
         {
@@ -244,7 +321,12 @@ export default {
           setUpStartTime: '',	// 成立开始时间
           userSid: '',
           orgPath: '',
-          menuUrl: ''
+          menuUrl: '',
+          filingStateKey: '',
+          riskStateKey: '',
+          company: '',
+          dept: '',
+          saesman: ''
         },
         total: 0,
         current: 1,
@@ -292,6 +374,12 @@ export default {
         case 'toReport':
           this.toReport()
           break
+        case 'toForbidden':
+          this.toForbidden()
+          break
+        case 'toEnable':
+          this.toEnable()
+          break
         case 'doClose':
           this.doClose()
           break
@@ -368,7 +456,12 @@ export default {
           setUpStartTime: '',	// 成立开始时间
           userSid: '',
           orgPath: '',
-          menuUrl: ''
+          menuUrl: '',
+          filingStateKey: '',
+          riskStateKey: '',
+          company: '',
+          dept: '',
+          saesman: ''
         },
         total: 0,
         current: 1,
@@ -417,6 +510,64 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
       }
     },
+    toForbidden() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行禁用操作' })
+        return
+      }
+      const tip = '请确认是否禁用所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        setRiskState({ sidsList: this.sids, riskState: '1', userSid: window.sessionStorage.getItem('userSid') }).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    toEnable() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行启用操作' })
+        return
+      }
+      const tip = '请确认是否启用所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        setRiskState({ sidsList: this.sids, riskState: '0', userSid: window.sessionStorage.getItem('userSid') }).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
     // 根据本行ID删除数据
     doDel() {
       if (this.sdies.length > 0) {

anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagementAdd.vue

@@ -198,7 +198,7 @@
 </template>
 
 <script>
-import { details, getOneLevelList, SaveList, Update, submit } from '@/api/jichuxinxi/baseaffiliatcompany'
+import { details, getOneLevelList, SaveList, Update } from '@/api/jichuxinxi/baseaffiliatcompany'
 import { getCity, getCounty, getProvince } from '@/api/portal/areaPicker' // 省市区
 import { typeValues } from '@/api/jichuxinxi/dictcommons'
 import { getOrgSidByPath, fetchBySid } from '@/api/jichuxinxi/dictcommons'