fix:预定页面调整

src/views/ofm/booking_form.vue

@@ -7,13 +7,15 @@
         ref="addForm"
         label-width="100px"
       > 
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" clearable></el-input>
-        </el-form-item>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="会议名称" prop="title">
+              <el-input v-model="form.title" clearable placeholder="请输入会议名称"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="会议室" prop="mroom">
-              <el-select v-model="form.mroom" placeholder="请选择" @change="mRoomChange" style="width: 100%;">
+              <el-select v-model="form.mroom" placeholder="请选择会议室" @change="mRoomChange" style="width: 100%;">
                 <el-option 
                   v-for="item in mRoomList"
                   :key="item.id"
@@ -24,8 +26,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="时间" prop="mdate">
+            <el-form-item label="参会领导" prop="key_participants">
-              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;"/>
+              <el-input v-model="form.key_participants" clearable placeholder="请输入参会领导"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="会议人数" prop="participant_count">
+              <el-input-number v-model="form.participant_count" clearable style="width: 100%;" :precision="0" :step="1" min="1"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="会议时间" prop="mdate">
+              <el-date-picker v-model="form.mdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议时间"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注">
+              <el-input v-model="form.title" clearable placeholder="备注"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -41,7 +58,7 @@
             :workflow_key="'booking'" 
             :title="bookingTitle" 
             :t_id="form.id" 
-            :ticketId="form.ticket"
+            :ticket_="form.ticket_"
             @success="()=>{$emit('success')}" 
             :submit_b_func="submit_b_func" 
             ref="ticketd_b_start"
@@ -50,7 +67,7 @@
 			</el-footer>
     </el-main>
     <el-aside width="20%" v-if="form.ticket">
-			<ticketd :ticket_full_data="form.ticket_" @success="$emit('success')"></ticketd>
+			<ticketd :ticket_="form.ticket_" @success="$emit('success')"></ticketd>
 		</el-aside>
   </el-container>
 </template>
@@ -98,11 +115,15 @@ export default {
       },
       //表单数据
       form: {
+        note: "",
         mroom: "",
         mdate: "",
         title: "",
         slots: [],
-        ticket_: null
+        ticket_: null,
+        belong_dept: "",
+        participant_count: 0,
+        key_participants: "",
       },
       //验证规则
       rules: {
@@ -168,7 +189,10 @@ export default {
     let that = this;
     that.getmRoomList();
     that.getTid();
-    if(that.type=='edit'){
+    if(that.type=='add'){
+      that.form.belong_dept = that.$TOOL.data.get("USER_INFO").dept_id;
+    }
+    if(that.type=='edit'||that.type=='show'){
       that.form = that.bookingIitem;
       that.mroomName = that.bookingIitem.mroom_name;
       that.bookingTitle = that.mroomName+"预定";

src/views/ofm/mroombooking.vue

@@ -41,10 +41,17 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="250">
           <template #default="scope">
+             <el-button
+              link
+              size="small"
+              type="primary"
+              @click="handleShow(scope.row)"
+            >查看</el-button>
             <el-button
               link
               size="small"
               type="primary"
+              v-if="scope.row.ticket_.state_.type==1"
               @click="handleEidt(scope.row)"
             >编辑</el-button>
             <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
@@ -63,7 +70,7 @@
       :editId="editId"
       :bookingIitem="bookingIitem"
       @success="handleSuccess" 
-      @cancel="handleCancel"
+      @closed="handleCancel"
     ></bookingDialog>
   </el-drawer>
 </template>
@@ -107,6 +114,10 @@ export default {
     handleCancel() {
       this.limitedVisible = false; 
     },
+    handleSuccess(){
+      this.$refs.table.refresh();
+      this.limitedVisible = false;
+    },
     handleEidt(row) {
       let that = this;
       that.type = "edit";
@@ -114,6 +125,13 @@ export default {
       that.bookingIitem = row;
       that.limitedVisible = true;
     },
+    handleShow(row){
+       let that = this;
+      that.type = "show";
+      that.editId = row.id;
+      that.bookingIitem = row;
+      that.limitedVisible = true;
+    },
     async handleDel(row) {
       var id = row.id;
       var res = await this.$API.ofm.mroombooking.delete.req(id);

src/views/wpm_bx/handover_form.vue

@@ -672,6 +672,7 @@ export default {
 					if(that.mtype==30){
 						that.form.recive_mgroup = that.form.send_mgroup;
 					}
+					that.form.mtype=that.mtype;
 					//合批、分批、报废，这三个交接操作直接创建并提交
 					if(that.mtype==20||that.mtype==30||that.type==40){
 						that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {