yz3456
2024-05-01 9bf21833a347da6c758d55fe860a931f11d1aa48
修改了会议申请模块
2个文件已修改
24 ■■■■ 已修改文件
ruoyi-ui/src/views/meeting/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/meetingInfo.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/index.vue
@@ -10,12 +10,12 @@
      <span>会议申请</span>
      <div class="button-container"></div>
      <div style="display: flex; align-items: center;">
        <el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
        <!-- <el-button @click="newRequest" size="mini" type="text" v-hasPermi="['person:information:memo']" style="margin-left: 200px">
          <div class="form"><el-icon style="padding-right:100px;"></el-icon>
            <span class="text" style="width: 69px;height: 26px;font-size: 16px;
            font-family: Microsoft YaHei-Regular, Microsoft YaHei; color: #EBA4AA;">新申请</span>
          </div>
        </el-button>
        </el-button> -->
      </div>
    </h1>
@@ -99,16 +99,16 @@
    </el-form>
    <el-row :gutter="10" class="mb8">
      <!-- <el-col :span="1.5">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:role:add']"
          @click="newRequest"
          v-hasPermi="['person:information:memo']"
        >新增</el-button>
      </el-col> -->
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -253,12 +253,12 @@
        <el-form-item label="开始时间" prop="startTime">
          <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd HH:mm:ss"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="结束时间" prop="endTime">
          <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="请选择日期"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd"
                          :editable="false" :clearable="false" :style="{width: '100%'}"  value-format="yyyy-MM-dd HH:mm:ss"
          ></el-date-picker>
        </el-form-item>
ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -23,10 +23,10 @@
              <el-form-item label="开始时间" prop="startTime" label-width="80px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-date-picker v-if="!dsb" v-model="formData.startTime" type="datetime" placeholder="选择日期时间" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb">
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
                </el-date-picker>
                <el-date-picker v-if="dsb" v-model="formData.startTime" type="datetime" placeholder="" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb">
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
                </el-date-picker>
              </el-form-item>
            </el-cow>
@@ -34,10 +34,10 @@
              <el-form-item label="结束时间" prop="endTime" label-width="80px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-date-picker v-if="!dsb" v-model="formData.endTime" type="datetime" placeholder="选择日期时间" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb">
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
                </el-date-picker>
                <el-date-picker v-if="dsb" v-model="formData.endTime" type="datetime" placeholder="" align="right"
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb">
                  :picker-options="pickerOptions" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd HH:mm:ss">
                </el-date-picker>
              </el-form-item>
            </el-cow>