Merge branch 'master' of https://code.dashoo.cn/dashoo/labsop_h5

.env.production

@@ -16,14 +16,14 @@ VITE_API_WECHAT = /wechat/
 VITE_TENANT = default
 
 # 微服务地址
-VITE_ADMIN = dashoo.labsop.admin-34000
-VITE_FINANCE = dashoo.labsop.finance-34000
-VITE_SCI = dashoo.labsop.scientific-34000
-VITE_WORKFLOW = dashoo.labsop.workflow-34000
-VITE_INSTR_ADMIN = dashoo.labsop.apparatus-34000
-VITE_LEARNING = dashoo.labsop.learning-34000
-VITE_PLATFORM_API = dashoo.labsop.platform-34000
-VITE_LABORATORY: dashoo.labsop.laboratory-34000
+VITE_ADMIN = dashoo.labsop.admin-54000
+VITE_FINANCE = dashoo.labsop.finance-54000
+VITE_SCI = dashoo.labsop.scientific-54000
+VITE_WORKFLOW = dashoo.labsop.workflow-54000
+VITE_INSTR_ADMIN = dashoo.labsop.apparatus-54000
+VITE_LEARNING = dashoo.labsop.learning-54000
+VITE_PLATFORM_API = dashoo.labsop.platform-54000
+VITE_LABORATORY: dashoo.labsop.laboratory-54000
 
 
 #公共配置

src/view/home/index.vue

@@ -103,7 +103,7 @@
       <ul class="approval">
         <li v-for="item in trainingList" :key="item.id" @click="onRouterPush('/training/enroll', { state: item.id })">
           <div class="flex justify-between">
-            <van-text-ellipsis :content="`${item.title}`" />
+            <div class="item-title">{{ item.title }}</div>
             <van-tag v-if="item.status === '40'">已结束</van-tag>
             <van-tag v-if="item.status !== '40' && item.applyStatus === '10'" type="warning">未报名</van-tag>
             <van-tag v-else-if="item.status !== '40' && item.applyStatus === '20'" type="primary">已报名</van-tag>
@@ -329,9 +329,15 @@ onMounted(() => {
         margin-top: 8px;
         border-bottom: 1px solid #ecf5fa;
 
-        .van-text-ellipsis {
+        .item-title {
           font-weight: bold;
           font-size: 16px;
+          flex: 1;
+          width: 0;
+          margin-right: 8px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
 
         footer {

src/view/instr/appoint.vue

@@ -14,35 +14,17 @@
       </van-cell-group>
       <h4>预约时间</h4>
       <van-cell-group class="mt10">
-        <van-field
-          v-model="state.form.startTime"
-          is-link
-          readonly
-          label="开始时间"
-          placeholder="开始时间"
+        <van-field v-model="state.form.startTime" is-link readonly label="开始时间" placeholder="开始时间"
           @click="onRouterPush('/instr-calendar', { id: state.form.instId })"
-          :rules="[{ required: true, message: '开始时间不能为空' }]"
-        />
-        <van-field
-          v-model="state.form.endTime"
-          is-link
-          readonly
-          label="结束时间"
-          placeholder="结束时间"
+          :rules="[{ required: true, message: '开始时间不能为空' }]" />
+        <van-field v-model="state.form.endTime" is-link readonly label="结束时间" placeholder="结束时间"
           @click="onRouterPush('/instr-calendar', { id: state.form.instId })"
-          :rules="[{ required: true, message: '结束时间不能为空' }]"
-        />
+          :rules="[{ required: true, message: '结束时间不能为空' }]" />
       </van-cell-group>
       <h4>费用预估</h4>
       <van-cell-group class="mt10">
-        <van-field
-          label="预估费用"
-          v-model="state.estimateFee"
-          placeholder="请选择预约时间和相关信息后自动计算"
-          readonly
-          is-link
-          @click="showCostDetails"
-        />
+        <van-field label="预估费用" v-model="state.estimateFee" placeholder="请选择预约时间和相关信息后自动计算" readonly is-link
+          @click="showCostDetails" />
       </van-cell-group>
       <h4>申请明细</h4>
       <template v-if="state.appointId == 0">
@@ -54,50 +36,22 @@
                 <van-radio name="service">服务</van-radio>
               </van-radio-group>
             </template>
-          </van-field> -->
-          <van-field
-            v-if="state.form.projectType == 'project'"
-            label="课题组"
-            placeholder="课题组"
-            @click="state.showProject = true"
-            v-model="state.form.projectName"
-            :rules="[{ required: true, message: '课题不能为空' }]"
-          >
+</van-field> -->
+          <van-field v-if="state.form.projectType == 'project'" label="课题组" placeholder="课题组"
+            @click="state.showProject = true" v-model="state.form.projectName"
+            :rules="[{ required: true, message: '课题不能为空' }]">
           </van-field>
-          <van-field
-            v-if="state.form.projectType == 'service'"
-            label="服务"
-            placeholder="服务"
-            @click="state.shwoService = true"
-            v-model="state.form.serviceName"
-            :rules="[{ required: true, message: '服务不能为空' }]"
-          >
+          <van-field v-if="state.form.projectType == 'service'" label="服务" placeholder="服务"
+            @click="state.shwoService = true" v-model="state.form.serviceName"
+            :rules="[{ required: true, message: '服务不能为空' }]">
           </van-field>
-          <van-field
-            v-if="state.form.projectType == 'project'"
-            label="经费卡"
-            placeholder="经费卡"
-            is-link
-            readonly
-            @click="state.showExpenseCard = true"
-            v-model="state.form.expenseCardName"
-          ></van-field>
-          <van-field
-            label="预约人"
-            placeholder="预约人"
-            is-link
-            readonly
-            @click="openSelectUser"
-            v-model="state.form.nickName"
-            :rules="[{ required: true, message: '预约人不能为空' }]"
-          ></van-field>
-          <van-field
-            label="联系电话"
-            placeholder="联系电话"
-            v-model="state.form.userContact"
-            :rules="[{ required: true, message: '联系电话不能为空' }]"
-          ></van-field>
-          <van-field name="assistEnable" label="辅助上机" >
+          <van-field v-if="state.form.projectType == 'project'" label="经费卡" placeholder="经费卡" is-link readonly
+            @click="state.showExpenseCard = true" v-model="state.form.expenseCardName"></van-field>
+          <van-field label="预约人" placeholder="预约人" is-link readonly @click="openSelectUser"
+            v-model="state.form.nickName" :rules="[{ required: true, message: '预约人不能为空' }]"></van-field>
+          <van-field label="联系电话" placeholder="联系电话" v-model="state.form.userContact"
+            :rules="[{ required: true, message: '联系电话不能为空' }]"></van-field>
+          <van-field name="assistEnable" label="辅助上机">
             <template #input>
               <van-radio-group v-model="state.form.assistEnable" direction="horizontal">
                 <van-radio style="margin-right: 20px" :name="false">否</van-radio>
@@ -105,7 +59,8 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field label="备注" placeholder="备注" v-model="state.form.remark" rows="2" autosize type="textarea" maxlength="300" show-word-limit></van-field>
+          <van-field label="备注" placeholder="备注" v-model="state.form.remark" rows="2" autosize type="textarea"
+            maxlength="300" show-word-limit></van-field>
         </van-cell-group>
       </template>
       <CustomForm ref="customFormRef" :formData="state.form.createForm"></CustomForm>
@@ -116,439 +71,431 @@
   </van-action-bar>
   <!-- 选择服务 -->
   <van-popup v-model:show="state.shwoService" position="bottom">
-    <van-picker :columns="serviceList" :columns-field-names="{ text: 'name', value: 'id' }" @confirm="pickService" @cancel="state.shwoService = false" />
+    <van-picker :columns="serviceList" :columns-field-names="{ text: 'name', value: 'id' }" @confirm="pickService"
+      @cancel="state.shwoService = false" />
   </van-popup>
   <!-- 选择课题 -->
   <van-popup v-model:show="state.showProject" position="bottom">
-    <van-picker
-      :columns="projectList"
-      :columns-field-names="{ text: 'projectName', value: 'projectId' }"
-      @confirm="pickProject"
-      @cancel="state.showProject = false"
-    />
+    <van-picker :columns="projectList" :columns-field-names="{ text: 'projectName', value: 'projectId' }"
+      @confirm="pickProject" @cancel="state.showProject = false" />
   </van-popup>
   <!-- 选择经费卡 -->
   <van-popup v-model:show="state.showExpenseCard" position="bottom">
-    <van-picker
-      :columns="fundsList"
-      :columns-field-names="{ text: 'finAccount', value: 'id' }"
-      @confirm="pickExpenseCard"
-      @cancel="state.showExpenseCard = false"
-    />
+    <van-picker :columns="fundsList" :columns-field-names="{ text: 'finAccount', value: 'id' }"
+      @confirm="pickExpenseCard" @cancel="state.showExpenseCard = false" />
   </van-popup>
   <!-- 选择预约人 -->
   <van-popup v-model:show="state.showAppointUser" position="bottom">
-    <van-picker
-      :columns="userList"
-      :columns-field-names="{ text: 'nickName', value: 'id' }"
-      @confirm="pickAppointUser"
-      @cancel="state.showAppointUser = false"
-    />
+    <van-picker :columns="userList" :columns-field-names="{ text: 'nickName', value: 'id' }" @confirm="pickAppointUser"
+      @cancel="state.showAppointUser = false" />
   </van-popup>
   <AppointDialog ref="appointDialogRef" />
 </template>
 
 <script lang="ts" setup>
-  import to from 'await-to-js'
-  import { useRoute, useRouter } from 'vue-router'
-  import { useInstrApi } from '/@/api/instr'
-  import { useInstDocApi } from '/@/api/instr/document'
-  import { defineAsyncComponent, onMounted, reactive, ref, watch } from 'vue'
-  import { formatDate } from '/@/utils/formatTime'
-  import { showNotify, showDialog } from 'vant'
-  import download from 'downloadjs'
-  import { useNoticeApi } from '/@/api/instr/notice'
-  import { useProApi } from '/@/api/project'
-  import technicalApi from '/@/api/technical/index'
-  import { Local } from '/@/utils/storage'
-  import { useUserApi } from '/@/api/system/user'
-  import { useUserInfo } from '/@/stores/userInfo'
-  import { storeToRefs } from 'pinia'
-  import instAppoint from '/@/api/instr/instAppoint'
-  import { useConfigApi } from '/@/api/system/config'
-  const CustomForm = defineAsyncComponent(() => import('/@/components/CustomForm.vue'))
-  const storesUseUserInfo = useUserInfo()
-  const { userInfos } = storeToRefs(storesUseUserInfo)
-  const route = useRoute()
-  const router = useRouter()
-  const projApi = useProApi()
-  const instApi = useInstrApi()
-  const userApi = useUserApi()
-  const configApi = useConfigApi()
-  const serviceList = ref([])
-  const projectList = ref([])
-  const fundsList = ref([])
-  const userList = ref([])
-  const appointDialogRef = ref()
-  const formRef = ref()
-  const customFormRef = ref()
-  const state = reactive({
-    loading: false,
-    appointId: 0,
-    isActiveService: false,
-    showProject: false,
-    shwoService: false,
-    showExpenseCard: false,
-    showAppointUser: false,
-    isInstrHead: false,
-    instDetail: {} as any,
-    estimateFee: '', // 预估费用
-    costDetails: [] as any[], // 费用明细
-    form: {
-      instId: 0,
-      instName: '',
-      startTime: '',
-      endTime: null,
-      projectName: null,
-      projectId: null,
-      serviceId: null,
-      serviceName: null,
-      expenseCardId: 0,
-      expenseCardName: '',
-      userContact: '',
-      userId: 0,
-      nickName: '',
-      projectType: '',
-      assistEnable: false, // 是否辅助上机，默认为false（否）
-      createForm: [],
-      remark: ''
-    }
-  })
+import to from 'await-to-js'
+import { useRoute, useRouter } from 'vue-router'
+import { useInstrApi } from '/@/api/instr'
+import { useInstDocApi } from '/@/api/instr/document'
+import { defineAsyncComponent, onMounted, reactive, ref, watch } from 'vue'
+import { formatDate } from '/@/utils/formatTime'
+import { showNotify, showDialog } from 'vant'
+import download from 'downloadjs'
+import { useNoticeApi } from '/@/api/instr/notice'
+import { useProApi } from '/@/api/project'
+import technicalApi from '/@/api/technical/index'
+import { Local } from '/@/utils/storage'
+import { useUserApi } from '/@/api/system/user'
+import { useUserInfo } from '/@/stores/userInfo'
+import { storeToRefs } from 'pinia'
+import instAppoint from '/@/api/instr/instAppoint'
+import { useConfigApi } from '/@/api/system/config'
+const CustomForm = defineAsyncComponent(() => import('/@/components/CustomForm.vue'))
+const storesUseUserInfo = useUserInfo()
+const { userInfos } = storeToRefs(storesUseUserInfo)
+const route = useRoute()
+const router = useRouter()
+const projApi = useProApi()
+const instApi = useInstrApi()
+const userApi = useUserApi()
+const configApi = useConfigApi()
+const serviceList = ref([])
+const projectList = ref([])
+const fundsList = ref([])
+const userList = ref([])
+const appointDialogRef = ref()
+const formRef = ref()
+const customFormRef = ref()
+const state = reactive({
+  loading: false,
+  appointId: 0,
+  isActiveService: false,
+  showProject: false,
+  shwoService: false,
+  showExpenseCard: false,
+  showAppointUser: false,
+  isInstrHead: false,
+  instDetail: {} as any,
+  estimateFee: '', // 预估费用
+  costDetails: [] as any[], // 费用明细
+  form: {
+    instId: 0,
+    instName: '',
+    startTime: '',
+    endTime: null,
+    projectName: null,
+    projectId: null,
+    serviceId: null,
+    serviceName: null,
+    expenseCardId: 0,
+    expenseCardName: '',
+    userContact: '',
+    userId: 0,
+    nickName: '',
+    projectType: '',
+    assistEnable: false, // 是否辅助上机，默认为false（否）
+    createForm: [],
+    remark: ''
+  }
+})
 
-  // 自定义验证函数：验证是否辅助上机
-  const validateAssistEnable = (value) => {
-    // 对于布尔值，只要不是undefined就是有效值
-    return value !== undefined
+// 自定义验证函数：验证是否辅助上机
+const validateAssistEnable = (value) => {
+  // 对于布尔值，只要不是undefined就是有效值
+  return value !== undefined
+}
+
+// 获取预估费用
+const getEstimateFee = async () => {
+  // 必须有开始时间、结束时间和仪器ID才能计算预估费用
+  if (!state.form.instId || !state.form.startTime || !state.form.endTime) {
+    state.estimateFee = ''
+    return
   }
 
-  // 获取预估费用
-  const getEstimateFee = async () => {
-    // 必须有开始时间、结束时间和仪器ID才能计算预估费用
-    if (!state.form.instId || !state.form.startTime || !state.form.endTime) {
-      state.estimateFee = ''
-      return
-    }
-    
-    // 使用原始格式，不进行时间格式转换
-    const params = {
-      instId: state.form.instId,
-      startTime: state.form.startTime,
-      endTime: state.form.endTime,
-      projectId: state.form.projectId || 0,
-      expenseCardId: state.form.expenseCardId || 0,
-      assistEnable: state.form.assistEnable
-    }
-    
-    const [err, res]: ToResponse = await to(instApi.getEstimateFee(params))
-    if (err) {
-      state.estimateFee = '计算失败'
-      return
-    }
-    
-    if (res?.code === 200 && res.data) {
-      // 根据返回格式获取预估费用
-      const cost = res.data.estimatedCost || res.data
-      state.estimateFee = `¥${cost}`
-      
-      // 保存费用明细数据
-      if (res.data.costDetails && res.data.costDetails.length > 0) {
-        state.costDetails = res.data.costDetails
-      } else {
-        state.costDetails = []
-      }
+  // 使用原始格式，不进行时间格式转换
+  const params = {
+    instId: state.form.instId,
+    startTime: state.form.startTime,
+    endTime: state.form.endTime,
+    projectId: state.form.projectId || 0,
+    expenseCardId: state.form.expenseCardId || 0,
+    assistEnable: state.form.assistEnable
+  }
+
+  const [err, res]: ToResponse = await to(instApi.getEstimateFee(params))
+  if (err) {
+    state.estimateFee = '计算失败'
+    return
+  }
+
+  if (res?.code === 200 && res.data) {
+    // 根据返回格式获取预估费用
+    const cost = res.data.estimatedCost === 0 ? 0 : res.data.estimatedCost || res.data
+    state.estimateFee = `¥${cost}`
+
+    // 保存费用明细数据
+    if (res.data.costDetails && res.data.costDetails.length > 0) {
+      state.costDetails = res.data.costDetails
     } else {
-      state.estimateFee = '无法计算'
+      state.costDetails = []
     }
+  } else {
+    state.estimateFee = '无法计算'
   }
+}
 
-  // 选择课题还是服务
-  const changeProjectType = () => {
-    state.form.serviceId = 0
-    state.form.serviceName = ''
-    state.form.projectId = 0
-    state.form.projectName = ''
-    state.form.expenseCardId = 0
-    state.form.expenseCardName = ''
-    fundsList.value = []
-    getEstimateFee() // 重新计算预估费用
-  }
-  const pickProject = ({ selectedOptions }) => {
-    state.form.projectId = selectedOptions[0].projectId
-    state.form.projectName = selectedOptions[0].projectName
-    state.showProject = false
-    getFundsData()
-    getEstimateFee() // 重新计算预估费用
+// 选择课题还是服务
+const changeProjectType = () => {
+  state.form.serviceId = 0
+  state.form.serviceName = ''
+  state.form.projectId = 0
+  state.form.projectName = ''
+  state.form.expenseCardId = 0
+  state.form.expenseCardName = ''
+  fundsList.value = []
+  getEstimateFee() // 重新计算预估费用
+}
+const pickProject = ({ selectedOptions }) => {
+  state.form.projectId = selectedOptions[0].projectId
+  state.form.projectName = selectedOptions[0].projectName
+  state.showProject = false
+  getFundsData()
+  getEstimateFee() // 重新计算预估费用
+}
+// 选择服务
+const pickService = ({ selectedOptions }) => {
+  state.form.serviceId = selectedOptions[0].id
+  state.form.serviceName = selectedOptions[0].name
+  state.shwoService = false
+  getEstimateFee() // 重新计算预估费用
+}
+// 经费卡选择
+const pickExpenseCard = ({ selectedOptions }) => {
+  state.form.expenseCardId = selectedOptions[0].id
+  state.form.expenseCardName = selectedOptions[0].finAccount
+  state.showExpenseCard = false
+  getEstimateFee() // 重新计算预估费用
+}
+const getFundsData = async () => {
+  const [err, res]: ToResponse = await to(projApi.getFinanceAccountList({ projId: state.form.projectId }))
+  if (err) return
+  fundsList.value = res?.data.list ? [res?.data.list] : []
+  if (fundsList.value && fundsList.value.length > 0 && fundsList.value[0].length > 0) {
+    state.form.expenseCardId = fundsList.value[0][0].id
+    state.form.expenseCardName = fundsList.value[0][0].finAccount
   }
-  // 选择服务
-  const pickService = ({ selectedOptions }) => {
-    state.form.serviceId = selectedOptions[0].id
-    state.form.serviceName = selectedOptions[0].name
-    state.shwoService = false
-    getEstimateFee() // 重新计算预估费用
+  getEstimateFee() // 重新计算预估费用
+}
+// 预约人选择
+const pickAppointUser = ({ selectedOptions }) => {
+  state.form.nickName = selectedOptions[0].nickName
+  state.form.userId = selectedOptions[0].id
+  state.form.userContact = selectedOptions[0].phone
+  state.showAppointUser = false
+  state.form.serviceId = 0
+  state.form.serviceName = ''
+  state.form.projectId = 0
+  state.form.projectName = ''
+  state.form.expenseCardId = 0
+  state.form.expenseCardName = ''
+  fundsList.value = []
+  getMyProjectInfo(state.form.userId)
+  getEstimateFee() // 重新计算预估费用
+}
+// 选择预约人
+const openSelectUser = () => {
+  if (!state.isInstrHead) return
+  state.showAppointUser = true
+}
+const init = async () => {
+  //延长预约会传一个预约id 有预约id 获取预约详情
+  const [err, res]: ToResponse = await to(configApi.getEntityMapByKey({ configKey: 'instr_is_activate_service' }))
+  if (err) return
+  state.isActiveService = res.data?.configValue == '10' ? true : false
+  state.form.projectType = 'project'
+  state.form.userId = userInfos.value.id || 0
+  state.form.nickName = userInfos.value.nickName || ''
+  state.form.userContact = userInfos.value.phone || ''
+  getMyProjectInfo()
+  getUserService()
+  getUserList()
+  getInstrDetails()
+  getAppointConfig()
+}
+const getInstrDetails = async () => {
+  const [err, res]: ToResponse = await to(instApi.getDetail({ id: state.form.instId }))
+  if (err) return
+  if (res?.code === 200) {
+    state.instDetail = res.data
+    state.form.instName = state.instDetail.instName
+    const userInfo = storesUseUserInfo.userInfos
+    state.isInstrHead = userInfo.id ? res.data.instHeadId.split(',').includes('' + userInfo?.id) : false
   }
-  // 经费卡选择
-  const pickExpenseCard = ({ selectedOptions }) => {
-    state.form.expenseCardId = selectedOptions[0].id
-    state.form.expenseCardName = selectedOptions[0].finAccount
-    state.showExpenseCard = false
-    getEstimateFee() // 重新计算预估费用
+}
+// 获取用户下的服务
+const getUserService = async () => {
+  const [err, res]: ToResponse = await to(technicalApi.getList({ noPage: true }))
+  if (err) return
+  serviceList.value = [res?.data.list]
+  if (state.form.projectType == 'service') {
+    state.form.serviceId = res?.data.list[0].id || 0
+    state.form.serviceName = res?.data.list[0].name || ''
   }
-  const getFundsData = async () => {
-    const [err, res]: ToResponse = await to(projApi.getFinanceAccountList({ projId: state.form.projectId }))
-    if (err) return
-    fundsList.value = res?.data.list ? [res?.data.list] : []
-    if (fundsList.value && fundsList.value.length > 0 && fundsList.value[0].length > 0) {
-      state.form.expenseCardId = fundsList.value[0][0].id
-      state.form.expenseCardName = fundsList.value[0][0].finAccount
-    }
-    getEstimateFee() // 重新计算预估费用
+}
+// 获取用户相关的课题组
+const getMyProjectInfo = async (id?: number) => {
+  let params = {}
+  if (id) {
+    params = { id }
+  } else {
+    params = {}
   }
-  // 预约人选择
-  const pickAppointUser = ({ selectedOptions }) => {
-    state.form.nickName = selectedOptions[0].nickName
-    state.form.userId = selectedOptions[0].id
-    state.form.userContact = selectedOptions[0].phone
-    state.showAppointUser = false
-    state.form.serviceId = 0
-    state.form.serviceName = ''
-    state.form.projectId = 0
-    state.form.projectName = ''
-    state.form.expenseCardId = 0
-    state.form.expenseCardName = ''
-    fundsList.value = []
-    getMyProjectInfo(state.form.userId)
+  const [err, res]: ToResponse = await to(projApi.getMySelfProjectGroup(params))
+  if (err) return
+  // state.form.projectName = res?.data.pgName || ''
+  // state.form.projectId = res?.data.id || null
+  projectList.value = [{ projectName: res?.data.pgName || '', projectId: res?.data.id || null }]
+  if (state.form.projectType == 'project') {
+    state.form.projectId = res?.data.id || null
+    state.form.projectName = res?.data.pgName || ''
+    getFundsData()
+  } else {
     getEstimateFee() // 重新计算预估费用
   }
-  // 选择预约人
-  const openSelectUser = () => {
-    if (!state.isInstrHead) return
-    state.showAppointUser = true
+}
+const getUserList = async () => {
+  const [err, res]: ToResponse = await to(userApi.getUserList({ noPage: true }))
+  if (err) return
+  userList.value = [res?.data.list]
+}
+// 预约配置信息
+const getAppointConfig = async () => {
+  const params = {
+    instId: state.form.instId,
+    code: 'InstCfgAppoint'
   }
-  const init = async () => {
-    //延长预约会传一个预约id 有预约id 获取预约详情
-    const [err, res]: ToResponse = await to(configApi.getEntityMapByKey({ configKey: 'instr_is_activate_service' }))
-    if (err) return
-    state.isActiveService = res.data?.configValue == '10' ? true : false
-    state.form.projectType = 'project'
-    state.form.userId = userInfos.value.id || 0
-    state.form.nickName = userInfos.value.nickName || ''
-    state.form.userContact = userInfos.value.phone || ''
-    getMyProjectInfo()
-    getUserService()
-    getUserList()
-    getInstrDetails()
-    getAppointConfig()
+  const [err, res]: ToResponse = await to(instApi.getSettingDetail({ ...params }))
+  if (err) return
+  state.form.createForm = res?.data?.config.createForm ? JSON.parse(res.data.config.createForm) : []
+}
+const onRouterPush = (val: string, params?: any) => {
+  router.push({
+    path: val,
+    query: { ...params }
+  })
+  // 如果是跳转到日历页面，返回后重新计算预估费用
+  if (val === '/instr-calendar') {
+    // 使用setTimeout确保从日历页面返回后再计算
+    setTimeout(() => {
+      if (state.form.startTime && state.form.endTime) {
+        getEstimateFee()
+      }
+    }, 1000)
   }
-  const getInstrDetails = async () => {
-    const [err, res]: ToResponse = await to(instApi.getDetail({ id: state.form.instId }))
-    if (err) return
-    if (res?.code === 200) {
-      state.instDetail = res.data
-      state.form.instName = state.instDetail.instName
-      const userInfo = storesUseUserInfo.userInfos
-      state.isInstrHead = userInfo.id ? res.data.instHeadId.split(',').includes('' + userInfo?.id) : false
-    }
+}
+// 展示费用明细
+const showCostDetails = () => {
+  if (state.costDetails.length === 0) {
+    showNotify({
+      type: 'warning',
+      message: '暂无费用明细'
+    })
+    return
   }
-  // 获取用户下的服务
-  const getUserService = async () => {
-    const [err, res]: ToResponse = await to(technicalApi.getList({ noPage: true }))
-    if (err) return
-    serviceList.value = [res?.data.list]
-    if (state.form.projectType == 'service') {
-      state.form.serviceId = res?.data.list[0].id || 0
-      state.form.serviceName = res?.data.list[0].name || ''
-    }
+
+  let detailsHtml = '<div class="cost-details-content">'
+  state.costDetails.forEach((item, index) => {
+    detailsHtml += `<div class="cost-item">`
+    detailsHtml += `<div class="cost-item-name">${item.itemName || ''}</div>`
+    detailsHtml += `<div class="cost-item-amount">¥${item.amount || 0}</div>`
+    detailsHtml += `</div>`
+  })
+  detailsHtml += '</div>'
+
+  showDialog({
+    title: '费用明细',
+    message: detailsHtml,
+    className: 'cost-details-dialog',
+    allowHtml: true,
+    showConfirmButton: true,
+    confirmButtonText: '确定'
+  })
+}
+
+// 防抖计时器
+const debounceTimer = ref(0)
+
+const onClickButton = async () => {
+  // 防抖处理：如果已经有计时器在运行，则清除并重新设置
+  if (debounceTimer.value) {
+    clearTimeout(debounceTimer.value)
   }
-  // 获取用户相关的课题组
-  const getMyProjectInfo = async (id?: number) => {
-    let params = {}
-    if (id) {
-      params = { id }
-    } else {
-      params = {}
-    }
-    const [err, res]: ToResponse = await to(projApi.getMySelfProjectGroup(params))
-    if (err) return
-    // state.form.projectName = res?.data.pgName || ''
-    // state.form.projectId = res?.data.id || null
-    projectList.value = [{ projectName: res?.data.pgName || '', projectId: res?.data.id || null }]
-    if (state.form.projectType == 'project') {
-      state.form.projectId = res?.data.id || null
-      state.form.projectName = res?.data.pgName || ''
-      getFundsData()
-    } else {
-      getEstimateFee() // 重新计算预估费用
+
+  // 设置新的防抖计时器
+  debounceTimer.value = setTimeout(async () => {
+    state.loading = true
+    const [errValid] = await to(formRef.value.validate())
+    const customForm = customFormRef.value.getFormData()
+    if (errValid || (state.form.createForm.length && !customForm)) {
+      state.loading = false
+      debounceTimer.value = 0
+      return
     }
-  }
-  const getUserList = async () => {
-    const [err, res]: ToResponse = await to(userApi.getUserList({ noPage: true }))
-    if (err) return
-    userList.value = [res?.data.list]
-  }
-  // 预约配置信息
-  const getAppointConfig = async () => {
-    const params = {
-      instId: state.form.instId,
-      code: 'InstCfgAppoint'
+    const params = JSON.parse(JSON.stringify(state.form))
+    params.userName = params.nickName
+    params.sampleForm = JSON.stringify(customForm)
+    delete params.createForm
+    const [err]: ToResponse = await to(instAppoint.add(params))
+    if (err) {
+      state.loading = false
+      debounceTimer.value = 0
+      return
     }
-    const [err, res]: ToResponse = await to(instApi.getSettingDetail({ ...params }))
-    if (err) return
-    state.form.createForm = res?.data?.config.createForm ? JSON.parse(res.data.config.createForm) : []
-  }
-  const onRouterPush = (val: string, params?: any) => {
-    router.push({
-      path: val,
-      query: { ...params }
+    showNotify({
+      type: 'success',
+      message: '预约成功'
     })
-    // 如果是跳转到日历页面，返回后重新计算预估费用
-    if (val === '/instr-calendar') {
-      // 使用setTimeout确保从日历页面返回后再计算
-      setTimeout(() => {
-        if (state.form.startTime && state.form.endTime) {
-          getEstimateFee()
-        }
-      }, 1000)
-    }
-  }
-  // 展示费用明细
-    const showCostDetails = () => {
-      if (state.costDetails.length === 0) {
-        showNotify({
-          type: 'warning',
-          message: '暂无费用明细'
-        })
-        return
-      }
-      
-      let detailsHtml = '<div class="cost-details-content">'
-      state.costDetails.forEach((item, index) => {
-        detailsHtml += `<div class="cost-item">`
-        detailsHtml += `<div class="cost-item-name">${item.itemName || ''}</div>`
-        detailsHtml += `<div class="cost-item-amount">¥${item.amount || 0}</div>`
-        detailsHtml += `</div>`
-      })
-      detailsHtml += '</div>'
-      
-      showDialog({
-        title: '费用明细',
-        message: detailsHtml,
-        className: 'cost-details-dialog',
-        allowHtml: true,
-        showConfirmButton: true,
-        confirmButtonText: '确定'
-      })
-    }
 
-  // 防抖计时器
-  const debounceTimer = ref(0)
-  
-  const onClickButton = async () => {
-    // 防抖处理：如果已经有计时器在运行，则清除并重新设置
-    if (debounceTimer.value) {
-      clearTimeout(debounceTimer.value)
-    }
-    
-    // 设置新的防抖计时器
-    debounceTimer.value = setTimeout(async () => {
-      state.loading = true
-      const [errValid] = await to(formRef.value.validate())
-      const customForm = customFormRef.value.getFormData()
-      if (errValid || (state.form.createForm.length && !customForm)) {
-        state.loading = false
-        debounceTimer.value = 0
-        return
-      }
-      const params = JSON.parse(JSON.stringify(state.form))
-      params.userName = params.nickName
-      params.sampleForm = JSON.stringify(customForm)
-      delete params.createForm
-      const [err]: ToResponse = await to(instAppoint.add(params))
-      if (err) {
-        state.loading = false
-        debounceTimer.value = 0
-        return
-      }
-      showNotify({
-        type: 'success',
-        message: '预约成功'
+    // 接口成功后继续保持加载状态2秒，提供更好的用户体验
+    setTimeout(() => {
+      router.push({
+        path: '/instr-detail',
+        query: {
+          id: params.instId
+        }
       })
-      
-      // 接口成功后继续保持加载状态2秒，提供更好的用户体验
-      setTimeout(() => {
-        router.push({
-          path: '/instr-detail',
-          query: {
-            id: params.instId
-          }
-        })
-        debounceTimer.value = 0
-        state.loading = false // 5秒后重置加载状态
-      }, 5000)
-    }, 500) // 500ms防抖延迟
+      debounceTimer.value = 0
+      state.loading = false // 5秒后重置加载状态
+    }, 5000)
+  }, 500) // 500ms防抖延迟
+}
+onMounted(() => {
+  const id = route.query.id ? +route.query.id : 0
+  const startTime = route.query.startTime ? formatDate(new Date(+route.query.startTime), 'YYYY-mm-dd HH:MM') : ''
+  const endTime = route.query.endTime ? formatDate(new Date(+route.query.endTime), 'YYYY-mm-dd HH:MM') : ''
+  state.form.instId = id
+  state.form.startTime = startTime
+  state.form.endTime = endTime
+  init()
+  // 如果有开始时间和结束时间，初始化后计算预估费用
+  if (startTime && endTime) {
+    setTimeout(() => {
+      getEstimateFee()
+    }, 500) // 延迟执行，确保其他初始化完成
   }
-  onMounted(() => {
-    const id = route.query.id ? +route.query.id : 0
-    const startTime = route.query.startTime ? formatDate(new Date(+route.query.startTime), 'YYYY-mm-dd HH:MM') : ''
-    const endTime = route.query.endTime ? formatDate(new Date(+route.query.endTime), 'YYYY-mm-dd HH:MM') : ''
-    state.form.instId = id
-    state.form.startTime = startTime
-    state.form.endTime = endTime
-    init()
-    // 如果有开始时间和结束时间，初始化后计算预估费用
-    if (startTime && endTime) {
-      setTimeout(() => {
-        getEstimateFee()
-      }, 500) // 延迟执行，确保其他初始化完成
-    }
-  })
+})
 
-  // 监听开始时间和结束时间变化，重新计算预估费用
-  watch(
-    () => [state.form.startTime, state.form.endTime],
-    () => {
-      if (state.form.startTime && state.form.endTime) {
-        getEstimateFee()
-      }
+// 监听开始时间和结束时间变化，重新计算预估费用
+watch(
+  () => [state.form.startTime, state.form.endTime],
+  () => {
+    if (state.form.startTime && state.form.endTime) {
+      getEstimateFee()
     }
-  )
+  }
+)
 
-  // 监听辅助上机选项变化，重新计算预估费用
-  watch(
-    () => state.form.assistEnable,
-    () => {
-      if (state.form.startTime && state.form.endTime) {
-        getEstimateFee()
-      }
+// 监听辅助上机选项变化，重新计算预估费用
+watch(
+  () => state.form.assistEnable,
+  () => {
+    if (state.form.startTime && state.form.endTime) {
+      getEstimateFee()
     }
-  )
+  }
+)
 </script>
 
 <style lang="scss" scoped>
-  .container {
-    flex: 1;
-    padding: 10px;
-    background-color: #f9f9f9;
-    overflow-y: auto;
-    h4 {
+.container {
+  flex: 1;
+  padding: 10px;
+  background-color: #f9f9f9;
+  overflow-y: auto;
+
+  h4 {
+    height: 18px;
+    line-height: 18px;
+    display: flex;
+    margin: 10px 0;
+
+    span {
+      font-weight: normal;
+      margin-left: auto;
+    }
+
+    &::before {
+      display: inline-block;
+      content: '';
+      width: 3px;
       height: 18px;
-      line-height: 18px;
-      display: flex;
-      margin: 10px 0;
-      span {
-        font-weight: normal;
-        margin-left: auto;
-      }
-      &::before {
-        display: inline-block;
-        content: '';
-        width: 3px;
-        height: 18px;
-        background-color: #1c9bfd;
-        margin-right: 4px;
-        vertical-align: middle;
-      }
+      background-color: #1c9bfd;
+      margin-right: 4px;
+      vertical-align: middle;
     }
   }
+}
 </style>
 
 <style lang="scss">
@@ -558,26 +505,26 @@
     max-height: 60vh;
     overflow-y: auto;
   }
-  
+
   .cost-details-content {
     padding: 16px;
-    
+
     .cost-item {
       display: flex;
       justify-content: space-between;
       align-items: center;
       padding: 12px 0;
       border-bottom: 1px solid #eee;
-      
+
       &:last-child {
         border-bottom: none;
       }
-      
+
       .cost-item-name {
         font-size: 14px;
         color: #333;
       }
-      
+
       .cost-item-amount {
         font-size: 16px;
         font-weight: bold;

src/view/instr/sampleAppoint.vue

@@ -190,7 +190,7 @@ const getChargeConfig = async () => {
   const [err, res]: ToResponse = await to(instApi.getSettingDetail({ ...params }))
   if (err) return
   state.InstCfgCharge = res?.data.config.enable && !res?.data.config.sampleFreeEnable
-  if (res?.data?.config?.sampleCountEnable) {
+  if (res?.data?.config?.sampleCountEnable && res?.data?.config?.enable) {
     state.form.sampleItem = res?.data?.config?.sampleItemPrice || []
     state.form.sampleItem = state.form.sampleItem.map((item) => {
       return {

src/view/login/index.vue

@@ -22,7 +22,7 @@
         </template>
       </van-field>
 
-      <div class="mt10 input-box code">
+      <div class="mt10 input-box code" v-if="state.isCaptcha === '10'">
         <van-field v-model="state.form.idValueC" placeholder="验证码" />
         <div class="login-code">
           <img class="captcha-image" width="120" height="40" :src="state.captchaImage" @click="getCaptchaImage" />
@@ -69,6 +69,8 @@
 import { onMounted, reactive, ref } from 'vue'
 import to from 'await-to-js'
 import { useLoginApi } from '/@/api/login/index'
+import { useConfigApi } from '/@/api/system/config'
+
 import { Local } from '/@/utils/storage'
 import crypto from 'sm-crypto'
 import { useRouter, useRoute } from 'vue-router'
@@ -82,6 +84,7 @@ const router = useRouter()
 const route = useRoute()
 const sm3 = crypto.sm3
 const loginApi = useLoginApi()
+const configApi = useConfigApi()
 const storesUseUserInfo = useUserInfo()
 const { userInfos, openId, unionId } = storeToRefs(storesUseUserInfo)
 const showPassword = ref(false)
@@ -127,8 +130,16 @@ const state = reactive({
     idKeyC: '',
     saltValue: '',
   },
+  isCaptcha: '20',
 })
 
+// 获取基础配置 是否需要验证码
+const getBaseConfig = async () => {
+  const [err, res]: ToResponse = await to(configApi.getEntityMapByKeys({ configKeys: ['isCaptcha'] }));
+  if (err) return
+  state.isCaptcha = res.data.isCaptcha
+}
+
 const getCaptchaImage = async () => {
   const [err, res]: ToResponse = await to(loginApi.getCaptchaImg())
   if (err) return
@@ -220,6 +231,7 @@ const blueTooth = async () => {
   }
 }
 onMounted(async () => {
+  getBaseConfig()
   const code: string = route.query.code ? route.query.code.toString() : ''
   //  if (!code) {
   //       const appid = "wxdd446f7e55c80c16";