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

src/api/caseFiling/caseFiling.js

@@ -8,6 +8,10 @@ export function adjudicationArchives(data) {
     params: data
   })
 }
+
+
+
+
 //根据案件id查询视频列表
 export function videoList(data) {
   return request({

src/api/home.js

@@ -6,3 +6,9 @@ export function toDoCount() {
     method: 'get'
   })
 }
+
+
+
+
+
+

src/views/awardManagement/components/detailsAward.vue

@@ -10,7 +10,7 @@
             <el-tab-pane label="申请人案件证据资料" name="first"></el-tab-pane>
             <el-tab-pane label="被申请人案件证据资料" name="second"></el-tab-pane>
             <el-tab-pane label="裁决书附件" name="third"></el-tab-pane>
-            <el-tab-pane label="仲裁申请书" name="fourth"></el-tab-pane>
+            <!-- <el-tab-pane label="仲裁申请书" name="fourth"></el-tab-pane> -->
             <el-tab-pane label="案件视频" name="five"></el-tab-pane>
             <el-tab-pane label="庭审笔录" name="six"></el-tab-pane>
          </el-tabs>

src/views/awardManagement/components/paymentdetailsDialog.vue

@@ -90,7 +90,7 @@
       <!-- 清除画布 -->
       <el-button v-if="flag == 3" type="info" @click="handleReset">清除画布</el-button>
       <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button>
+        <!-- <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button> -->
         <el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
         <el-button type="primary" @click="submitForm(1)" v-if="flag == 2">同 意</el-button>
         <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button>

src/views/caseFiling/archiveList.vue

@@ -59,7 +59,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>

src/views/caseManagement/components/caseentryDialog.vue

@@ -5,7 +5,7 @@
       <!-- tab页 -->
        <el-tabs v-model="activeName" @tab-click="handleClick" v-show="form.id != undefined && form.id != null">
           <el-tab-pane label="案件基本信息" name="first"></el-tab-pane>
-          <el-tab-pane label="抓取内容" name="second"></el-tab-pane>
+          <el-tab-pane label="自定义抓取内容" name="second"></el-tab-pane>
       </el-tabs>
       <div v-show="activeName=='first'">
            <!-- 案件信息 -->
@@ -615,7 +615,7 @@
                   trigger: 'blur'
                 }"
             >
-                <el-input type="textarea" rows="10" v-model="item.value"></el-input>
+                <el-input type="textarea" v-model="item.value"></el-input>
             </el-form-item>
           
         </el-form>  
@@ -950,16 +950,16 @@ export default {
       this.$emit("cancel");
     },
     // 校验借款开始日期与结束日期
-    setStartTime() {
+    // setStartTime() {
-      if (
+    //   if (
-        this.setTime(this.formData.loanStartDate) >=
+    //     this.setTime(this.formData.loanStartDate) >=
-        this.setTime(this.formData.loanEndDate)
+    //     this.setTime(this.formData.loanEndDate)
-      ) {
+    //   ) {
-        this.$message.error("借款开始日期应早于借款结束日期");
+    //     this.$message.error("借款开始日期应早于借款结束日期");
-        this.formData.loanStartDate = "";
+    //     this.formData.loanStartDate = "";
-        this.formData.loanEndDate = "";
+    //     this.formData.loanEndDate = "";
-      }
+    //   }
-    },
+    // },
     setEndTime() {
       if (
         this.setTime(this.formData.loanEndDate) <=

src/views/caseManagement/components/trialincourtDialog.vue

@@ -123,7 +123,7 @@
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary">发起会议</el-button>
-      <el-button @click="openArbitrationresults" type="primary" v-if="this.recordArr.length <= 0">生成庭审笔录</el-button>
+      <el-button @click="openArbitrationresults" type="primary" v-if="this.recordArr.length <= 0">确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
         <el-button class="endbutton" :disabled="showsubmit && recordArr.length == 0" @click="submitResults">提交</el-button>
         <el-button @click="cancel" class="endbutton1"><span>关 闭</span></el-button>

src/views/officialSeal/components/grabRules.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="设置抓取规则" :visible="rulesVisable" v-if="rulesVisable" @close="cancelRules" width="1000px"
+        <el-dialog title="设置抓取规则" :visible="rulesVisable" v-if="rulesVisable" @close="cancelRules"
             append-to-body :destroy-on-close="true" center>
             <el-button type="primary" icon="el-icon-plus" style="margin-bottom: 20px;"
                 @click="addForm">新增系统内置抓取规则</el-button>
@@ -10,38 +10,17 @@
                         <el-button type="primary" icon="el-icon-delete" style="margin-bottom: 20px;"
                             @click="deleteForm(item)">删除</el-button>
                         <el-row>
-                            <!-- <el-col :span="12">
-                                <el-form-item label="字段：" :prop="'forms.' + index + '.column'" :rules="[
-                                    {
-                                        required: true,
-                                        message: '字段不能为空',
-                                        trigger: 'blur',
-                                    },
-                                ]">
-                                    <el-input v-model="item.column" placeholder="请输入字段" />
-                                </el-form-item>
-                                <el-form-item label="字段：" :prop="'forms.' + index + '.column'" :rules="[
-                                    {
-                                        required: true,
-                                        message: '字段不能为空',
-                                    },
-                                ]">
-                                    <el-select v-model="item.column" placeholder="请选择">
-                                        <el-option v-for="dict in selectList" :key="dict.id" :label="dict.column"
-                                            :value="dict.column"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col> -->
                             <el-col :span="12">
-                                <!-- <el-form-item label="字段名：" :prop="'forms.' + index + '.columnName'" :rules="[
+                                <el-form-item label="抓取文件名：" :prop="'forms.' + index + '.fileName'" :rules="[
                                     {
                                         required: true,
-                                        message: '字段名不能为空',
+                                        message: '抓取文件名不能为空',
-                                        trigger: 'blur',
                                     },
                                 ]">
-                                    <el-input v-model="item.columnName" placeholder="请输入字段名" />
+                                    <el-input v-model="item.fileName" placeholder="请输入抓取文件名" />
-                                </el-form-item> -->
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
                                 <el-form-item label="字段名：" :prop="'forms.' + index + '.columnName'" :rules="[
                                     {
                                         required: true,
@@ -55,35 +34,33 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="抓取文件名：" :prop="'forms.' + index + '.fileName'" :rules="[
+                                <el-form-item label="开始抓取字段：" :prop="'forms.' + index + '.startContent'">
-                                    {
-                                        required: true,
-                                        message: '抓取文件名不能为空',
-                                    },
-                                ]">
-                                    <el-input v-model="item.fileName" placeholder="请输入抓取文件名" />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="开始抓取字段：" :prop="'forms.' + index + '.startContent'" :rules="[
-                                    {
-                                        required: true,
-                                        message: '开始抓取字段不能为空',
-                                    },
-                                ]">
                                     <el-input v-model="item.startContent" placeholder="请输入开始抓取字段" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="结束抓取字段：" :prop="'forms.' + index + '.endContent'" :rules="[
+                                <el-form-item label="结束抓取字段：" :prop="'forms.' + index + '.endContent'">
-                                    {
-                                        required: true,
-                                        message: '结束抓取字段不能为空',
-                                    },
-                                ]">
                                     <el-input v-model="item.endContent" placeholder="结束抓取字段" />
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="指定抓取开始位置：" :prop="'forms.' + index + '.startContentRepeatOrder'">
+                                    <el-input-number v-model="item.startContentRepeatorder" controls-position="right" :min="1"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="指定抓取结束位置：" :prop="'forms.' + index + '.endContentRepeatOrder'">
+                                    <el-input-number v-model="item.endContentRepeatorder" controls-position="right" :min="1"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="抓取方向：" :prop="'forms.' + index + '.fatchOrder'">
+                                    <el-select v-model="item.fatchOrder" placeholder="请选择">
+                                        <el-option v-for="dict in fatchOrderList" :key="dict.key"
+                                            :label="dict.name" :value="dict.key"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
                     </div>
                 </el-form>
@@ -127,25 +104,33 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="开始抓取字段：" :prop="'forms.' + index + '.startContent'" :rules="[
+                                <el-form-item label="开始抓取字段：" :prop="'forms.' + index + '.startContent'">
-                                    {
-                                        required: true,
-                                        message: '开始抓取字段不能为空',
-                                    },
-                                ]">
                                     <el-input v-model="item.startContent" placeholder="请输入开始抓取字段" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="结束抓取字段：" :prop="'forms.' + index + '.endContent'" :rules="[
+                                <el-form-item label="结束抓取字段：" :prop="'forms.' + index + '.endContent'">
-                                    {
-                                        required: true,
-                                        message: '结束抓取字段不能为空',
-                                    },
-                                ]">
                                     <el-input v-model="item.endContent" placeholder="结束抓取字段" />
                                 </el-form-item>
                             </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="指定抓取开始位置：" :prop="'forms.' + index + '.startContentRepeatOrder'">
+                                    <el-input-number v-model="item.startContentRepeatorder" controls-position="right" :min="1"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="指定抓取结束位置：" :prop="'forms.' + index + '.endContentRepeatOrder'">
+                                    <el-input-number v-model="item.endContentRepeatorder" controls-position="right" :min="1"></el-input-number>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="抓取方向：" :prop="'forms.' + index + '.fatchOrder'">
+                                    <el-select v-model="item.fatchOrder" placeholder="请选择">
+                                        <el-option v-for="dict in fatchOrderList" :key="dict.key"
+                                            :label="dict.name" :value="dict.key"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
                         </el-row>
                     </div>
                 </el-form>
@@ -179,7 +164,16 @@ export default {
             formData_custom: {
                 forms: []
             },
-            // selectList: []
+            fatchOrderList: [
+                {
+                    name:'从前向后抓取',
+                    key:0
+                },
+                {
+                    name:'从后往前抓取',
+                    key:1
+                }
+            ]
         };
     },
     watch: {
@@ -187,7 +181,7 @@ export default {
             if (val) {
                 this.formData.forms = [];
                 this.formData_custom.forms = [];
-                // this.getFatchRuleByTemplateidFn({ id: val.id })
+                this.getFatchRuleByTemplateidFn({ id: val.id })
             }
         }
     },
@@ -252,12 +246,22 @@ export default {
             });
         },
         // 根据id获取抓取规则
-        // getFatchRuleByTemplateidFn(data) {
+        getFatchRuleByTemplateidFn(data) {
-        //     getFatchRuleByTemplateid(data).then(res => {
+            getFatchRuleByTemplateid(data).then(res => {
-        //         // this.formData.forms = res.data;
+                // this.formData.forms = res.data;
-        //         this.selectList = res.data
+                // this.selectList = res.data
-        //     })
+                this.formData.forms = [];
-        // },
+                this.formData_custom.forms = [];
+                console.log(res.data,"LLLLLLLLLLLLLLLLLLLLLLLLLLLL");
+                res.data.forEach(item => {
+                    if(item.isDefault == 0){
+                        this.formData.forms.push(item)
+                    }else if(item.isDefault == 1){
+                        this.formData_custom.forms.push(item)
+                    }
+                });
+            })
+        },
         // 提交抓取规则
         saveFatchRulesFn(data) {
             saveFatchRules(data).then(res => {

src/views/officialSeal/components/temmplateList.vue

@@ -0,0 +1,58 @@
+<template>
+    <div>
+        <el-dialog :title="title" :visible="listVisable" v-if="listVisable" @close="cancel" width="800px" center
+            :distroy-on-close="true">
+            <el-table v-loading="loading" :data="dataList" style="width: 100%">
+                <el-table-column label="字段" align="center" prop="column" :show-overflow-tooltip="true" />
+                <el-table-column label="字段名" align="center" prop="columnName" :show-overflow-tooltip="true" />
+            </el-table>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import {
+    getFatchRuleByTemplateid
+} from "@/api/officialSeal/officialSeal.js";
+export default {
+    props: ["listVisable", "listData", "queryParams"],
+    data() {
+        return {
+            title: "模板字段列表",
+            // 遮罩层
+            loading: false,
+            dataList:[]
+        };
+    },
+    watch: {
+        listData(val) {
+            if (val) {
+                getFatchRuleByTemplateid({ id: val.id }).then(res=>{
+                    this.dataList = res.data;
+                })
+            }
+        }
+    },
+    created() {
+
+    },
+    methods: {
+        cancel() {
+            this.$emit("cancelList");
+        },
+    },
+};
+</script>
+  
+<style lang="scss" scoped>
+.steps {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.radiobox {
+    margin-top: 30px;
+}
+</style>

src/views/officialSeal/templateManagement.vue

@@ -21,6 +21,7 @@
                     <el-button size="mini" @click="deleteTemplate(scope.row)" type="text" icon="el-icon-delete">删除</el-button>
                     <el-button size="mini" @click="eidtTemplate(scope.row)" type="text" icon="el-icon-edit">修改模板</el-button>
                     <el-button size="mini" @click="grabRulesClick(scope.row)" type="text" icon="el-icon-edit">设置抓取规则</el-button>
+                    <el-button size="mini" @click="templateList(scope.row)" type="text" icon="el-icon-edit">模板字段列表</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -33,7 +34,8 @@
         </sealManage>
         <editTemplate :editVisable="editVisable" @cancelEdit="cancelEdit" @getList="getList" :editData="editData" :queryParams="queryParams"></editTemplate>
         <grabRules :rulesVisable="rulesVisable" @cancelRules="cancelRules" @getList="getList" :rulesData="rulesData" :queryParams="queryParams"></grabRules>
-    </div>
+        <temmplateList :listVisable="listVisable" @cancelList="cancelList" @getList="getList" :listData="listData" :queryParams="queryParams"></temmplateList>
+   </div>
 </template>
   
 <script>
@@ -46,7 +48,8 @@ import addInstitution from "./components/addInstitution";
 import addTemplate from "./components/addTemplate";
 import sealManage from "./components/sealManage";
 import editTemplate from "./components/editTemplate";
-import grabRules from "./components/grabRules.vue"
+import grabRules from "./components/grabRules.vue";
+import temmplateList from "./components/temmplateList.vue";
 export default {
     name: "paymentList",
     components: {
@@ -54,7 +57,8 @@ export default {
         addTemplate,
         sealManage,
         editTemplate,
-        grabRules
+        grabRules,
+        temmplateList
     },
     data() {
         return {
@@ -79,7 +83,9 @@ export default {
             sealData: {},
             editVisable:false,
             editData:{},
-            rulesData:{}
+            rulesData:{},
+            listVisable:false,
+            listData:{}
         };
     },
     created() {
@@ -120,6 +126,14 @@ export default {
         cancelEdit() {
             this.editVisable = false;
         },
+        // 模板字段列表
+        templateList(row){
+            this.listVisable = true;
+            this.listData = row;
+        },
+        cancelList(){
+            this.listVisable = false;
+        },
         // 抓取规则
         grabRulesClick(row){
             this.rulesVisable = true;

vue.config.js

@@ -11,8 +11,8 @@ 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:9001'  //生产
-const API = 'http://121.40.189.20:8001'  //测试
+// const API = 'http://121.40.189.20:8001'  //测试
 // const API = 'http://192.168.3.18:9001'  //B
 // const API = 'http://192.168.3.77:9001' //Q