Преглед на файлове

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

gaogaoyujie преди 2 години
родител
ревизия
02be03ef9d

+ 8
- 0
src/api/caseAccess/caseEntry.js Целия файл

@@ -24,6 +24,14 @@ export function selectBatchSignUrl(data) {
24 24
     data: data
25 25
   })
26 26
 }
27
+// 批量签名提交
28
+export function selectBatchSealUrl(data) {
29
+  return request({
30
+    url: '/adjudication/selectBatchSealUrl',
31
+    method: 'post',
32
+    data: data
33
+  })
34
+}
27 35
 // 立案申请
28 36
 export function addCaseApply(data) {
29 37
   return request({

+ 3
- 1
src/views/caseManagement/caseList.vue Целия файл

@@ -74,7 +74,9 @@
74 74
         >
75 75
           批量签名
76 76
         </el-button>
77
-        <el-button  type="primary" plain icon="el-icon-plus" size="mini" @click="batchPrintings">
77
+        <el-button  type="primary" plain icon="el-icon-plus" size="mini" @click="batchPrintings"
78
+          v-hasPermi="['caseManagement:list:officialSeal']"
79
+        >
78 80
           批量用印
79 81
         </el-button>
80 82
       </el-col>

+ 1
- 1
src/views/caseManagement/components/batchDialog.vue Целия файл

@@ -63,7 +63,7 @@
63 63
 </template>
64 64
 
65 65
 <script>
66
-import { importTemplate } from "@/api/caseAccess/caseEntry";
66
+import { pageSignAdjudicate } from "@/api/caseAccess/caseEntry";
67 67
 import { getToken } from "@/utils/auth";
68 68
 export default {
69 69
   props: ["openbatch","getcaseApply","queryParams"],

+ 73
- 6
src/views/caseManagement/components/batchPrinting.vue Целия файл

@@ -1,7 +1,35 @@
1 1
 <template>
2 2
 <!-- 批量用印 -->
3 3
     <div>
4
-        <el-dialog title="批量用印" :visible="printingVisable" @close="cancel" center :distroy-on-close="true">
4
+        <el-dialog title="批量用印" width="60%" :visible="printingVisable" @close="cancel" center :distroy-on-close="true">
5
+            <!-- 查询机构信息 -->
6
+            <el-form ref="courtReviewform" :model="courtReviewform">
7
+                <el-form-item
8
+                    label="查询机构:"
9
+                    prop="Arbitor"
10
+                    :rules="[
11
+                        {
12
+                        required: true,
13
+                        message: '查询机构不能为空',
14
+                        trigger: 'blur',
15
+                        },
16
+                ]"
17
+                >
18
+                <el-select
19
+                    placeholder="请选择查询机构"
20
+                    @change="changeArbitor"
21
+                    v-model="courtReviewform.Arbitor"
22
+                    clearable
23
+                >
24
+                    <el-option
25
+                     v-for="item in atoDataList"
26
+                    :key="item.id"
27
+                    :label="item.identifyName"
28
+                    :value="item.operPhone"
29
+                    ></el-option>
30
+                </el-select>
31
+                </el-form-item>
32
+                </el-form>
5 33
             <el-table v-loading="loading" :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
6 34
                 <el-table-column type="selection">
7 35
                 </el-table-column>
@@ -30,13 +58,14 @@
30 58
                 :limit.sync="queryParamsData.pageSize"  />
31 59
             <div slot="footer" class="dialog-footer">
32 60
                 <el-button @click="cancel"  class="endbutton"><span>取 消</span></el-button>
33
-                <el-button type="primary" class="endbutton" :disabled="dataList.length == 0 || batchData.length == 0"><span>确认用印</span></el-button>
61
+                <el-button type="primary" class="endbutton" :disabled="dataList.length == 0 || batchData.length == 0" @click="confirmSeals"><span>确认用印</span></el-button>
34 62
             </div>
35 63
         </el-dialog>
36 64
     </div>
37 65
 </template>
38 66
 <script>
39
-import {caseApply} from '@/api/caseAccess/caseEntry'
67
+import {selectBatchSealUrl,pageSignAdjudicate} from '@/api/caseAccess/caseEntry'
68
+import {deptIdentifyList} from '@/api/officialSeal/officialSeal'
40 69
 export default {
41 70
     props:["printingVisable"],
42 71
     data() {
@@ -47,13 +76,20 @@ export default {
47 76
             total:0,
48 77
              // 查询参数
49 78
             queryParamsData: {
50
-                caseStatus: 3, //待定
79
+                caseStatus: 14, 
51 80
                 pageNum: 1,
52 81
                 pageSize: 10,
53 82
             },
54 83
            // 表格数据
55 84
             dataList: [],
56 85
             batchData: [],
86
+            atoDataList:[],
87
+            courtReviewform: {},
88
+            Arbitor: "",
89
+            paramsdata:{
90
+                ids:[],
91
+                psnAccount:""
92
+            },
57 93
         }
58 94
     },
59 95
     watch: {
@@ -65,12 +101,13 @@ export default {
65 101
     },
66 102
     created(){
67 103
         this.getBatchPrinting(this.queryParamsData)
104
+        this.getarbitrAtor()
68 105
     },
69 106
     methods:{
70 107
         // 列表查询
71 108
          getBatchPrinting(val){
72 109
              this.loading = true;
73
-            caseApply(val).then(res=>{
110
+            pageSignAdjudicate(val).then(res=>{
74 111
                 this.dataList = res.rows
75 112
                 this.total = res.total;
76 113
                  this.loading = false;
@@ -80,9 +117,39 @@ export default {
80 117
         handleSelectionChange(val){
81 118
              this.batchData = [];
82 119
             val.forEach(item => {
83
-                this.batchData.push(item.id)
120
+                this.batchData.push(item.signFlowId)
121
+                this.paramsdata.ids = this.batchData
84 122
             })
85 123
         },
124
+            // 查询机构信息
125
+        getarbitrAtor() {
126
+                this.atoDataList =[]
127
+                deptIdentifyList({}).then((res) => {
128
+                    console.log(res)
129
+                    this.atoDataList = res.rows;
130
+                    // this.total = res.total; 
131
+                });
132
+        },
133
+        // 下拉获取电话号码
134
+        changeArbitor(val){
135
+            this.paramsdata.psnAccount = val
136
+        },
137
+        // 确认用印
138
+        confirmSeals(){
139
+         this.$refs["courtReviewform"].validate((valid) => {
140
+            if (valid) {
141
+          selectBatchSealUrl(this.paramsdata).then((res) => { 
142
+              this.$modal.msgSuccess("确认成功");
143
+              this.cancel();
144
+              this.getBatchPrinting(this.queryParamsData)
145
+              window.open(res.data.signUrl)
146
+              
147
+            //   this.$emit("getcaseApply", this.queryParams);
148
+            })
149
+            .catch((err) => {});
150
+        }
151
+      });
152
+    },
86 153
         cancel() {
87 154
          this.$emit("printingOperate");
88 155
         },

+ 2
- 1
src/views/caseManagement/components/batchSignature.vue Целия файл

@@ -131,7 +131,6 @@ export default {
131 131
     getarbitrAtor() {
132 132
     this.atoDataList =[]
133 133
       arbitrAtor({}).then((res) => {
134
-          console.log(res)
135 134
         this.atoDataList = res.rows;
136 135
         // this.total = res.total; 
137 136
       });
@@ -148,7 +147,9 @@ export default {
148 147
           selectBatchSignUrl(this.paramsdata).then((res) => { 
149 148
               this.$modal.msgSuccess("确认成功");
150 149
               this.cancel();
150
+              this.getBatchSignation(this.queryParamsData)
151 151
               window.open(res.data.signUrl)
152
+              
152 153
             //   this.$emit("getcaseApply", this.queryParams);
153 154
             })
154 155
             .catch((err) => {});

+ 20
- 1
src/views/numberManagement/caseNumberList.vue Целия файл

@@ -1,5 +1,14 @@
1 1
 <template>
2 2
     <div class="app-container">
3
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="140px">
4
+            <el-form-item label="机构名称首字母拼写" prop="deptNameFirchar">
5
+                <el-input v-model="queryParams.deptNameFirchar" placeholder="请输入机构首字母拼写" clearable @keyup.enter.native="handleQuery" />
6
+            </el-form-item>
7
+            <el-form-item>
8
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
9
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
10
+      </el-form-item>
11
+    </el-form>
3 12
         <el-row :gutter="10" class="mb8">
4 13
             <el-col :span="1.5">
5 14
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addList">新增</el-button>
@@ -22,7 +31,7 @@
22 31
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
23 32
                 <template slot-scope="scope">
24 33
                     <el-button size="mini"  type="text" icon="el-icon-delete" @click="deleteTemplate(scope.row)">删除</el-button>
25
-                    <el-button size="mini" type="text" icon="el-icon-edit" @click="eidtTemplate(scope.row)">修改模板</el-button>
34
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="eidtTemplate(scope.row)">编号修改</el-button>
26 35
                 </template>
27 36
             </el-table-column>
28 37
         </el-table>
@@ -71,6 +80,16 @@ export default {
71 80
         eidtTemplate(row){
72 81
             this.modifyVisable =true;
73 82
             this.editData =row;
83
+        },
84
+            /** 搜索按钮操作 */
85
+        handleQuery() {
86
+        this.queryParams.pageNum = 1;
87
+        this.getList(this.queryParams);
88
+        },
89
+            /** 重置按钮操作 */
90
+        resetQuery() {
91
+        this.resetForm("queryForm");
92
+        this.handleQuery();
74 93
         },
75 94
         getList(parm){
76 95
             this.loading = true;

+ 3
- 3
src/views/numberManagement/components/addOrdered.vue Целия файл

@@ -5,8 +5,8 @@
5 5
                 class="demo-ruleForm">
6 6
                 <el-form-item label="规则类型:" prop="ruleType">
7 7
                     <el-select  placeholder="请选择规则类型" v-model="ruleForm.ruleType">
8
-                        <el-option label="字符串" value="1"></el-option>
9
-                        <el-option label="整数" value="2"></el-option>
8
+                        <el-option label="字符串" :value=1></el-option>
9
+                        <el-option label="整数" :value=2></el-option>
10 10
                     </el-select>
11 11
                 </el-form-item>
12 12
                 <el-form-item label="前缀:" prop="prefixstr">
@@ -14,7 +14,7 @@
14 14
                 </el-form-item>
15 15
                 <el-form-item label="时间格式:" prop="dateFormat">
16 16
                     <el-select  placeholder="请选择时间格式" v-model="ruleForm.dateFormat">
17
-                        <el-option label="yyyy-MM-dd" value="1"></el-option>
17
+                        <el-option label="yyyy-MM-dd" :value=1></el-option>
18 18
                     </el-select>
19 19
                 </el-form-item>
20 20
                 <el-form-item label="机构名称:" prop="deptName">

+ 9
- 1
src/views/numberManagement/components/modifyTemplate.vue Целия файл

@@ -63,6 +63,14 @@ export default {
63 63
         editData(val) {
64 64
             if (val) {
65 65
                 this.ruleForm = val;
66
+                if(this.ruleForm.dateFormat=="yyyy-MM-dd"){
67
+                    this.ruleForm.dateFormat=1
68
+                }
69
+                if(this.ruleForm.ruleType=="整数"){
70
+                    this.ruleForm.ruleType=2
71
+                }else if(this.ruleForm.ruleType=="字符串"){
72
+                    this.ruleForm.ruleType=1
73
+                }
66 74
             }
67 75
         }
68 76
     },
@@ -88,7 +96,7 @@ export default {
88 96
                     this.updateCaseNumRuleFn({
89 97
                         id:this.ruleForm.id,
90 98
                         prefixstr:this.ruleForm.prefixstr,
91
-                        dateFormat:this.ruleForm.deptName,
99
+                        dateFormat:this.ruleForm.dateFormat,
92 100
                         deptNameFirchar:this.ruleForm.deptNameFirchar,
93 101
                         deptName:this.ruleForm.deptName,
94 102
                         ruleType:this.ruleForm.ruleType,