xukai пре 5 месеци
родитељ
комит
23a0f753e0

+ 7 - 4
src/api/platform/home/assign.ts

@@ -6,8 +6,8 @@
  * @Description: file content
  * @FilePath: \labsop_backup2\frontend\components\labsop-api\src\api\platform\home\cell.ts
  */
-import request from '/@/utils/micro_request.js';
-const basePath = import.meta.env.VITE_PLATFORM_API;
+import request from '/@/utils/micro_request.js'
+const basePath = import.meta.env.VITE_PLATFORM_API
 export function useCellAssignApi() {
   return {
     // 资源分配
@@ -34,6 +34,9 @@ export function useCellAssignApi() {
     // 获取用户资源分配列表
     getUserAssignResources(params?: Object) {
       return request.postRequest(basePath, 'PlatPlatformCellAssign', 'GetUserAssignResources', params)
-    }
+    },
+    getDetail(params?: Object) {
+      return request.postRequest(basePath, 'PlatPlatformCellAssign', 'GetEntityById', params)
+    },
   }
-}
+}

+ 6 - 0
src/view/entry/components/appoint.vue

@@ -125,6 +125,7 @@
       return {
         title: '',
         visible: false,
+        alreadySelected: false,
         form: {
           id: 0,
           appointId: 0,
@@ -762,6 +763,7 @@
       // 当选择结束的时候获取开始和结束时间
       handleDateSelect(info: any) {
         console.log(info.endStr)
+        this.alreadySelected = true
         this.form.startTime = moment(info.startStr).format('YYYY-MM-DD HH:mm:ss')
         this.form.endTime = moment(info.endStr).format('YYYY-MM-DD HH:mm:ss')
         // 计算endTime和startTime的差值
@@ -776,11 +778,15 @@
       // 关闭
       dialogClose() {
         this.visible = false
+        this.alreadySelected = false
         this.form = { startTime: '', endTime: '', instId: 0, instName: '' }
         this.show = false
       },
       // 预约下一步
       nextStep() {
+        if (!this.alreadySelected) {
+          return ElMessage.error('请选择预约时间')
+        }
         this.$refs.sub.openDialog('add', this.form)
       },
     },

+ 5 - 5
src/view/entry/components/edit.vue

@@ -5,12 +5,12 @@
       @close="onCancel"
       :close-on-click-modal="false"
       v-model="state.dialog.isShowDialog"
-      width="800px"
+      width="90%"
     >
       <h4 class="mb8 mt8">申请信息</h4>
       <el-descriptions
         border
-        :column="2"
+        :column="1"
         class="mb20"
         direction="vertical"
       >
@@ -54,7 +54,7 @@
       >
         <el-row :gutter="35">
           <el-col
-            :span="12"
+            :span="24"
             class="mb20"
           >
             <el-form-item
@@ -73,7 +73,7 @@
             </el-form-item>
           </el-col>
           <el-col
-            :span="12"
+            :span="24"
             class="mb20"
           >
             <el-form-item
@@ -92,7 +92,7 @@
             </el-form-item>
           </el-col>
           <el-col
-            :span="12"
+            :span="24"
             class="mb24"
           >
             <el-form-item