Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt

Your Name

2022-09-20 e6ce09ca661049fd9a4034e4db5a7584cae5c1ec

 src/views/specialWorkSystem/workPlan/workReservation/index.vue

@@ -2,12 +2,12 @@
   <div class="home-container">
      <div style="height: 100%">
         <el-row class="homeCard">
            <el-col :span="6" style="display:flex;align-items: center">
               <span style="white-space: nowrap">申请部门：</span>
               <div class="grid-content topInfo">
                  <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>
               </div>
            </el-col>
<!--            <el-col :span="6" style="display:flex;align-items: center">-->
<!--               <span style="white-space: nowrap">申请部门：</span>-->
<!--               <div class="grid-content topInfo">-->
<!--                  <el-cascader v-model="searchDep" :options="departmentList" :props="casProps" :show-all-levels="false"/>-->
<!--               </div>-->
<!--            </el-col>-->
            <el-col :span="6" style="display:flex;align-items: center;">
               <span style="white-space: nowrap;margin-left: 20px">预约日期：</span>
               <div class="grid-content topInfo">
@@ -142,55 +142,72 @@
      </el-dialog>
      <el-dialog v-model="dialogAddRecord" title="作业预约编辑" @close="closeAdd">
         <el-form :model="addRecord" label-width="120px" ref="addRef" :rules="addRules">
            <el-form-item label="申请部门" prop="applyDepId">
               <el-cascader placeholder="若选择部门非本人所在部门，则记录不会出现在该页面" :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />
            </el-form-item>
<!--            <el-form-item label="申请部门" prop="applyDepId">-->
<!--               <el-cascader placeholder="若选择部门非本人所在部门，则记录不会出现在该页面" :disabled = isDisabled v-model="addRecord.applyDepId" :options="departmentList" :props="casProps" :show-all-levels="false" @change="handleChange" />-->
<!--            </el-form-item>-->
            <el-form-item label="预约时间" prop="appointmentTime">
               <el-date-picker
                     v-model="addRecord.appointmentTime"
                     type="date"
                     format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                     :disabled = isDisabled
                     placeholder="请选择预约时间段"
               />
            </el-form-item>
            <el-form-item label="动火作业" prop="hotWork">
               <el-input
                     v-model="addRecord.hotWork"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="受限空间作业" prop="confinedSpaceOper">
               <el-input
                     v-model="addRecord.confinedSpaceOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="吊装作业" prop="liftingOper">
               <el-input
                     v-model="addRecord.liftingOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="动土作业" prop="groundBreakingOper">
               <el-input
                     v-model="addRecord.groundBreakingOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="断路作业" prop="openCircuitOper">
               <el-input
                     v-model="addRecord.openCircuitOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="高处作业" prop="workAtHeight">
               <el-input
                     v-model="addRecord.workAtHeight"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="临时用电作业" prop="temporaryPowerOper">
               <el-input
                     v-model="addRecord.temporaryPowerOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
            <el-form-item label="盲板抽堵作业" prop="blindPlatePluggingOper">
               <el-input
                     v-model="addRecord.blindPlatePluggingOper"
                     type="number"
                     placeholder="预约数量（没有则为0）"
               />
            </el-form-item>
         </el-form>
@@ -299,7 +316,6 @@

         const addRef = ref<FormInstance>();
         const addRules = reactive<FormRules>({
            applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            appointmentTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            hotWork: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
            groundBreakingOper: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -369,7 +385,7 @@
            if (res.data.code === '200') {
               ElMessage({
                  type: 'success',
                  message: res.data.msg
                  message: '添加成功！'
               });
               getListByPage();
            } else {
@@ -386,7 +402,7 @@
            if (res.data.code === '200') {
               ElMessage({
                  type: 'success',
                  message: res.data.msg
                  message: '修改成功！'
               });
               getListByPage();
            } else {
@@ -463,7 +479,7 @@
            if (res.data.code === '200') {
               ElMessage({
                  type: 'success',
                  message: res.data.msg
                  message: '删除成功！'
               });
               getListByPage();
            } else {