修改冲突

src/views/caseManagement/caseList.vue

@@ -738,7 +738,7 @@ export default {
       this.form = row;
       this.visible = true;
       this.dialogtitle = "立案详情";
-      this.getInfo(row);
+      // this.getInfo(row);
     },
     // 案件日志
     caselogRow(row) {
@@ -777,10 +777,10 @@ export default {
     editRow(row) {
       this.flag = "1";
       this.form = row;
-      console.log(this.form)
+      // console.log(this.form)
       this.visible = true;
       this.dialogtitle = "立案修改";
-      this.getInfo(row);
+      // this.getInfo(row);
     },
     // 列表提交立案
     onsubmitRow(row) {
@@ -932,7 +932,7 @@ export default {
       console.log(row, "开庭审理");
       this.showtrialincourt = true;
       this.form = row;
-      this.getInfo(row);
+      // this.getInfo(row);
     },
     canceltrialincourt() {
       this.showtrialincourt = false;

src/views/caseManagement/components/caseCompressionPackage.vue

@@ -47,6 +47,16 @@
               <el-option v-for="dict in templateList" :key="dict.id" :label="dict.temName" :value="dict.id"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item :span="24" label="申请人类型" prop="applicantType">
+            <el-select v-model="form.applicantType" placeholder="请选择">
+              <el-option v-for="item in appList" :key="item.id" :label="item.temName" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :span="24" label="被申请人类型" prop="resType">
+            <el-select v-model="form.resType" placeholder="请选择">
+              <el-option v-for="item in resList" :key="item.id" :label="item.temName" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -69,15 +79,26 @@ export default {
       //   key: value,
       form: {},
       fileList: [],
+      appList: [
+        { id: 1, temName: "自然人" },
+        { id: 2, temName: "机构" },
+      ],
+      resList: [
+        { id: 1, temName: "自然人" },
+        { id: 2, temName: "机构" },
+      ],
       templateList: [],
       loadingSubmit:false,
       rules: {
-        // upload: [
-        //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
-        // ],
         templateId: [
           { required: true, message: "裁决书模板不能为空", trigger: "blur" },
         ],
+        applicantType: [
+          { required: true, message: "申请人类型不能为空", trigger: "blur" },
+        ],
+        resType: [
+          { required: true, message: "被申请人类型不能为空", trigger: "blur" },
+        ],
       },
       paramsData:{
         // templateId:this.form.templateId
@@ -112,8 +133,9 @@ export default {
   },
   methods: {
     submitForm() {
-      
       this.paramsData.templateId = this.form.templateId;
+      this.paramsData.applicantType = this.form.applicantType;
+      this.paramsData.resType = this.form.resType;
       this.$refs["form"].validate((valid) => {
          this.loadingSubmit = true
         if (valid) {
@@ -126,7 +148,6 @@ export default {
     // 获取裁决书模板
     getTemplateFn(data) {
       getTemplate(data).then(res => {
-        console.log(res.rows, "KKKKKKKKKKKKKKKKKKKKKKK");
         this.templateList = res.rows;
       })
     },
@@ -146,7 +167,6 @@ export default {
     },
     // 下载模板 importTemplate
     downloadTemplate() {
-      //   console.log("下载模板");
       this.download(
         "caseApplication/uploadCaseZipFile",
         {},
@@ -159,7 +179,6 @@ export default {
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
-      //   this.upload.open = false;
       this.$emit("cancelCompreess");
       this.upload.isUploading = false;
       this.$refs.uploadZipBatch.clearFiles();
@@ -183,8 +202,6 @@ export default {
           { dangerouslyUseHTMLString: true }
         )
       }
-
-      
     },
     onError(){
       this.loadingSubmit = false

src/views/caseManagement/components/choosetrialmethodDaiog.vue

@@ -8,11 +8,11 @@
       @close="cancel"
       :destroy-on-close="true"
     >
-        <div v-show="choosetrialmethodata.arbitraMethodIssame!=2">
+        <div v-show="formData.arbitraMethodIssame!=2">
           <el-descriptions>
             <el-descriptions-item label="当前仲裁方式：">
               <el-tag size="small">{{
-                choosetrialmethodata.arbitratMethodName
+                formData.arbitratMethodName
               }}</el-tag>
             </el-descriptions-item>
           </el-descriptions>
@@ -41,8 +41,8 @@
               >
           </div>
         </div>
-        <div v-show="choosetrialmethodata.arbitraMethodIssame==2">
-          <div>{{choosetrialmethodata.arbitratMethodIllustrate}}</div>
+        <div v-show="formData.arbitraMethodIssame==2">
+          <div>{{formData.arbitratMethodIllustrate}}</div>
           <el-form :model="form" :rules="rules" ref="form">
             <el-form-item label="选择开庭方式"  prop="arbitratMethod">
                 <el-radio-group v-model="form.arbitratMethod">
@@ -62,6 +62,7 @@
 
 <script>
 import { arbitrateMethod } from "@/api/caseManagement/caseManagement.js";
+import { selectCaseApply } from "@/api/caseAccess/caseEntry";
 export default {
   name: "showchoosetrialmethodDialog",
   props: ["showchoosetrialmethod", "choosetrialmethodata", "queryParams"],
@@ -73,9 +74,24 @@ export default {
         arbitratMethod: [
             { required: true, message: '请选择开庭方式', trigger: 'change' }
           ]
-      }
+      },
+      formData:{}
     };
   },
+  watch:{
+    showchoosetrialmethod(val){
+      if(val){
+        let params = {
+        id: this.choosetrialmethodata.id,
+        version: this.choosetrialmethodata.version
+      }
+        selectCaseApply(params).then(res=>{
+          console.log(res,"PPPPPPPPPPPPPPPPPPPPPPPPPPPPP");
+          this.formData = res.data;
+        })
+      }
+    }
+  },
   methods: {
     // 审核仲裁方式 arbitrateMethod
     submitForm(val) {
@@ -83,8 +99,8 @@ export default {
         opinion: val
       };
       let id = {
-        id: this.choosetrialmethodata.id,
-        arbitratMethod:this.choosetrialmethodata.arbitratMethod
+        id: this.formData.id,
+        arbitratMethod:this.formData.arbitratMethod
       };
       arbitrateMethod(paramsdata,id)
         .then((res) => {

src/views/caseManagement/components/judgmentInformation.vue

@@ -364,16 +364,6 @@ export default {
         this.$emit("getcaseApply", this.queryParams);
         this.$message("成功");
       })
-    },
-    // 重新生成裁决书
-    getRegenerationDocument(params) {
-      regenerationDocument(params).then(res => {
-        console.log(res.data, "重新生成裁决书");
-        this.awardFileArr = [];
-        this.awardPathArr = [];
-        this.awardFileArr[0] = res.data.annexName;
-        this.awardPathArr[0] = res.data.annexPath;
-      })
     },
         // 上传裁决书
     UploadUrls() {

src/views/caseManagement/components/trialincourtDialog.vue

@@ -1,69 +1,40 @@
 <template>
   <div>
-    <el-dialog
-      title="开庭审理"
-      :visible="showtrialincourt"
-      @close="cancel"
-      :destroy-on-close="true"
-    >
+    <el-dialog title="开庭审理" :visible="showtrialincourt" @close="cancel" :destroy-on-close="true">
       <el-form ref="form" :model="formData" label-width="180px">
         <div class="caseInfo">案件信息：</div>
         <el-divider></el-divider>
         <el-row>
           <el-col :span="12">
             <el-form-item label="案件编号：" prop="caseNum">
-              <el-input
-                v-model="formData.caseNum"
-                placeholder="请输入案件编号"
-                :disabled="true"
-              />
+              <el-input v-model="formData.caseNum" placeholder="请输入案件编号" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请人：" prop="applicantName">
-              <el-input
-                v-model="adjudicatename.applicantName"
-                :disabled="true"
-              />
+              <el-input v-model="formData.applicantName" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="被申请人：" prop="respondentName">
-              <el-input
-                v-model="adjudicatename.respondentName"
-                :disabled="true"
-              />
+              <el-input v-model="formData.respondentName" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="借款开始日期：" prop="loanStartDate">
-              <el-date-picker
-                v-model="formData.loanStartDate"
-                type="datetime"
-                placeholder="借款开始日期"
-                :disabled="true"
-              >
+              <el-date-picker v-model="formData.loanStartDate" type="datetime" placeholder="借款开始日期" :disabled="true">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="借款结束日期：" prop="loanEndDate">
-              <el-date-picker
-                v-model="formData.loanEndDate"
-                type="datetime"
-                placeholder="借款结束日期"
-                :disabled="true"
-              >
+              <el-date-picker v-model="formData.loanEndDate" type="datetime" placeholder="借款结束日期" :disabled="true">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="案件标的：" prop="caseSubjectAmount">
-              <el-input
-                v-model="formData.caseSubjectAmount"
-                placeholder="请输入案件标的"
-                :disabled="true"
-              />
+              <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" :disabled="true" />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -76,20 +47,12 @@
         </el-col> -->
           <el-col :span="12">
             <el-form-item label="仲裁费用：" prop="feePayable">
-              <el-input
-                v-model="adjudicatename.feePayable"
-                placeholder="请输入仲裁费用"
-                :disabled="true"
-              />
+              <el-input v-model="formData.feePayable" placeholder="请输入仲裁费用" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="申请人主张欠本金：" prop="claimPrinciOwed">
-              <el-input
-                v-model="formData.claimPrinciOwed"
-                placeholder="请输入"
-                :disabled="true"
-              />
+              <el-input v-model="formData.claimPrinciOwed" placeholder="请输入" :disabled="true" />
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">
@@ -99,31 +62,18 @@
         </el-col> -->
           <el-col :span="12">
             <el-form-item label="案件状态：" prop="caseStatus">
-              <el-input
-                v-model="formData.caseStatusName"
-                placeholder="请输入"
-                :disabled="true"
-              />
+              <el-input v-model="formData.caseStatusName" placeholder="请输入" :disabled="true" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="仲裁员：" prop="arbitratorName">
-              <el-input
-                v-model="adjudicatename.arbitratorName"
-                placeholder="请输入"
-                :disabled="true"
-              />
+              <el-input v-model="formData.arbitratorName" placeholder="请输入" :disabled="true" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="开庭日期：" prop="hearDate">
-              <el-date-picker
-                v-model="adjudicatename.hearDate"
-                type="datetime"
-                placeholder="开庭日期"
-                :disabled="true"
-              >
+              <el-date-picker v-model="formData.hearDate" type="datetime" placeholder="开庭日期" :disabled="true">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -165,11 +115,7 @@
         </el-col>
         <el-col :span="24" v-if="recordArr.length > 0">
           <el-form-item label="庭审笔录：">
-            <div
-              v-for="(item, index) in recordArr"
-              :key="index"
-              style="color: blue"
-            >
+            <div v-for="(item, index) in recordArr" :key="index" style="color: blue">
               <a href="#" @click="toFile2(item, index)">{{ item.annexName }}</a>
             </div>
           </el-form-item>
@@ -186,23 +132,10 @@
         </el-col>
         <el-col :span="24" v-if="submitFlag">
           <el-form-item label="上传裁决书:">
-            <el-upload
-              class="upload-demo"
-              accept=".doc,.docx"
-              ref="upload"
-              :action="UploadUrls()"
-              :headers="headers"
-              :data="filedatas"
-              :before-remove="beforeRemoves"
-              :limit="2"
-              :on-change="beforeUpload"
-              :on-success="handlSuccessAw"
-              :file-list="fileListAw"
-              :before-upload="beforeAvatarUploads"
-            >
-              <el-button slot="trigger" size="small" type="primary"
-                >选取文件</el-button
-              >
+            <el-upload class="upload-demo" accept=".doc,.docx" ref="upload" :action="UploadUrls()" :headers="headers"
+              :data="filedatas" :before-remove="beforeRemoves" :limit="2" :on-change="beforeUpload"
+              :on-success="handlSuccessAw" :file-list="fileListAw" :before-upload="beforeAvatarUploads">
+              <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
               <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
               <div slot="tip" class="el-upload__tip">
                 只能上传.doc，docx文件
@@ -212,23 +145,10 @@
         </el-col>
         <el-col :span="24" v-if="submitFlag">
           <el-form-item label="上传庭审笔录:">
-            <el-upload
-              class="upload-demo"
-              ref="fileupload"
-              accept=".doc,.docx"
-              :action="UploadUrlsT()"
-              :on-success="handlSuccess"
-              :on-remove="handleRemove"
-              :on-preview="handlePreview"
-              :before-remove="beforeRemove"
-              :headers="headers"
-              :data="filedata"
-              multiple
-              :limit="3"
-              :on-exceed="handleExceed"
-              :before-upload="beforeAvatarUpload"
-              :file-list="fileList"
-            >
+            <el-upload class="upload-demo" ref="fileupload" accept=".doc,.docx" :action="UploadUrlsT()"
+              :on-success="handlSuccess" :on-remove="handleRemove" :on-preview="handlePreview"
+              :before-remove="beforeRemove" :headers="headers" :data="filedata" multiple :limit="3"
+              :on-exceed="handleExceed" :before-upload="beforeAvatarUpload" :file-list="fileList">
               <el-button type="primary" size="small">选择文件</el-button>
               <div slot="tip" class="el-upload__tip">
                 文件支持上传.doc，docx文件
@@ -239,33 +159,15 @@
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary">发起会议</el-button>
-      <el-button
-        @click="openArbitrationresults"
-        type="primary"
-        v-if="this.awardArr.length <= 0 && submitFlag"
-        >确认会议结果</el-button>
+      <el-button @click="openArbitrationresults" type="primary"
+        v-if="this.awardArr.length <= 0 && submitFlag">确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          class="endbutton"
-          :disabled="
-            (showsubmit && recordArr.length == 0) || form2.isAbsence == 1
-          "
-          @click="submitResults"
-          :loading="loadingSub"
-          v-if="submitFlag"
-          >提交</el-button
-        >
-        <el-button @click="cancel" class="endbutton1"
-          ><span>关 闭</span></el-button
-        >
+        <el-button class="endbutton" :disabled="(showsubmit && recordArr.length == 0) || form2.isAbsence == 1
+      " @click="submitResults" :loading="loadingSub" v-if="submitFlag">提交</el-button>
+        <el-button @click="cancel" class="endbutton1"><span>关 闭</span></el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="庭审笔录"
-      :visible="showArbitrationresults"
-      @close="closeArbitrationresults"
-      center
-    >
+    <el-dialog title="庭审笔录" :visible="showArbitrationresults" @close="closeArbitrationresults" center>
       <el-form ref="form2" :model="form2" label-width="150px">
         <!-- <el-col :span="12">
           <el-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
@@ -281,16 +183,12 @@
           </el-form-item>
         </el-col> -->
         <el-col :span="24">
-          <el-form-item
-            label="被申请人是否缺席："
-            prop="appliIsAbsen"
-            :rules="[
-              {
-                required: true,
-                message: '请输入',
-              },
-            ]"
-          >
+          <el-form-item label="被申请人是否缺席：" prop="appliIsAbsen" :rules="[
+      {
+        required: true,
+        message: '请输入',
+      },
+    ]">
             <el-radio-group v-model="form2.appliIsAbsen">
               <el-radio :label="1">是</el-radio>
               <el-radio :label="0">否</el-radio>
@@ -298,16 +196,12 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item
-            label="申请人是否缺席："
-            prop="isAbsence"
-            :rules="[
-              {
-                required: true,
-                message: '请输入',
-              },
-            ]"
-          >
+          <el-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
+      {
+        required: true,
+        message: '请输入',
+      },
+    ]">
             <el-radio-group v-model="form2.isAbsence">
               <el-radio :label="1">是</el-radio>
               <el-radio :label="0">否</el-radio>
@@ -315,29 +209,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item
-            label="被申请人对上述材料的质证意见"
-            prop="respondentOpinion"
-          >
-            <el-input
-              type="textarea"
-              :autosize="{ minRows: 6 }"
-              v-model="form2.respondentOpinion"
-              placeholder="请输入"
-            />
+          <el-form-item label="被申请人对上述材料的质证意见" prop="respondentOpinion">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.respondentOpinion" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item
-            label="申请人对上述材料的质证意见"
-            prop="applicantOpinion"
-          >
-            <el-input
-              type="textarea"
-              :autosize="{ minRows: 6 }"
-              v-model="form2.applicantOpinion"
-              placeholder="请输入"
-            />
+          <el-form-item label="申请人对上述材料的质证意见" prop="applicantOpinion">
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.applicantOpinion" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <!-- <el-col :span="24">
@@ -445,16 +323,9 @@
         </el-col> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          @click="submitForm"
-          class="endbutton"
-          :loading="loadingSubmit"
-        >
-          <span>确定</span></el-button
-        >
-        <el-button @click="closeArbitrationresults" class="endbutton1"
-          ><span>取 消</span></el-button
-        >
+        <el-button @click="submitForm" class="endbutton" :loading="loadingSubmit">
+          <span>确定</span></el-button>
+        <el-button @click="closeArbitrationresults" class="endbutton1"><span>取 消</span></el-button>
       </div>
     </el-dialog>
   </div>
@@ -488,8 +359,8 @@ export default {
       },
       filedatas: {
         annexType: 3,
-        officeFlag:1,
-        caseId:null
+        officeFlag: 1,
+        caseId: null
       },
       upLife: "",
       user: "",
@@ -509,27 +380,34 @@ export default {
       roomId: null,
       startTime: "",
       fileList: [],
-      fileListAw:[],
+      fileListAw: [],
       loadingSubmit: false,
-      loadingSub:false,
+      loadingSub: false,
     };
   },
   watch: {
     showtrialincourt: {
       handler(val) {
         if (val) {
+          let val = {
+            id: this.form.id,
+            version: this.form.version,
+          };
+          selectCaseApply(val).then(res => {
+            this.formData = res.data;
+          })
           this.reserveConferenceListFn({ caseId: this.form.id });
           this.getUser();
-          this.formData = this.form;
+          // this.formData = this.form;
           console.log(this.formData);
           this.applicateArr = [];
           this.quiltArr = [];
           this.awardArr = [];
           this.recordArr = [];
           setTimeout(() => {
-            console.log(this.adjudicatename);
-            if (this.adjudicatename.caseAttachList.length > 0) {
-              this.adjudicatename.caseAttachList.forEach((item) => {
+            console.log(this.formData);
+            if (this.formData.caseAttachList.length > 0) {
+              this.formData.caseAttachList.forEach((item) => {
                 // 申请人案件附件
                 if (item.annexType == 2) {
                   this.applicateArr.push({
@@ -562,11 +440,11 @@ export default {
       },
     },
   },
-  created() {},
+  created() { },
   methods: {
     // 根据案件id和用户id查询当前登陆人是否为仲裁员
-    secretaryRoleByUserIdFn(data){
-      secretaryRoleByUserId(data).then(res=>{
+    secretaryRoleByUserIdFn(data) {
+      secretaryRoleByUserId(data).then(res => {
         this.submitFlag = res.data.isSecretaryRole;
       })
     },
@@ -614,7 +492,7 @@ export default {
       getUserProfile().then((response) => {
         this.user = response.data.userName;
         this.userId = response.data.userId;
-        this.secretaryRoleByUserIdFn({caseId:this.form.id,userId:this.userId})
+        this.secretaryRoleByUserIdFn({ caseId: this.form.id, userId: this.userId })
       });
     },
     // 打开会议
@@ -628,7 +506,7 @@ export default {
     // 提交仲裁结果
     openArbitrationresults() {
       this.showArbitrationresults = true;
-      
+
     },
     closeArbitrationresults() {
       this.showArbitrationresults = false;
@@ -640,33 +518,12 @@ export default {
           this.loadingSubmit = true;
           creatTrialRecordnew({
             caseAppliId: this.formData.id,
-            // evidenDetermi: this.form2.evidenDetermi,
-            // factDetermi: this.form2.factDetermi,
-            // caseSketch: this.form2.caseSketch,
-            // arbitrateThink: this.form2.arbitrateThink,
-            // rulingFollows: this.form2.rulingFollows,
-            // isAbsence: this.form2.isAbsence,
-            // appliIsAbsen: this.form2.appliIsAbsen,
-            // responCrossOpin: this.form2.responCrossOpin,
-            // applicaCrossOpin: this.form2.applicaCrossOpin,
-            // responDefenOpini: this.form2.responDefenOpini,
             isAbsence: this.form2.isAbsence,
             appliIsAbsen: this.form2.appliIsAbsen,
             respondentOpinion: this.form2.respondentOpinion,
             applicantOpinion: this.form2.applicantOpinion,
-            // caseFacts: this.form2.caseFacts,
-            // caseFocus: this.form2.caseFocus
           })
             .then((res) => {
-              // console.log(res);
-              // res.data.caseAttachList.forEach((item) => {
-              //   if (item.annexType == 7) {
-              //     this.recordArr.push({
-              //       annexName: item.annexName,
-              //       annexPath: item.annexPath,
-              //     });
-              //   }
-              // });
               this.$modal.msgSuccess("提交成功");
               this.showsubmit = false;
               this.closeArbitrationresults();
@@ -678,17 +535,17 @@ export default {
                 id: this.form.id,
                 version: this.form.version,
               };
-              this.awardArr =[];
+              this.awardArr = [];
               selectCaseApply(val).then((res) => {
-                this.adjudicatename.caseAttachList = res.data.caseAttachList;
-                 this.adjudicatename.caseAttachList.forEach(item=>{
-                  if(item.annexType==3){
+                this.formData.caseAttachList = res.data.caseAttachList;
+                this.formData.caseAttachList.forEach(item => {
+                  if (item.annexType == 3) {
                     this.awardArr.push(item);
                   }
-                 })
-                
+                })
+
               });
-             
+
             })
             .catch((err) => {
               this.loadingSubmit = false;
@@ -701,14 +558,14 @@ export default {
     },
     // 提交开庭审理结果
     submitResults() {
-      if (this.fileList.length == 0&&this.recordArr.length==0) {
+      if (this.fileList.length == 0 && this.recordArr.length == 0) {
         this.$message({
           showClose: true,
           message: "请先上传案件笔录",
           type: "warning",
         });
       } else {
-        this.loadingSub=true;
+        this.loadingSub = true;
         let id = this.formData.id;
         changeCaseStatus({
           id: id,
@@ -719,36 +576,36 @@ export default {
             this.loadingSub = false
             this.fileList = [];
           }
-        }).catch((err)=>{
-            this.loadingSub = false
+        }).catch((err) => {
+          this.loadingSub = false
         });
       }
     },
     // 文件上传成功
     handlSuccess(res, file) {
       // this.fileList.push(file);
-       let val = {
-                id: this.form.id,
-                version: this.form.version,
-              };
-              this.recordArr =[];
-              selectCaseApply(val).then((res) => {
-                this.adjudicatename.caseAttachList = res.data.caseAttachList;
-                 this.adjudicatename.caseAttachList.forEach(item=>{
-                  if(item.annexType==7){
-                    this.recordArr.push({
-                    annexName: item.annexName,
-                    annexPath: item.annexPath,
-                  });
-                  }
-                 })
-                
-              });
-      
+      let val = {
+        id: this.form.id,
+        version: this.form.version,
+      };
+      this.recordArr = [];
+      selectCaseApply(val).then((res) => {
+        this.formData.caseAttachList = res.data.caseAttachList;
+        this.formData.caseAttachList.forEach(item => {
+          if (item.annexType == 7) {
+            this.recordArr.push({
+              annexName: item.annexName,
+              annexPath: item.annexPath,
+            });
+          }
+        })
+
+      });
+
     },
     // 文件列表移除文件时的钩子
-    handleRemove(file, fileList) {},
-    handlePreview(file) {},
+    handleRemove(file, fileList) { },
+    handlePreview(file) { },
     // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
@@ -756,8 +613,7 @@ export default {
     // 文件超出个数限制时的钩子
     handleExceed(files, fileList) {
       this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length
         } 个文件`
       );
     },
@@ -771,7 +627,7 @@ export default {
     UploadUrlsT() {
       return window.location.origin + "/API/evidence/uploadRecord";
     },
-    beforeRemoves(file,fileList){
+    beforeRemoves(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     beforeUpload(flie, fileList) {
@@ -780,22 +636,22 @@ export default {
     // 上传文件成功
     handlSuccessAw(res, file) {
       // this.fileListAw.push(file);
-              let val = {
-                id: this.form.id,
-                version: this.form.version,
-              };
-              this.awardArr =[];
-              selectCaseApply(val).then((res) => {
-                this.adjudicatename.caseAttachList = res.data.caseAttachList;
-                 this.adjudicatename.caseAttachList.forEach(item=>{
-                  if(item.annexType==3){
-                    this.awardArr.push(item);
-                  }
-                 })
-                
-              });
+      let val = {
+        id: this.form.id,
+        version: this.form.version,
+      };
+      this.awardArr = [];
+      selectCaseApply(val).then((res) => {
+        this.formData.caseAttachList = res.data.caseAttachList;
+        this.formData.caseAttachList.forEach(item => {
+          if (item.annexType == 3) {
+            this.awardArr.push(item);
+          }
+        })
+
+      });
     },
-    beforeAvatarUploads(){
+    beforeAvatarUploads() {
       this.filedatas.caseId = this.formData.id;
     }
   },

src/views/deliveryRecord/components/emailEdits.vue

@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <el-dialog title="邮件内容" :visible="emailVidable"  @close="cancel" center
+            :distroy-on-close="true">
+            <div>
+                <el-form>
+                    <el-col :span="24">
+                        <el-form-item label="邮件主题：" label-width="100px">
+                           <div>主题</div>
+                        </el-form-item>
+                    </el-col>
+                     <el-col :span="12">
+                        <el-form-item label="收件人：" label-width="100px">
+                           <div>收件人</div>
+                        </el-form-item>
+                    </el-col>
+                     <el-col :span="12">
+                        <el-form-item label="发件人：" label-width="100px">
+                           <div>发件人</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="邮件附件：" label-width="100px">
+                           <div  style="color: blue; cursor: pointer" @click="viewAttachments">附件</div>
+                        </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="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    updateSendContent,update
+} from "@/api/deliveryRecord/deliveryRecord.js";
+export default {
+    props: ["emailVidable", "emailRow","queryParams"],
+    data() {
+        return {
+            sendData:'',
+            fileURL: window.location.origin + "/API",
+        };
+    },
+    watch: {
+        emailVidable(val){
+            if(val){
+                this.sendData = this.emailRow.mailContent;
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelEmail");
+        },
+        submitSend() {
+            console.log(this.emailRow.mailContent)
+            this.updateSendContentFn({
+                id:this.emailRow.id,
+                mailContent:this.sendData
+            })
+        },
+        updateSendContentFn(data){
+            update(data).then(res=>{
+                this.$message.success('更新成功');
+                this.$emit("cancelEmail");
+                this.$emit('getList',this.queryParams);
+            })
+        },
+        // 查看附件下载附件
+        viewAttachments(val){
+            window.open(this.fileURL + val);
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/deliveryRecord/components/resend.vue

@@ -1,69 +1,69 @@
-<template>
-    <div>
-        <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
-            :distroy-on-close="true">
-            <div style="margin-bottom: 30px;"><span style="font-weight: bold;">发送内容:</span>{{ sendData }}</div>
-            <el-form label-width="100px">
-                <el-form-item v-for="(item,index) in rowData.templateParams" :label="item.paramName" :key="item.id"> 
-                    <el-input v-model="rowData.templateParams[index].paramValue" @input="changeContent"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
-                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    updateSendContent,
-} from "@/api/deliveryRecord/deliveryRecord.js";
-export default {
-    props: ["resendVidable", "rowData","queryParams"],
-    data() {
-        return {
-            sendData:'',
-            param:"",
-            paramValue:""
-
-        };
-    },
-    watch: {
-        resendVidable(val){
-            if(val){
-                this.sendData = this.rowData.sendContent;
-            }
-        }
-    },
-    methods: {
-        cancel() {
-            this.$emit("cancelSend");
-        },
-        submitSend() {
-            console.log(this.rowData)
-            this.updateSendContentFn({
-                id:this.rowData.id,
-                templateParams:this.rowData.templateParams
-            })
-        },
-        updateSendContentFn(data){
-            updateSendContent(data).then(res=>{
-                this.$message.success('更新成功');
-                this.$emit("cancelSend");
-                this.$emit('getList',this.queryParams);
-            })
-        },
-        changeContent(){
-            let templateContent = this.rowData.templateContent
-            this.rowData.templateParams.forEach(item => {
-                templateContent = templateContent.replace(item.param,item.paramValue)
-            });
-           this.sendData = templateContent
-        }
-    },
-};
-</script>
-
+<template>
+    <div>
+        <el-dialog title="修改内容" :visible="resendVidable" v-if="resendVidable" @close="cancel" center
+            :distroy-on-close="true">
+            <div style="margin-bottom: 30px;"><span style="font-weight: bold;">发送内容:</span>{{ sendData }}</div>
+            <el-form label-width="100px">
+                <el-form-item v-for="(item,index) in rowData.templateParams" :label="item.paramName" :key="item.id"> 
+                    <el-input v-model="rowData.templateParams[index].paramValue" @input="changeContent"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
+                <el-button @click="submitSend" class="endbutton1" type="primary" round><span>确 认</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    updateSendContent,
+} from "@/api/deliveryRecord/deliveryRecord.js";
+export default {
+    props: ["resendVidable", "rowData","queryParams"],
+    data() {
+        return {
+            sendData:'',
+            param:"",
+            paramValue:""
+
+        };
+    },
+    watch: {
+        resendVidable(val){
+            if(val){
+                this.sendData = this.rowData.sendContent;
+            }
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelSend");
+        },
+        submitSend() {
+            console.log(this.rowData)
+            this.updateSendContentFn({
+                id:this.rowData.id,
+                templateParams:this.rowData.templateParams
+            })
+        },
+        updateSendContentFn(data){
+            updateSendContent(data).then(res=>{
+                this.$message.success('更新成功');
+                this.$emit("cancelSend");
+                this.$emit('getList',this.queryParams);
+            })
+        },
+        changeContent(){
+            let templateContent = this.rowData.templateContent
+            this.rowData.templateParams.forEach(item => {
+                templateContent = templateContent.replace(item.param,item.paramValue)
+            });
+           this.sendData = templateContent
+        }
+    },
+};
+</script>
+
 <style lang="scss" scoped></style>

src/views/deliveryRecord/emailRecord.vue

@@ -27,7 +27,14 @@
             <!-- 缴费人 -->
             <!-- <el-table-column label="案件状态" align="center" prop="caseStatusName" /> -->
             <el-table-column label="内容" align="center" prop="mailContent"></el-table-column>
+            <el-table-column label="操作" align="center">
+                <template  slot-scope="scope">
+                    <el-button size="mini" type="text" @click="emailEditing(scope.row)" icon="el-icon-s-promotion">邮箱编辑</el-button>
+                    <el-button v-if="scope.row.sendStatus == '未发送'" size="mini" type="text" @click="resendCounts(scope.row)" icon="el-icon-s-promotion">重新发送</el-button>
+                </template>
+            </el-table-column>
         </el-table>
+        <emailEdits :emailVidable="emailVidable" @cancelEmail="cancelEmail"   @getList="getList" :queryParams="queryParams" :emailRow="emailRow"></emailEdits>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
             @pagination="getList(queryParams)" />
 
@@ -38,12 +45,12 @@
 import {
     emailList,
 } from "@/api/deliveryRecord/deliveryRecord.js";
-
+import emailEdits from "./components/emailEdits.vue";
 import { getDicts } from '@/api/system/dict/data.js'
 export default {
     name: "paymentList",
     dicts: ["case_status"],
-    components: {},
+    components: {emailEdits},
     data() {
         return {
             queryParams: {
@@ -60,6 +67,8 @@ export default {
             // 校验表单
             rules: {},
             dataList: [],
+            emailVidable:false,
+            emailRow:{},
         };
     },
     created() {
@@ -69,6 +78,30 @@ export default {
         })
     },
     methods: {
+         // 邮箱编辑内容
+         emailEditing(data){
+            this.emailVidable = true
+            this.emailRow = data;
+            console.log(data)
+        },
+        // 重新发送
+        resendCounts(row){
+           if(row.sendStatus=='未发送'){
+            row.sendStatus = 0
+           }else if(row.sendStatus=='已发送'){
+            row.sendStatus = 1
+           }
+            reSendMailRecord(row).then(res=>{
+                console.log(res)
+                this.$message.success('发送成功');
+                this.getList(this.queryParams);
+            })
+            
+        },
+        // 关闭弹窗
+        cancelEmail(){
+            this.emailVidable = false
+        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;

src/views/onlyoffice/onlyoffice.vue

@@ -40,8 +40,6 @@ export default {
         .then((res) => {
           this.config = res.data;
           this.config.editorConfig.callbackUrl = this.config.editorConfig.callbackUrl + "/" + id;
-          console.log(this.config,"OOOOOOOOOOOOOOOOOOOOOOOOOOO");
-
           // this.config.callbackUrl = this.config.callbackUrl + `/${this.userId}`;
           var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
         });

vue.config.js

@@ -12,10 +12,10 @@ const name = process.env.VUE_APP_TITLE || '智慧仲裁管理系统' // 网页
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // const API = 'http://121.40.189.20:9001'  //生产
- const API = 'http://121.40.189.20:8001'  //测试
+  // const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://172.16.1.26:8001'  //Bs
 // const API = 'http://192.168.3.77:9001' //Q
-// const API = 'http://172.16.1.26:8001' //W
+const API = 'http://172.16.0.241:8001' //W
 
 // vue.config.js 配置说明 
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions