Merge remote-tracking branch 'origin/HS-LaoBaiGan' into HS-LaoBaiGan

ruoyi-ui/src/views/appointmentteamdata/appointmentteamdata/index.vue

@@ -21,12 +21,21 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="预约时段" prop="appointmentSlot">
-        <el-input
-          v-model="queryParams.appointmentSlot"
-          clearable
-          placeholder="请输入预约时段"
-          @keyup.enter.native="handleQuery"
-        />
+<!--        <el-input-->
+<!--          v-model="queryParams.appointmentSlot"-->
+<!--          clearable-->
+<!--          placeholder="请输入预约时段"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+
+        <el-select v-model="queryParams.appointmentSlot" placeholder="请选择预约时段" clearable>
+          <el-option
+            v-for="dict in dict.type.appointment_time_period"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="预约人姓名" prop="appointmentPeopleName">
         <el-input
@@ -97,7 +106,12 @@
           <span>{{ parseTime(scope.row.appointmentDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="预约时段" prop="appointmentSlot"/>
+
+      <el-table-column label="预约时段" align="center" prop="appointmentSlot">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.appointment_time_period" :value="scope.row.appointmentSlot"/>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="预约人姓名" prop="appointmentPeopleName"/>
       <el-table-column align="center" label="预约人手机号" prop="appointmentPeoplePhone"/>
       <el-table-column align="center" label="预约人数" prop="appointmentPeopleCount"/>
@@ -161,13 +175,21 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="预约时段" prop="appointmentSlot">
-          <el-input v-model="form.appointmentSlot" placeholder="请输入预约时段"/>
+
+          <el-select v-model="form.appointmentSlot" placeholder="请选择预约时段" clearable>
+            <el-option
+              v-for="dict in dict.type.appointment_time_period"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="预约人姓名" prop="appointmentPeopleName">
-          <el-input v-model="form.appointmentPeopleName" disabled="true" placeholder="请输入预约人姓名"/>
+          <el-input v-model="form.appointmentPeopleName"   placeholder="请输入预约人姓名"/>
         </el-form-item>
         <el-form-item label="预约人手机号" prop="appointmentPeoplePhone">
-          <el-input v-model="form.appointmentPeoplePhone" disabled="true" placeholder="请输入预约人手机号"/>
+          <el-input v-model="form.appointmentPeoplePhone"   placeholder="请输入预约人手机号"/>
         </el-form-item>
         <el-form-item v-if="isEdit" label="预约人数">
           {{ form.newList ? form.newList.length : 0 }}人
@@ -299,7 +321,7 @@ import item from "@/layout/components/Sidebar/Item";
 
 export default {
   name: "Appointmentteamdata",
-  dicts: ['certificate_type'],
+  dicts: ['certificate_type','appointment_time_period'],
   data() {
     return {
       change: false,
@@ -484,14 +506,12 @@ export default {
       this.open = true;
       this.isEdit = false
       this.detail = false
-      this.form.appointmentPeopleName = this.user.nickName
-      this.form.appointmentPeoplePhone = this.user.phonenumber
+
     },
     /** 修改按钮操作 */
     handleUpdate(row, val) {
       this.reset();
-      this.form.appointmentPeopleName = this.user.nickName
-      this.form.appointmentPeoplePhone = this.user.phonenumber
+
       const id = row.id || this.ids
       getAppointmentteamdata(id).then(response => {
         this.form = response.data;