From 7678c30ff853730d22a0fa374367404af8aea946 Mon Sep 17 00:00:00 2001 From: yz3456 <2753272399@qq.com> Date: 星期五, 03 五月 2024 10:22:16 +0800 Subject: [PATCH] 完成会议审批模块 --- ruoyi-ui/src/views/meeting/index.vue | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ruoyi-ui/src/views/meeting/index.vue b/ruoyi-ui/src/views/meeting/index.vue index c3cb233..1d9187c 100644 --- a/ruoyi-ui/src/views/meeting/index.vue +++ b/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 @@ -177,46 +177,46 @@ scope.row.place ? scope.row.place : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鍙绾充汉鏁�" prop="conPeople" sortable align="center"> + <el-table-column label="鍙绾充汉鏁�" prop="conPeople" sortable align="center" min-width="150"> <template slot-scope="scope">{{ scope.row.conPeople ? scope.row.conPeople : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鍙備笌浜烘暟" prop="partPeople" sortable align="center"> + <el-table-column label="鍙備笌浜烘暟" prop="partPeople" sortable align="center" min-width="120"> <template slot-scope="scope">{{ scope.row.partPeople ? scope.row.partPeople : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center"> + <el-table-column label="鐢宠浜�" prop="applyPerson" sortable align="center" min-width="120"> <template slot-scope="scope">{{ scope.row.applyPerson ? scope.row.applyPerson : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyApart" sortable align="center"> + <el-table-column label="鐢宠閮ㄩ棬鎴栧搴�" prop="applyApart" sortable align="center" min-width="150"> <template slot-scope="scope">{{ scope.row.applyApart ? scope.row.applyApart : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable align="center"> + <el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable align="center"min-width="120"> <template slot-scope="scope">{{ scope.row.startTime ? scope.row.startTime : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable align="center"> + <el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable align="center" min-width="120"> <template slot-scope="scope">{{ scope.row.endTime ? scope.row.endTime : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" sortable align="center"> + <el-table-column label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" sortable align="center" min-width="150"> <template slot-scope="scope">{{scope.row.isPlacebrand===1? '鏄�': '鍚�'}}</template> </el-table-column> - <el-table-column label="鑱旂郴浜�" prop="connPerson" sortable align="center"> + <el-table-column label="鑱旂郴浜�" prop="connPerson" sortable align="center" min-width="100"> <template slot-scope="scope">{{ scope.row.connPerson ? scope.row.connPerson : '鈥斺�斺�斺��' }}</template> </el-table-column> - <el-table-column label="鑱旂郴鐢佃瘽" prop="connPhone" sortable align="center"> + <el-table-column label="鑱旂郴鐢佃瘽" prop="connPhone" sortable align="center" min-width="100"> <template slot-scope="scope">{{ scope.row.connPhone ? scope.row.connPhone : '鈥斺�斺�斺��' }}</template> </el-table-column> @@ -252,13 +252,13 @@ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px"> <el-form-item label="寮�濮嬫椂闂�" prop="startTime"> - <el-date-picker v-model="formDat.startTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡" - :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + <el-date-picker v-model="formDat.startTime" type="datetime" placeholder="璇烽�夋嫨鏃ユ湡" + :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="date" placeholder="璇烽�夋嫨鏃ユ湡" - :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd" + <el-date-picker v-model="formDat.endTime" type="datetime" placeholder="璇烽�夋嫨鏃ユ湡" + :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker> </el-form-item> -- Gitblit v1.9.1