Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

src/api/meeting/index.js

@@ -23,4 +23,12 @@ export function reserveConferenceList(data) {
         params: data
     })
 }
+// 发送房间号短信
+export function sendRoomNoMessage(data) {
+    return request({
+        url: '/caseApplication/sendRoomNoMessage',
+        method: 'post',
+        data: data
+    })
+}
 

src/api/officialSeal/officialSeal.js

@@ -78,7 +78,7 @@ export function updateTemplate(data) {
     return request({
         url: '/deptIdentify/updateTemplate',
         method: 'post',
-        data: data
+        params: data
     })
 }
 // 删除模板

src/views/caseManagement/components/timeDialog.vue

@@ -27,7 +27,7 @@
 <script>
 import { updateHeardate } from '@/api/caseManagement/caseManagement'
 import { getToken } from "@/utils/auth";
-import { createRoomId, reservedConference } from '@/api/meeting/index'
+import { createRoomId, reservedConference, sendRoomNoMessage } from '@/api/meeting/index'
 import moment from "moment";
 export default {
     props: ["timeVisable", "timeData", "queryParams"],
@@ -77,6 +77,12 @@ export default {
                 this.$emit("getcaseApply", this.queryParams);
             })
         },
+        // 发送房间号短信
+        async sendRoomNoMessageFn(data) {
+            sendRoomNoMessage(data).then(res => {
+                console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPP");
+            })
+        },
         async submitTime() {
             this.loanStartDate = moment(
                 this.loanStartDate
@@ -91,6 +97,11 @@ export default {
                 id: this.timeData.id,
                 hearDate: this.loanStartDate
             })
+            await sendRoomNoMessageFn({
+                id: this.timeData.id,
+                roomNo: this.roomId,
+                scheduleStartTime: this.loanStartDate
+            })
         }
     },
 };

src/views/officialSeal/components/editTemplate.vue

@@ -31,6 +31,7 @@
 </template>
 <script>
 import { getToken } from "@/utils/auth";
+import { updateTemplate } from "@/api/officialSeal/officialSeal"
 export default {
     props: ["editVisable", "editData", "queryParams"],
     dicts: ["template_type"],
@@ -41,7 +42,7 @@ export default {
             headers: {
                 Authorization: "Bearer " + getToken(),
             },
-            isImg: false,
+            isImg: true,
             filedata: {},
             flagBtn: false,
             ruleForm: {},
@@ -77,19 +78,32 @@ export default {
         },
         handleChange(file, fileList) {
             this.isImg = file.type === '.doc' || '.docx';
+            this.fileList = fileList;
         },
         UploadUrl() {
             return window.location.origin + "/API/deptIdentify/updateTemplate";
         },
         submitUpload() {
+            let that = this;
             this.$refs['ruleForm'].validate((valid) => {
                 if (valid) {
-                    this.filedata.id = this.editData.id;
+                    if (that.fileList.length > 0) {
-                    this.filedata.temName = this.ruleForm.temName;
+                        that.filedata.id = that.editData.id;
-                    if (this.isImg) {
+                        that.filedata.temName = that.ruleForm.temName;
-                        this.$refs.upload.submit();
+                        if (that.isImg) {
-                    }else{
+                            that.$refs.upload.submit();
-                        this.$message.error('只能上传doc,docx格式的文件')
+                        } else {
+                            that.$message.error('只能上传doc,docx格式的文件')
+                        }
+                    } else {
+                        updateTemplate({
+                            id: that.editData.id,
+                            temName: that.ruleForm.temName
+                        }).then(res => {
+                            that.$message.success('修改成功');
+                            that.$emit("cancelEdit");
+                            that.$emit('getList', that.queryParams);
+                        })
                     }
                 }
             });
@@ -101,7 +115,7 @@ export default {
             // this.isImg = file.type === '.doc' || '.docx'
         },
         handleSuccess() {
-            this.$message.success('上传成功');
+            this.$message.success('修改成功');
             this.$emit("cancelEdit");
             this.$emit('getList', this.queryParams);
         }

src/views/officialSeal/components/uploadSeal.vue

@@ -7,7 +7,7 @@
                     <el-input v-model="ruleForm.sealName"></el-input>
                 </el-form-item>
             </el-form>
-            <el-upload class="avatar-uploader" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload"
+            <el-upload class="avatar-uploader" accept="image/png" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload"
                 :action="UploadUrl()" :headers="headers" :data="filedata" :on-remove="handleRemove"
                 :on-change="handleChange" :show-file-list="false" :file-list="fileList" :auto-upload="false">
                 <img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -47,7 +47,8 @@ export default {
     watch: {
         uploadVisable(val) {
             if (val) {
-                this.imageUrl = ""
+                this.imageUrl = "",
+                this.ruleForm = {}
             }
         }
     },
@@ -86,8 +87,8 @@ export default {
         },
         handleSuccess(response) {
             if (response.code == 200) {
-                this.$message.success('上传成功')
+                this.$message.success('上传成功');
-                this.$emit("cancelUpload");
+                this.cancel()
             } else {
                 this.$message.error(response.msg);
             }