Merge remote-tracking branch 'origin/master'

src/views/system/branch/index.vue

@@ -6,6 +6,12 @@
       <template #search>
         <el-input maxlength="60" v-trim clearable v-model="searchForm.name" style="width: 200px"
           placeholder="请输入网点名称" />
+          <el-input maxlength="60" v-trim clearable v-model="searchForm.servicehallId" style="width: 200px"
+          placeholder="请输入网点编号" />
+          <el-input maxlength="60" v-trim clearable v-model="searchForm.agencyId" style="width: 200px"
+          placeholder="请输入渠道编号" />
+          <el-input maxlength="60" v-trim clearable v-model="searchForm.agencyName" style="width: 200px"
+          placeholder="请输入机构" />
       </template>
       <template #CustomButton>
         <el-button v-if="IsPermission(route, 'ADD_FIRST_DOT')" type="primary" @click="handleFirstDot" icon="Plus">
@@ -23,7 +29,7 @@
       <template #dialog>
         <el-form label-position="right" label-width="150px" :model="addForm" :rules="rules"
           :ref="(el) => (dataFormRef = el)" :hide-required-asterisk="typeOption === 'view'" v-loading="formLoding">
-          <el-form-item v-if="!isFirstDot" label="上级网点编号:" prop="superServiceHallId">
+          <el-form-item v-if="!isFirstDot" label="上级网点:" prop="superServiceHallId">
             <div style="width: 100%">
               <el-tree-select lazy :load="load" filterable style="width: 100%" placeholder="请选择上级网点编号"
                 v-model="addForm.superServiceHallId" :props="{
@@ -35,6 +41,11 @@
                 show-checkbox />
             </div>
           </el-form-item>
+          <el-form-item label="网点编号:" prop="serviceHallId">
+            <div style="width: 100%">
+              <el-input maxlength="60" v-trim clearable v-model="addForm.serviceHallId" placeholder="请输入网点编号" />
+            </div>
+          </el-form-item>
           <el-form-item label="网点名称:" prop="name">
             <div style="width: 100%">
               <el-input maxlength="60" v-trim clearable v-model="addForm.name" placeholder="请输入网点名称" />
@@ -50,6 +61,11 @@
               <el-input maxlength="60" v-trim clearable v-model="addForm.tel" placeholder="请输入联系人电话" />
             </div>
           </el-form-item>
+          <el-form-item label="联系人:" prop="contact">
+            <div style="width: 100%">
+              <el-input maxlength="60" v-trim clearable v-model="addForm.contact" placeholder="请输入联系人" />
+            </div>
+          </el-form-item>
           <el-form-item label="经度:" prop="longitude">
             <div style="width: 100%">
               <el-input maxlength="60" v-trim clearable v-model="addForm.longitude" placeholder="请输入经度" />
@@ -68,7 +84,7 @@
 
           <el-form-item label="所属渠道:" prop="agencyId">
             <div style="width: 100%">
-              <el-select clearable filterable v-model="addForm.agencyId" style="width: 100%" placeholder="请选择所属渠道"
+              <el-select clearable filterable v-model="addForm.agencyId" style="width: 100%" @change="agencyIdChange" placeholder="请选择所属渠道"
                 :disabled="!isFirstDot">
                 <el-option v-for="item in agencyList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -76,7 +92,7 @@
           </el-form-item>
           <el-form-item label="渠道编号:" prop="agencyId">
             <div style="width: 100%">
-              <el-select clearable filterable v-model="addForm.agencyId" style="width: 100%" placeholder="请选择所属渠道"
+              <el-select clearable filterable v-model="addForm.agencyId" style="width: 100%"  placeholder="请选择所属渠道"
                 :disabled="true">
                 <el-option v-for="item in agencyList" :key="item.value" :label="item.value" :value="item.value" />
               </el-select>
@@ -107,7 +123,9 @@
   import { useDebounce } from '@/utils/utils'
   import { useRoute } from 'vue-router'
   import { IsPermission } from '@/router/routerUtil'
+import { log } from 'console'
   const crudRef = ref()
+  const agencyIdC = ref()
   const dataFormRef = ref()
   const parentSelectList = ref([] as IObject[])
   let orderStep = ref('')
@@ -118,13 +136,18 @@
   //查询参数
   const searchForm = ref({
     name: '', //网点名称
+    servicehallId: '', //网点编号
+    agencyId: '', //渠道编号
+    agencyName: '', //机构
     orderSource: 'WEB',
   })
   let tableData: any = ref([])
   const initItem = {
     name: '',
     superServiceHallId: '',
+    serviceHallId: '',
     address: '',
+    contact: '',
     tel: '',
     orderSource: 'WEB',
     agencyId: '',
@@ -133,9 +156,11 @@
   const formLoding = ref(false)
   const rules = reactive({
     superServiceHallId: [{ required: true, message: '请输入', trigger: 'blur' }],
+    serviceHallId: [{ required: true, message: '请输入', trigger: 'blur' }],
     name: [{ required: true, message: '请输入', trigger: 'blur' }],
     address: [{ required: true, message: '请输入', trigger: 'blur' }],
     tel: [{ required: true, message: '请输入', trigger: 'blur' }],
+    contact: [{ required: true, message: '请输入', trigger: 'blur' }],
     longitude: [{ required: true, message: '请输入', trigger: 'blur' }],
     latitude: [{ required: true, message: '请输入', trigger: 'blur' }],
     radial: [{ required: true, message: '请输入', trigger: 'blur' }],
@@ -177,6 +202,9 @@
   function refreshLeft() {
     searchForm.value = {
       name: '', //网点名称
+      servicehallId: '', //网点编号
+      agencyId: '', //渠道编号
+      agencyName: '', //机构
       orderSource: 'WEB',
     }
     field.value.paging.currentPage = 1
@@ -290,14 +318,35 @@
         prop: 'tel',
         label: '联系人电话',
       },
+      {
+        prop: 'contact',
+        label: '联系人',
+      },
     ],
   })
   const isFirstDot = ref(false)
+  function getServiceHallId(e){
+    //获取网点编号
+    BaseService.postN('/userw/serviceHall/getServiceHallId', {
+          agencyId: e,
+        }).then((res: any) => {
+          console.log(res,'resresres');
+          addForm.value.serviceHallId = res.data.serviceHallId
+        })
+  }
   function handleFirstDot() {
+    //获取网点编号
+    getServiceHallId(agencyId.value)
     isFirstDot.value = true
     crudRef.value.dialogFormVisible = true
     addForm.value.agencyId = agencyId.value
   }
+  //添加一级网点切换所属渠道
+  const agencyIdChange = (value) => {
+    console.log(value,'eeee');
+    agencyIdC.value = value
+    getServiceHallId(value)
+  }
   const agencyList = ref<any>([])
   // 获取所有渠道
   function getAgencyList() {
@@ -358,6 +407,8 @@
   }
   const submitHandle = useDebounce(submitClick)
   function handleAdd() {
+    console.log(1111);
+    getServiceHallId(agencyId.value)
     isFirstDot.value = false
     addForm.value.agencyId = agencyId.value
   }