Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

src/views/deliveryRecord/components/emailEdits.vue

@@ -1,14 +1,88 @@
 <template>
   <div>
-        <el-dialog title="编辑内容" :visible="emailVidable"  @close="cancel" center
+    <el-dialog
-            :distroy-on-close="true">
+      title="邮件内容"
+      :visible="emailVidable"
+      @close="cancel"
+      center
+      :distroy-on-close="true"
+    >
       <div>
-                <el-input type="textarea" :rows="6" placeholder="请输入内容" v-model="sendData">
+        <el-form>
-                </el-input>
+          <el-col :span="24">
+            <el-form-item label="邮件主题：" label-width="100px">
+              <div>{{ emailRow.mailSubject }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收件人：" label-width="100px">
+              <div>{{ emailRow.mailAddress }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发件人：" label-width="100px">
+              <div>{{ emailRow.mailFromAddress }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件附件：" label-width="100px">
+              <div
+                style="color: blue; cursor: pointer"
+                v-for="(item, index) in emailRow.caseAttachList"
+                :key="index"
+                @click="viewAttachments(item.annexPath)"
+              >
+                {{ item.annexName }}
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件上传：" label-width="100px">
+              <el-upload
+                class="upload-demo"
+                accept=".doc,.docx,.pdf"
+                ref="upload"
+                :action="UploadUrl()"
+                :headers="headers"
+                :data="filedata"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :limit="1"
+                :on-change="beforeUpload"
+                :on-success="handlSuccess"
+                :file-list="fileList"
+              >
+                <el-button
+                  slot="trigger"
+                  size="small"
+                  type="primary"
+                  >选取文件</el-button
+                >
+                <div slot="tip" class="el-upload__tip">
+                  只能上传.doc，docx，pdf文件
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="邮件正文：" label-width="100px">
+              <el-input
+                type="textarea"
+                :rows="4"
+                placeholder="请输入内容"
+                v-model="sendData"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
+        <el-button @click="cancel" class="endbutton1" round
-                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+          ><span>取 消</span></el-button
+        >
+        <el-button @click="submitSend" class="endbutton1" type="primary" round
+          ><span>确 认</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -16,40 +90,88 @@
 
 <script>
 import {
-    updateSendContent,update
+  updateSendContent,
+  update,
 } from "@/api/deliveryRecord/deliveryRecord.js";
+import { getToken } from "@/utils/auth";
 export default {
   props: ["emailVidable", "emailRow", "queryParams"],
   data() {
     return {
-            sendData:''
+      sendData: "",
+      fileURL: window.location.origin + "/API",
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      filedata: {
+        annexType: 13,
+      },
+      fileList: [],
+      files:[],
     };
   },
   watch: {
     emailVidable(val) {
       if (val) {
+        console.log(this.emailRow);
         this.sendData = this.emailRow.mailContent;
       }
-        }
+    },
   },
   methods: {
     cancel() {
       this.$emit("cancelEmail");
     },
     submitSend() {
-            console.log(this.emailRow.mailContent)
+      console.log(this.emailRow.mailContent);
+      if(this.files.annexId){
         this.updateSendContentFn({
         id: this.emailRow.id,
-                mailContent:this.sendData
+        mailContent: this.sendData,
-            })
+        caseAttachList:[{annexId:this.files.annexId}],
+        
+      });
+      }else{
+        this.updateSendContentFn({
+        id: this.emailRow.id,
+        mailContent: this.sendData,
+        caseAttachList:[],
+        
+      });
+      }
+      
+     
     },
     updateSendContentFn(data) {
-            update(data).then(res=>{
+        console.log(data)
-                this.$message.success('更新成功');
+      update(data).then((res) => {
+        
+        this.$message.success("更新成功");
         this.$emit("cancelEmail");
-                this.$emit('getList',this.queryParams);
+        this.$emit("getList", this.queryParams);
-            })
+         this.$refs.upload.clearFiles(); // 清除文件列表
-        }
+      });
+    },
+    // 查看附件下载附件
+    viewAttachments(val) {
+      window.open(this.fileURL + val);
+    },
+    /**上传地址*/
+    UploadUrl() {
+      return window.location.origin + "/API/common/upload";
+    },
+    handlePreview(file) {},
+    handleRemove(file, fileList) {},
+    beforeUpload(flie, fileList) {
+
+    },
+    handlSuccess(res, file) {
+        
+      const fileSuccess = [{ annexId: res.annexId, annexType: res.annexType,annexName:res.newFileName,annexPath:res.fileName,onlyOfficeFileId:res.onlyOfficeFileId}]
+      this.emailRow.caseAttachList = fileSuccess
+      this.files = res
+       console.log(res)
+    },
   },
 };
 </script>

src/views/deliveryRecord/smsRecord.vue

@@ -36,7 +36,7 @@
         <resend :resendVidable="resendVidable" :rowData="rowData" @getList="getList" @cancelSend="cancelSend" :queryParams="queryParams"></resend>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="getList({ caseNum: queryParams.caseNum }, { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize })" />
+            @pagination="getList({ caseNum: queryParams.caseNum,pageNum: queryParams.pageNum, pageSize: queryParams.pageSize})" />
 
     </div>
 </template>
@@ -74,7 +74,7 @@ export default {
     },
     created() {
         getDicts("case_status").then(res => {
-            this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize});
         })
     },
     methods: {
@@ -100,7 +100,7 @@ export default {
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
-            this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+            this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
         },
         /** 重置按钮操作 */
         resetQuery() {
@@ -108,9 +108,9 @@ export default {
             this.handleQuery();
         },
         // 查询列表数据
-        getList(data, params) {
+        getList(data) {
             this.loading = true;
-            recordList(data, params).then((response) => {
+            recordList(data).then((response) => {
                 this.dataList = response.rows;
                 this.dataList.forEach(item => {
                     if (item.sendStatus == 1) {
@@ -141,7 +141,7 @@ export default {
         reSendShortMessageFn(valuesRow){
             reSendShortMessage(valuesRow).then(res=>{
                 this.$message.success('发送成功');
-                this.getList({ caseNum: this.queryParams.caseNum }, { pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
+                this.getList({ caseNum: this.queryParams.caseNum,pageNum: this.queryParams.pageNum, pageSize: this.queryParams.pageSize });
             })
         }
     },

src/views/login.vue

@@ -124,7 +124,7 @@
     <!--  底部  -->
     <div class="el-login-footer">
       <div>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</div>
-      <div>Version：1.1.3</div>
+      <div>Version：1.1.4</div>
     </div>
   </div>
 </template>