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

src/api/caseFiling/caseFiling.js

@@ -19,4 +19,12 @@ export function videoList(data) {
     method: 'get',
     params: data
   })
-}
+}
+// 下载案件压缩包
+export function downloadCaseZipFile(data) {
+  return request({
+    url: '/caseApplication/downloadCaseZipFile',
+    method: 'post',
+    data: data
+  })
+}

src/api/officialSeal/officialSeal.js

@@ -160,4 +160,12 @@ export function saveFatchRules(data) {
         method: 'post',
         data: data
     })
+}
+// 模板字段列表
+export function getTemplateInfoById(data) {
+    return request({
+        url: '/deptIdentify/getTemplateInfoById',
+        method: 'get',
+        params: data
+    })
 }

src/views/caseFiling/archiveList.vue

@@ -34,9 +34,6 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <!-- <el-row style="margin-bottom:5px;">
-         <el-button type="primary" size="mini" icon="el-icon-download" @click="downloadZips">案件归档</el-button>
-    </el-row> -->
     <el-table v-loading="loading" :data="dataList" style="width: 100%">
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
@@ -59,7 +56,7 @@
             v-if="scope.row.filearbitraUrl && scope.row.filearbitraUrl !== ''"
             @click="showModel(scope.row)">查看裁决书</el-button>
           <el-button size="mini" type="text" icon="el-icon-reading" @click="showDetail(scope.row)">归档详情</el-button>
-          <!-- <el-button type="text" size="mini" icon="el-icon-download" @click="downloadZips(scope.row)">下载案件压缩包</el-button> -->
+          <el-button type="text" size="mini" icon="el-icon-download" @click="downloadZips(scope.row)">下载案件压缩包</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -75,7 +72,7 @@
 <script>
 import { caseApplicationList, selectSignSealUrl,caseApplicationDetail } from "@/api/awardManagement/awardManagement";
 import { caseLogRecordList, logistics } from "@/api/caseManagement/caseManagement";
-import { adjudicationArchives, videoList } from "@/api/caseFiling/caseFiling";
+import { adjudicationArchives, videoList,downloadCaseZipFile} from "@/api/caseFiling/caseFiling";
 import archiveDetailsDialog from "./components/archiveDetailsDialog.vue";
 export default {
   name: "archiveList",
@@ -83,6 +80,7 @@ export default {
   components: { archiveDetailsDialog },
   data() {
     return {
+      fileURL: window.location.origin + "/API",
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -133,7 +131,10 @@ export default {
     },
     // 下在案件归档压缩包
     downloadZips(row){
-      //  console.log(this.download) 
+       downloadCaseZipFile({ id: row.id }).then(res => {
+         let url = this.fileURL+res.data.annexPath
+        window.open(url)
+      })
     },
     // 查询列表数据
     getList(parms) {

src/views/caseManagement/caseList.vue

@@ -231,8 +231,8 @@
       :uploadCaseData="uploadCaseData">
     </uploadCaseDialog>
     <!-- 秘书审核修改页面 -->
-    <caseentryExamineDialog :dialogtitle="dialogtitle" :caseentryExamineVisible="caseentryExamineVisible" :queryParams="queryParams"
-    :getcaseApply="getcaseApply"
+    <caseentryExamineDialog :dialogtitle="dialogtitle" :caseentryExamineVisible="caseentryExamineVisible" :queryParams="queryParams" :afterColumnValues="afterColumnValues"
+    :getcaseApply="getcaseApply" 
     @caseentryExamineCancel="caseentryExamineCancel" :caseentryExamineData="caseentryExamineData" :caseentryExamineDataAll="caseentryExamineDataAll"></caseentryExamineDialog>
     <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams" @cancelCompreess="cancelCompreess"
       :getcaseApply="getcaseApply">
@@ -314,6 +314,8 @@ export default {
       dataList: [],
       // 抓取数据
       columnValues:[],
+      // 审核修改抓取数据
+      afterColumnValues:[],
       // 查询参数
       queryParams: {
         caseNum: undefined,
@@ -690,9 +692,10 @@ export default {
     },
     // 审核案件 selectCompareCase caseentryExamineData
     reviewCase(row) {
-      this.caseentryExamineVisible = true;
+      
       this.dialogtitle = "审核修改详情";
       this.getSelectCompareCase(row)
+     
     },
     // 秘书审核修改页面 caseentryExamineVisible
     caseentryExamineCancel() {
@@ -705,8 +708,11 @@ export default {
         version:val.version
       }
       selectCompareCase(param).then((res) => {
+        this.afterColumnValues = res.data.afterCase.columnValues
+        console.log(this.afterColumnValues+"8888888888")
         this.caseentryExamineData = res.data.afterCase
         this.caseentryExamineDataAll = res.data
+        this.caseentryExamineVisible = true;
       })
     },
     // 审核撤销
@@ -810,7 +816,6 @@ export default {
           }
         });
         this.columnValues = res.data.columnValues;
-        console.log(res.data.columnValues)
         this.caseAttachList = res.data.caseAttachList;
         // console.log(this.caseAttachList,"caseAttachList")
         this.form.requestRule = res.data.requestRule;

src/views/caseManagement/components/caseentryDialog.vue

@@ -88,11 +88,17 @@
           </el-col>
           <!-- 申请人仲裁诉求 -->
           <el-col :span="24">
-            <el-form-item label="申请人仲裁请求及事实和理由" prop="arbitratClaims">
+            <el-form-item label="申请人仲裁请求" prop="arbitratClaims">
               <el-input v-model="formData.arbitratClaims" placeholder="请输入申请人仲裁诉求" type="textarea"
                 :autosize="{ minRows: 4, maxRows: 8 }" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+              <el-form-item label="事实和理由" prop="arbitratClaims">
+                <el-input v-model="formData.arbitratClaims" placeholder="请输入申请人仲裁诉求" type="textarea"
+                :autosize="{ minRows: 4, maxRows: 8 }" />
+              </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence" v-if="flag !== '0'">
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
@@ -493,6 +499,7 @@
               <el-form-item label="被申请人性别：" :prop="'paymentArr1.' + index + '.responSex'" :rules="[
                 {
                   required: true,
+                  message: '请选择性别'
                 },
               ]">
                 <el-radio-group v-model="itm.responSex">
@@ -606,33 +613,22 @@
       </div>
       
       <div v-show="activeName=='second'" style="margin-top:20px;">
-        <el-form :model="formGrab" ref="formGrabRef" label-width="120px" :disabled ="flag == '0'">
+        <el-form :model="formGrab"  label-width="120px" :disabled ="flag == '0'">
          
-            <el-form-item  v-for="(item,index) in formGrab.list" :prop="'list.' + index + '.value'" :label="item.name" :key="item.id" 
-           :rules="{
-                  required: true,
-                  message: '内容不能为空',
-                  trigger: 'blur'
-                }"
-            >
+            <el-form-item  v-for="(item,index) in formGrab.list"  :label="item.name" :key="item.id">
                 <el-input type="textarea" v-model="item.value"></el-input>
             </el-form-item>
           
         </el-form>  
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <div style="text-align:center;margin-top:50px;">
             <el-button type="primary" @click="submitFormGrab" v-if="flag != 0" class="endbutton"><span>确 定</span></el-button>
             <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
           </div>
-        </el-col>
+        </el-col> -->
           
         
       </div>
-      
-        <!-- <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitForm" v-if="flag != 0" class="endbutton"><span>确 定</span></el-button>
-            <el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
-        </div> -->
     </el-dialog>
   </div>
 </template>
@@ -827,7 +823,6 @@ export default {
           if (this.flag == "1" || this.flag == "0") {
             this.form2.paymentArr = this.initpaymentArr;
             this.form3.paymentArr1 = this.initpaymentArr1;
-            console.log(this.caseAttachList)
             this.caseAttachList.forEach((item) => {
               if (item.annexType == 2) {
                 this.applicateArr.push({
@@ -950,16 +945,16 @@ export default {
       this.$emit("cancel");
     },
     // 校验借款开始日期与结束日期
-    // setStartTime() {
-    //   if (
-    //     this.setTime(this.formData.loanStartDate) >=
-    //     this.setTime(this.formData.loanEndDate)
-    //   ) {
-    //     this.$message.error("借款开始日期应早于借款结束日期");
-    //     this.formData.loanStartDate = "";
-    //     this.formData.loanEndDate = "";
-    //   }
-    // },
+    setStartTime() {
+      if (
+        this.setTime(this.formData.loanStartDate) >=
+        this.setTime(this.formData.loanEndDate)
+      ) {
+        this.$message.error("借款开始日期应早于借款结束日期");
+        this.formData.loanStartDate = "";
+        this.formData.loanEndDate = "";
+      }
+    },
     setEndTime() {
       if (
         this.setTime(this.formData.loanEndDate) <=
@@ -1039,7 +1034,7 @@ export default {
                     "YYYY-MM-DD HH:mm:ss"
                   );
                   if (this.formData.id) {
-                    // this.formData['columnValues'] = this.formGrab.list
+                    this.formData['columnValues'] = this.formGrab.list
                     editCaseApply({
                       ...this.formData,
                       caseAffiliates: this.formData.caseAffiliates,
@@ -1070,22 +1065,22 @@ export default {
       });
     },
     // 提交抓取内容修改
-    submitFormGrab(){
-      this.$refs['formGrabRef'].validate((valid) => {
-         if(valid){
-           this.formGrabList['columnValues']= this.formGrab.list
+    // submitFormGrab(){
+    //   this.$refs['formGrabRef'].validate((valid) => {
+    //      if(valid){
+    //        this.formGrabList['columnValues']= this.formGrab.list
            
-           console.log(this.formGrabList)
-           editCaseApplicationDefineval({columnValues:this.formGrab.list}).then(res=>{
-             if (res.code == 200) {
-                this.$modal.msgSuccess("修改成功");
-                this.$emit("cancel");
-                this.getcaseApply(this.queryParams);
-              }
-           })
-         }
-      });
-    },
+    //        console.log(this.formGrabList)
+    //        editCaseApplicationDefineval({columnValues:this.formGrab.list}).then(res=>{
+    //          if (res.code == 200) {
+    //             this.$modal.msgSuccess("修改成功");
+    //             this.$emit("cancel");
+    //             this.getcaseApply(this.queryParams);
+    //           }
+    //        })
+    //      }
+    //   });
+    // },
     // 详情显示，展示申请人案件文件
     toFile(item, index) {
       window.open(

src/views/caseManagement/components/caseentryExamine.vue

@@ -5,11 +5,18 @@
       :visible="caseentryExamineVisible"
       @close="cancel"
       width="1000px"
+      height="800px"
       append-to-body
       :destroy-on-close="true"
       center
     >
-      <!-- 案件信息 -->
+    <!-- tab页 -->
+     <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="案件基本信息" name="first"></el-tab-pane>
+          <el-tab-pane label="自定义抓取内容" name="second"></el-tab-pane>
+      </el-tabs>
+      <div v-show="activeName=='first'">
+         <!-- 案件信息 -->
       <el-form
         ref="form"
         :model="formData"
@@ -767,26 +774,38 @@
           </el-row>
         </div>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          type="primary"
-          @click="submitIsAgree(1)"
-          v-if="
-            formData.updateSubmitStatus == 1 || formData.updateSubmitStatus == 2
-          "
-          class="endbutton"
-          ><span>同 意</span></el-button
-        >
-        <el-button
-          type="warning"
-          @click="submitIsAgree(0)"
-          v-if="
-            formData.updateSubmitStatus == 1 || formData.updateSubmitStatus == 2
-          "
-          class="endbutton2"
-          ><span>拒 绝</span></el-button
-        >
+        <div slot="footer" class="dialog-footer" style="text-align:center;margin-top:20px;">
+          <el-button
+            type="primary"
+            @click="submitIsAgree(1)"
+            v-if="
+              formData.updateSubmitStatus == 1 || formData.updateSubmitStatus == 2
+            "
+            class="endbutton"
+            ><span>同 意</span></el-button
+          >
+          <el-button
+            type="warning"
+            @click="submitIsAgree(0)"
+            v-if="
+              formData.updateSubmitStatus == 1 || formData.updateSubmitStatus == 2
+            "
+            class="endbutton2"
+            ><span>拒 绝</span></el-button
+          >
+        </div>
+      </div>
+      <div v-show="activeName=='second'">
+        <el-form :model="formGrab"  label-width="120px" >
+         
+            <el-form-item  v-for="(item,index) in formGrab.list"  :label="item.name" :key="item.id">
+                <el-input type="textarea" v-model="item.value"></el-input>
+            </el-form-item>
+          
+        </el-form> 
+        
       </div>
+     
     </el-dialog>
   </div>
 </template>
@@ -808,14 +827,21 @@ export default {
     "caseAttachList",
     "caseentryExamineVisible",
     "caseentryExamineData",
-    "caseentryExamineDataAll"
+    "caseentryExamineDataAll",
+    "afterColumnValues"
   ],
   data() {
     return {
+      activeName: 'first',
+       // 抓取内容
+      formGrab:{
+        list:[]
+      },
       formData: {},
       changeLableCode: [],
       changeLableCode1: [],
       changeLableCode2: [],
+      changeLableColumn:[],
       filedata: {
         annexType: 2,
       },
@@ -960,6 +986,9 @@ export default {
   watch: {
     caseentryExamineVisible: {
       handler(val) {
+        this.activeName = "first"
+        this.formGrab.list = this.caseentryExamineDataAll.afterCase.columnValues
+        console.log(this.formGrab.list)
         setTimeout(() => {
           if (val) {
             this.applicateArr = [];
@@ -967,6 +996,7 @@ export default {
             this.formData = this.caseentryExamineData;
             if (this.caseentryExamineDataAll.changeColumn) {
               this.changeLableCode = this.caseentryExamineDataAll.changeColumn.split(',')
+              console.log(this.changeLableCode)
             } else {
               this.changeLableCode = []
             }
@@ -986,6 +1016,12 @@ export default {
             } else {
               this.changeLableCode2 = []
             }
+            if(this.caseentryExamineDataAll.columnValueChangeColumn){
+              let changeLableColumn1 = this.caseentryExamineDataAll.columnValueChangeColumn.split(',')
+              
+            }else{
+              this.changeLableColumn = []
+            }
             this.fileList = [];
             this.form2.paymentArr = [
               this.caseentryExamineData.caseAffiliates[0],
@@ -1150,6 +1186,7 @@ export default {
         updateSubmitStatus: this.formData.updateSubmitStatus,
         isAgree: row,
         version: this.formData.version,
+        columnValues:this.formGrab.list
       };
       updateAudit(parms).then((res) => {
         this.$modal.msgSuccess("审核成功");
@@ -1171,6 +1208,10 @@ export default {
         "_black"
       );
     },
+    // tab页
+    handleClick(tab, event){
+      
+    }
   },
 };
 </script>

src/views/caseManagement/components/trialincourtDialog.vue

@@ -310,7 +310,10 @@ export default {
       user: "",
       userId: 1,
       showArbitrationresults: false,
-      form2: {},
+      form2: {
+        isAbsence:0,
+        appliIsAbsen:0
+      },
       applicateArr: [], //申请人案件资料
       quiltArr: [], //被申请人案件资料
       recordArr: [], //笔录附件
@@ -418,6 +421,7 @@ export default {
     submitForm() {
       this.$refs["form2"].validate((valid) => {
         if (valid) {
+          
           creatTrialRecordnew({
             caseAppliId: this.formData.id,
             // evidenDetermi: this.form2.evidenDetermi,
@@ -450,6 +454,9 @@ export default {
               this.$modal.msgSuccess("提交成功");
               this.showsubmit = false;
               this.closeArbitrationresults();
+              this.form2.respondentOpinion ="";
+              this.form2.applicantOpinion = "";
+              
             })
             .catch((err) => { });
         }

src/views/index.vue

@@ -114,7 +114,7 @@
         </div>
       </div>
       <div class="cardList" v-hasPermi="['home:arbitratorCheck']" @click="pushPage(18)">
-        <div class="badge">{{ dataCount.caseApplyAwardCheck }}</div>
+        <div class="badge">{{ dataCount.arbitratorApplyAwardConfirm }}</div>
         <div class="cardMain">
           <img class="iconImg" src="@/assets/images/daishencha.png" alt="">
         </div>

src/views/officialSeal/components/temmplateList.vue

@@ -14,7 +14,7 @@
 </template>
 <script>
 import {
-    getFatchRuleByTemplateid
+    getTemplateInfoById
 } from "@/api/officialSeal/officialSeal.js";
 export default {
     props: ["listVisable", "listData", "queryParams"],
@@ -29,7 +29,7 @@ export default {
     watch: {
         listData(val) {
             if (val) {
-                getFatchRuleByTemplateid({ id: val.id }).then(res=>{
+                getTemplateInfoById({ id: val.id }).then(res=>{
                     this.dataList = res.data;
                 })
             }

src/views/officialSeal/templateManagement.vue

@@ -41,7 +41,8 @@
 <script>
 import {
     getTemplate,
-    deleteTemplate
+    deleteTemplate,
+    getTemplateInfoById
 } from "@/api/officialSeal/officialSeal.js";
 
 import addInstitution from "./components/addInstitution";