修改分发

src/api/geopoliticalCustomers/types.ts

@@ -146,6 +146,10 @@ export interface GeopoliticalCustomersStoreDTO {
   storeName: string
   appointTime: any
 }
+interface optionItem {
+  label: string
+  value: string
+}
 interface customStoreEntitiesItem {
   // createBy: number
   // updateBy: number
@@ -154,7 +158,7 @@ interface customStoreEntitiesItem {
   // customStoreId: number
   // storeId: number
   // customId: number
-  option?: any
+  option?: Array<optionItem>
   //门店id
   customStoreId?: number
   //预约id
@@ -165,6 +169,8 @@ interface customStoreEntitiesItem {
   reservationDate?: Dayjs | string
   //预约时间
   reservationTime: string
+  //添加禁用
+  disabled?: boolean
 }
 export interface CustomerDTO {
   customId?: number | undefined

src/views/formReview/formReview.vue

@@ -25,7 +25,9 @@
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'operate'">
         <operation-group>
-          <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">审核</a>
+          <!-- <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">审核</a> -->
+          <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">编辑</a>
+          <a v-if="record.enrollStatus !== 2" @click="handleDistribute(record)">分发</a>
           <span v-else>-</span>
         </operation-group>
       </template>
@@ -87,7 +89,7 @@ const searchTable = (params: GeopoliticalCustomersPageParam) => {
   reloadTable(true) // 会调用 tableRequest
 }
 
-//审核
+//编辑
 const handleAudit = (record: GeopoliticalCustomersRecord) => {
   geopoliticalCustomersModalRef.value?.open({
     newFormAction: FormAction.UPDATE,
@@ -95,6 +97,14 @@ const handleAudit = (record: GeopoliticalCustomersRecord) => {
     record: record
   })
 }
+//分发
+const handleDistribute = (record: GeopoliticalCustomersRecord) => {
+  geopoliticalCustomersModalRef.value?.open({
+    newFormAction: FormAction.UPDATE,
+    type: 'distribute',
+    record: record
+  })
+}
 
 const columns: ProColumns[] = [
   {

src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue

@@ -15,7 +15,7 @@
       :rule="formRule"
       :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
       :wrapper-col="
-        title === '详情' || title === '审核'
+        title === '详情' || title === '分发'
           ? { sm: { span: 24 }, md: { span: 16 } }
           : { sm: { span: 24 }, md: { span: 19 } }
       "
@@ -26,7 +26,7 @@
         :rules="[{ required: true, message: '请输入称呼', trigger: 'blur' }]"
         :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
         :wrapper-col="
-          title === '详情' || title === '审核'
+          title === '详情' || title === '分发'
             ? { sm: { span: 24 }, md: { span: 9 } }
             : { sm: { span: 24 }, md: { span: 11 } }
         "
@@ -35,7 +35,7 @@
           v-model:value="formModel.customName"
           placeholder="请输入称呼"
           style="width: 65%"
-          :readonly="title === '详情' || title === '审核'"
+          :readonly="title === '详情' || title === '分发'"
         />
       </a-form-item>
       <a-form-item
@@ -51,7 +51,7 @@
         ]"
         :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
         :wrapper-col="
-          title === '详情' || title === '审核'
+          title === '详情' || title === '分发'
             ? { sm: { span: 24 }, md: { span: 9 } }
             : { sm: { span: 24 }, md: { span: 11 } }
         "
@@ -60,7 +60,7 @@
           v-model:value="formModel.customNid"
           placeholder="请输入联系方式"
           style="width: 65%"
-          :readonly="title === '详情' || title === '审核'"
+          :readonly="title === '详情' || title === '分发'"
         />
       </a-form-item>
       <a-row>
@@ -70,7 +70,7 @@
             name="remark"
             :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
             :wrapper-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 9 } }
                 : { sm: { span: 24 }, md: { span: 19 } }
             "
@@ -78,9 +78,8 @@
             <a-input
               v-model:value="formModel.remark"
               placeholder="请输入备注"
-              style="width: 100%"
+              :style="{ width: title === '详情' || title === '分发' ? '37%' : '38%' }"
-              allow-clear
+              :readonly="title === '详情' || title === '分发'"
-              :readonly="title === '详情' || title === '审核'"
             />
           </a-form-item>
         </a-col>
@@ -103,7 +102,7 @@
               :disabled="isDisabled"
               :class="dynamicClass"
               class="readonly-cascader"
-              :allow-clear="title === '新建预约' || title === '编辑预约'"
+              :allow-clear="title === '新建预约' || title === '编辑预约' || title === '编辑'"
               @change="addressChange"
             />
           </a-form-item>
@@ -117,7 +116,7 @@
               v-model:value="formModel.detailAddress"
               placeholder="请输入小区名称"
               :disabled="title === '编辑预约'"
-              :readonly="title === '详情' || title === '审核'"
+              :readonly="title === '详情' || title === '分发'"
             />
           </a-form-item>
         </a-col>
@@ -131,7 +130,7 @@
         <a-select
           ref="select"
           v-model:value="formModel.radius"
-          :style="{ width: title === '详情' || title === '审核' ? '37%' : '38%' }"
+          :style="{ width: title === '详情' || title === '分发' ? '37%' : '38%' }"
           :options="radiusOptions"
           :field-names="{ label: 'name', value: 'id', options: 'children' }"
           :disabled="isDisabled"
@@ -140,18 +139,21 @@
         ></a-select>
         <div>
           <a-button
-            v-if="title === '新建预约' || title === '编辑预约'"
+            v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'"
             type="primary"
             @click="match"
             >匹配</a-button
           >
-          <a-button v-if="title === '新建预约'" style="margin-left: 10px" @click="resetForm"
+          <a-button
+            v-if="title === '新建预约' || title === '编辑'"
+            style="margin-left: 10px"
+            @click="resetForm"
             >重置</a-button
           >
         </div>
       </a-form-item>
       <a-form-item
-        v-if="title === '新建预约' || title === '编辑预约'"
+        v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'"
         style="display: flex; justify-content: center"
       >
         <!-- 地图 -->
@@ -245,18 +247,18 @@
         <div
           v-for="(item, index) in formModel.customStoreEntities"
           :key="index"
-          style="display: flex; justify-content: space-between"
+          style="display: flex; justify-content: space-between; align-items: center"
         >
           <a-form-item
             style="width: 45%"
             label="预约门店名称"
             :label-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 11 } }
                 : { sm: { span: 24 }, md: { span: 8 } }
             "
             :wrapper-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 13 } }
                 : { sm: { span: 24 }, md: { span: 16 } }
             "
@@ -270,20 +272,20 @@
             <a-input
               v-model:value="item.storeName"
               placeholder="请输入"
-              :readonly="title === '详情' || title === '审核'"
+              :readonly="title === '详情' || title === '分发'"
-              :style="{ width: title === '详情' || title === '审核' ? '103%' : '100%' }"
+              :style="{ width: title === '详情' || title === '分发' ? '103%' : '100%' }"
             />
           </a-form-item>
           <a-form-item
             style="width: 30%"
             label="预约时间"
             :label-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 9 } }
                 : { sm: { span: 24 }, md: { span: 9 } }
             "
             :wrapper-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 15 } }
                 : { sm: { span: 24 }, md: { span: 15 } }
             "
@@ -298,7 +300,7 @@
               <a-date-picker
                 v-model:value="item.reservationDate"
                 value-format="YYYY-MM-DD HH:mm:ss"
-                :disabled="title === '详情' || title === '审核'"
+                :disabled="title === '详情' || title === '分发'"
                 :class="reservationTimeClass"
               />
             </a-space>
@@ -306,12 +308,12 @@
           <a-form-item
             style="width: 18%"
             :label-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 0 } }
                 : { sm: { span: 24 }, md: { span: 0 } }
             "
             :wrapper-col="
-              title === '详情' || title === '审核'
+              title === '详情' || title === '分发'
                 ? { sm: { span: 24 }, md: { span: 24 } }
                 : { sm: { span: 24 }, md: { span: 24 } }
             "
@@ -326,14 +328,17 @@
               <a-select
                 ref="select"
                 v-model:value="item.reservationTime"
-                :allow-clear="title === '新建预约' || title === '编辑预约'"
+                :allow-clear="title === '新建预约' || title === '编辑预约' || title === '编辑'"
                 :options="item.option"
                 :class="reservationTimeClass"
-                :style="{ width: title === '详情' || title === '审核' ? '103%' : '100%' }"
+                :style="{ width: title === '详情' || title === '分发' ? '103%' : '100%' }"
               >
               </a-select>
             </a-space>
           </a-form-item>
+          <a-form-item v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'">
+            <delete-outlined @click="delReservationStore(item)" />
+          </a-form-item>
         </div>
       </div>
     </a-form>
@@ -354,8 +359,16 @@
       <a-button v-if="title === '详情'" type="primary" html-type="submit" @click="visible = false"
         >确定</a-button
       >
-      <div v-if="title === '审核'">
+      <div v-if="title === '编辑'">
-        <a-button @click="retrial">重审</a-button>
+        <!-- <a-button @click="retrial">重审</a-button> -->
+        <a-button @click="handleClose">取消</a-button>
+        <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute"
+          >确定</a-button
+        >
+      </div>
+      <div v-if="title === '分发'">
+        <!-- <a-button @click="retrial">重审</a-button> -->
+        <a-button @click="handleClose">取消</a-button>
         <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute"
           >分发</a-button
         >
@@ -405,14 +418,9 @@ import type { CustomerDTO, GeopoliticalCustomersRecord } from '@/api/geopolitica
 // }
 
 onMounted(() => {
-  //把半小时一个时间区间数据赋值给预约时间下拉框列表数据
-  time_array.forEach((item: string) => {
-    appointmentTimeOptions.value?.push({ value: item, label: item })
-  })
   //省市区下拉框列表数据
   // provincesAndCitiesAndAutonomousOptions.value = provincesAndCitiesAndAutonomousRegions
   provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
-  console.log('provincesAndCitiesAndAutonomousOptions==', provincesAndCitiesAndAutonomousOptions.value)
 })
 
 //动态生成只读/禁用样式
@@ -464,59 +472,7 @@ const radiusChange = (value: SelectValue) => {
 //根据地址搜索出来的门店数据
 const listData: any = ref([])
 
-//预约时间下拉框列表数据
+//预约时间下拉框列表数据(根据后端返回的营业时间生成)
-const appointmentTimeOptions = ref<any>([])
-const time_array = [
-  '0:00~0:30',
-  '0:30~1:00',
-  '1:00~1:30',
-  '1:30~2:00',
-  '2:00~2:30',
-  '2:30~3:00',
-  '3:00~3:30',
-  '3:30~4:00',
-  '4:00~4:30',
-  '4:30~5:00',
-  '5:00~5:30',
-  '5:30~6:00',
-  '6:00~6:30',
-  '6:30~7:00',
-  '7:00~7:30',
-  '7:30~8:00',
-  '8:00~8:30',
-  '8:30~9:00',
-  '9:00~9:30',
-  '9:30~10:00',
-  '10:00~10:30',
-  '10:30~11:00',
-  '11:00~11:30',
-  '11:30~12:00',
-  '12:00~12:30',
-  '12:30~13:00',
-  '13:00~13:30',
-  '13:30~14:00',
-  '14:00~14:30',
-  '14:30~15:00',
-  '15:00~15:30',
-  '15:30~16:00',
-  '16:00~16:30',
-  '16:30~17:00',
-  '17:00~17:30',
-  '17:30~18:00',
-  '18:00~18:30',
-  '18:30~19:00',
-  '19:00~19:30',
-  '19:30~20:00',
-  '20:00~20:30',
-  '20:30~21:00',
-  '21:00~21:30',
-  '21:30~22:00',
-  '22:00~22:30',
-  '22:30~23:00',
-  '23:00~23:30',
-  '23:30~0:00'
-]
-
 const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => {
   const startHour = Number(tradeStartTime.split(':')[0])
   const startMinute = Number(tradeStartTime.split(':')[1])
@@ -592,16 +548,6 @@ const pagingQuery = () => {
             result.data &&
               result.data.forEach((item: any) => {
                 const disabled = ids.includes(Number(item.id))
-                // console.log(
-                //   generateTimeSlots(item.tradeStartTime, item.tradeEndTime),
-                //   'generateTimeSlots(item.tradeStartTime, item.tradeEndTime)'
-                // )
-                // generateTimeSlots(item.tradeStartTime, item.tradeEndTime).forEach((i: string) => {
-                //   generateTimeSlots(item.tradeStartTime, item.tradeEndTime).push({
-                //     value: i,
-                //     label: i
-                //   })
-                // })
                 listData.value.push({
                   title: item.storeName,
                   description: item.address,
@@ -615,7 +561,6 @@ const pagingQuery = () => {
                   reservationDate: item.reservationDate,
                   option: generateTimeSlots(item.tradeStartTime, item.tradeEndTime)
                 })
-                console.log(listData.value, 'listData.value')
               })
             pois.push(...listData.value)
             // 设置缩放级别,设置地图视图级别为
@@ -727,7 +672,25 @@ const addStore = (item: any) => {
     reservationTime: '',
     storeId: item.id,
     reservationDate: '',
-    option: item.option
+    option: item.option,
+    disabled: item.disabled
+  })
+}
+
+//删除预约门店
+const delReservationStore = (i: any) => {
+  console.log(i, 'i')
+  // console.log(formModel.customStoreEntities, 'formModel.customStoreEntities')
+  console.log(listData.value, 'listData.value')
+  listData.value.forEach((item: any) => {
+    // console.log(i.storeId, 'id')
+    if (item.id == i.storeId) {
+      item.disabled = false
+    }
+    console.log(item, 'item')
+  })
+  formModel.customStoreEntities = formModel.customStoreEntities.filter((item: any) => {
+    return item.storeId != i.storeId
   })
 }
 //门店重置
@@ -810,20 +773,20 @@ const submitOperate = (type: string, status?: number) => {
     }
   }
 
-  if (title.value === '新建预约' || title.value === '编辑预约') {
+  if (title.value === '新建预约' || title.value === '编辑预约' || title.value === '编辑') {
     const requestFn = title.value === '新建预约' ? addCustomer : updateCustomer
     doRequest(requestFn(filteredObj), {
       onSuccess: handleSuccess
     })
-  } else if (title.value === '审核') {
+  } else if (title.value === '分发') {
-    doRequest(auditCustomer({ customId: formModel.customId, status: status }), {
+    doRequest(auditCustomer({ customId: formModel.customId, status: 1 }), {
       onSuccess: handleSuccess
     })
   }
 }
 //报名信息确认弹窗确定点击事件
 const handleOk = async () => {
-  if (title.value === '审核') {
+  if (title.value === '编辑') {
     //重审
     await submitOperate('cs', 1)
   } else {
@@ -927,7 +890,7 @@ const handleClose = () => {
       { required: true, message: '请输入正确的手机号码', pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/ }
     ]
   }
-  listData.value.length = 0
+  // listData.value.length = 0
   formRef.value?.resetFields()
   // resetFields.value()
   delete formModel.description
@@ -972,6 +935,11 @@ defineExpose({
       formModel.detailAddress = detailAddress
       formModel.radius = radius
       formModel.customStoreEntities.push(...customStoreVOList)
+
+      formModel.customStoreEntities.forEach((i: any) => {
+        i.option = generateTimeSlots(i.tradeStartTime, i.tradeEndTime)
+      })
+      console.log(formModel.customStoreEntities, 'formModel.customStoreEntities')
     }
 
     const handleMapInit = () => {
@@ -993,10 +961,16 @@ defineExpose({
         reservationTimeisReadOnly.value = true
         title.value = '详情'
       } else if (opendata.type === 'audit') {
+        // isReadOnly.value = true
+        // reservationTimeisReadOnly.value = true
+        handleMapInit()
+        title.value = '编辑'
+        formModel.description = 1
+      } else if (opendata.type === 'distribute') {
         isReadOnly.value = true
         reservationTimeisReadOnly.value = true
         handleMapInit()
-        title.value = '审核'
+        title.value = '分发'
         formModel.description = 1
       } else {
         isDisabled.value = true

vite.config.ts

@@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //项目
 // const serverAddress = 'http://admin.ballcat.cn'
 //xy
-// const serverAddress = 'http://172.18.0.225:8000'
+const serverAddress = 'http://172.18.0.225:8000'
 //jt
 // const serverAddress = 'http://172.18.1.8:8000'
 //ts
 // const serverAddress = 'http://172.18.0.228:8000'
 //测试
-const serverAddress = 'http://39.100.77.21:8000'
+// const serverAddress = 'http://39.100.77.21:8000'
 
 //线上ip
 // const serverAddress = 'http://175.27.212.74:80'