Просмотр исходного кода

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

hhlxayunmei 2 лет назад
Родитель
Сommit
d417e6dd65

+ 2
- 2
src/views/caseManagement/components/paymentdetailsDialog.vue Просмотреть файл

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <div>
3 3
     <el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
4
-      <el-form ref="form" :model="form" label-width="180px" :disabled="true">
4
+      <el-form ref="form" :model="form" label-width="180px">
5 5
         <el-form-item label="案件编号:" prop="caseNum">
6 6
           <el-input v-model="form.caseNum" placeholder="" :disabled="true"/>
7 7
         </el-form-item>
@@ -12,7 +12,7 @@
12 12
           <el-input v-model="form.applicationName" placeholder="" />
13 13
         </el-form-item> -->
14 14
         <el-form-item label="缴费金额:" prop="feePayable">
15
-          <el-input v-model="form.feePayable" />
15
+          <el-input v-model="form.feePayable" :disabled="true"/>
16 16
         </el-form-item>
17 17
         <el-form-item label="申请人缴费凭证:" v-if="form.caseAttachList.length > 0">
18 18
           <div style="color: #104fad;cursor:pointer" v-for="(item, index) in form.caseAttachList" :key="index"

+ 22
- 2
src/views/officialSeal/components/addTemplate.vue Просмотреть файл

@@ -19,10 +19,15 @@
19 19
                     </el-select>
20 20
                 </el-form-item>
21 21
             </el-form>
22
+            <el-upload class="avatar-uploader" :on-success="handleSuccessC" ref="upload" :action="UploadUrl()"
23
+                :headers="headers" :data="filedataC" :on-remove="handleRemoveC" :on-change="handleChangeC" accept=".doc,.docx"
24
+                :file-list="fileListC" :limit="1">
25
+                <el-button size="small" type="primary">选择自然人调解申请书模板</el-button>
26
+            </el-upload>
22 27
             <el-upload class="avatar-uploader" :on-success="handleSuccess" ref="upload" :action="UploadUrl()"
23 28
                 :headers="headers" :data="filedata" :on-remove="handleRemove" :on-change="handleChange" accept=".doc,.docx"
24 29
                 :file-list="fileList" :limit="1">
25
-                <el-button size="small" type="primary">选择调解申请书模板</el-button>
30
+                <el-button size="small" type="primary">选择机构调解申请书模板</el-button>
26 31
             </el-upload>
27 32
             <el-upload class="avatar-uploader" :on-success="handleSuccessA" ref="uploadA" :action="UploadUrl()"
28 33
                 :headers="headers" :data="filedataA" :on-remove="handleRemoveA" :on-change="handleChangeA"
@@ -55,6 +60,7 @@ export default {
55 60
             fileList: [],
56 61
             fileListA: [],
57 62
             fileListB: [],
63
+            fileListC: [],
58 64
             data: [],
59 65
             tempList: [],
60 66
             isImg: false,
@@ -70,6 +76,9 @@ export default {
70 76
             filedataB: {
71 77
                 annexType: 3
72 78
             },
79
+            filedataC: {
80
+                annexType: 4
81
+            },
73 82
             flagBtn: false,
74 83
             ruleForm: {},
75 84
             rules: {
@@ -123,10 +132,21 @@ export default {
123 132
             console.log(res, "OOOOOOOOOOOOOOOOO");
124 133
             this.submitForm.annexIds.push(res.annexId)
125 134
         },
126
-
127 135
         handleChangeA(file, fileList) {
128 136
             this.isImg = file.type === '.doc' || '.docx'
129 137
         },
138
+        // 自然人
139
+        handleSuccessC(res) {
140
+        console.log(res,'自然人上传成功');
141
+            this.$message.success('上传成功');
142
+            this.submitForm.annexIds[4] = res.annexId;
143
+        },
144
+        handleRemoveC(file, fileList) {
145
+            console.log(file, fileList);
146
+        },
147
+        handleChangeC(file, fileList) {
148
+            this.isImg = file.type === '.doc' || '.docx'
149
+        },
130 150
         UploadUrl() {
131 151
             return window.location.origin + "/API/deptIdentify/upload";
132 152
         },

+ 34
- 5
src/views/officialSeal/components/editTemplate.vue Просмотреть файл

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
     <div>
3 3
         <el-dialog title="修改模板" :visible="editVisable" v-if="editVisable" @close="cancel" width="600px" center>
4
-            <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
4
+            <el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="170px"
5 5
                 class="demo-ruleForm">
6 6
                 <el-form-item label="模板名称" prop="temName">
7 7
                     <el-input v-model="ruleForm.temName"></el-input>
@@ -12,7 +12,12 @@
12 12
                             :value="dict.value"></el-option>
13 13
                     </el-select>
14 14
                 </el-form-item> -->
15
-                <el-form-item label="调节申请书模板" v-if="ruleForm.applicationFile.fileName">
15
+                <el-form-item label="自然人调解申请书模板" v-if="ruleForm.personApplicationFile && ruleForm.personApplicationFile.fileName">
16
+                    <span style="color: #0e5ce3;cursor:pointer" @click="openUrl(ruleForm.personApplicationFile.temOrigPath)">{{
17
+                        ruleForm.personApplicationFile.fileName ? ruleForm.personApplicationFile.fileName : ""
18
+                    }}</span>
19
+                </el-form-item>
20
+                <el-form-item label="机构调解申请书模板" v-if="ruleForm.applicationFile.fileName">
16 21
                     <span style="color: #0e5ce3;cursor:pointer" @click="openUrl(ruleForm.applicationFile.temOrigPath)">{{
17 22
                         ruleForm.applicationFile.fileName ? ruleForm.applicationFile.fileName : ""
18 23
                     }}</span>
@@ -30,10 +35,15 @@
30 35
                     }}</span>
31 36
                 </el-form-item>
32 37
             </el-form>
38
+            <el-upload class="avatar-uploader" :on-success="handleSuccessC" ref="upload" :action="UploadUrl()"
39
+                :headers="headers" :data="filedataC" :on-remove="handleRemoveC" :on-change="handleChangeC" accept=".doc,.docx"
40
+                :file-list="fileListC" :limit="1">
41
+                <el-button size="small" type="primary">选择自然人调解申请书模板</el-button>
42
+            </el-upload>
33 43
             <el-upload class="avatar-uploader" :on-success="handleSuccess" ref="upload" :action="UploadUrl()"
34 44
                 :headers="headers" :data="filedata" :on-remove="handleRemove" :on-change="handleChange" accept=".doc,.docx"
35 45
                 :file-list="fileList" :limit="1">
36
-                <el-button size="small" type="primary">选择调解申请书模板</el-button>
46
+                <el-button size="small" type="primary">选择机构调解申请书模板</el-button>
37 47
             </el-upload>
38 48
             <el-upload class="avatar-uploader" :on-success="handleSuccessA" ref="uploadA" :action="UploadUrl()"
39 49
                 :headers="headers" :data="filedataA" :on-remove="handleRemoveA" :on-change="handleChangeA"
@@ -63,6 +73,7 @@ export default {
63 73
             fileList: [],
64 74
             fileListA: [],
65 75
             fileListB: [],
76
+            fileListC: [],
66 77
             data: [],
67 78
             headers: {
68 79
                 Authorization: "Bearer " + getToken(),
@@ -77,6 +88,9 @@ export default {
77 88
             filedataB: {
78 89
                 annexType: 3
79 90
             },
91
+            filedataC: {
92
+                annexType: 4
93
+            },
80 94
             flagBtn: false,
81 95
             ruleForm: {
82 96
                 agreementFile:{},
@@ -136,7 +150,7 @@ export default {
136 150
                             this.submitForm.identifyId = this.ruleForm.identifyId;
137 151
                             this.submitForm.temName = this.ruleForm.temName;
138 152
                             this.submitForm.id = this.ruleForm.id;
139
-                            console.log(this.submitForm.annexIds,'ooooooooooooooooooooooooooooo');
153
+                            console.log(this.submitForm,'ooooooooooooooooooooooooooooo');
140 154
                             updateTemplate(this.submitForm).then(res => {
141 155
                                 this.$message.success('修改成功');
142 156
                                 this.$emit("cancelEdit");
@@ -156,12 +170,25 @@ export default {
156 170
         handleRemove(file, fileList) {
157 171
             console.log(file, fileList);
158 172
         },
173
+        // 机构
159 174
         handleSuccess(res) {
175
+        console.log(res,'机构上传成功');
160 176
             this.$message.success('上传成功');
161 177
             // this.submitForm.annexIds.push(res.annexId);
162 178
             this.submitForm.annexIds[1] = res.annexId;
163 179
         },
164
-
180
+        // 自然人
181
+        handleSuccessC(res) {
182
+        console.log(res,'自然人上传成功');
183
+            this.$message.success('上传成功');
184
+            this.submitForm.annexIds[4] = res.annexId;
185
+        },
186
+        handleRemoveC(file, fileList) {
187
+            console.log(file, fileList);
188
+        },
189
+        handleChangeC(file, fileList) {
190
+            this.isImg = file.type === '.doc' || '.docx'
191
+        },
165 192
         handleChangeA(file, fileList) {
166 193
             this.isImg = file.type === '.doc' || '.docx'
167 194
         },
@@ -171,6 +198,7 @@ export default {
171 198
         handleRemoveA(file, fileList) {
172 199
             console.log(file, fileList);
173 200
         },
201
+        // 和解协议
174 202
         handleSuccessA(res) {
175 203
             this.$message.success('上传成功');
176 204
             // this.submitForm.annexIds.push(res.annexId);
@@ -186,6 +214,7 @@ export default {
186 214
         handleRemoveB(file, fileList) {
187 215
             console.log(file, fileList);
188 216
         },
217
+        // 调解书
189 218
         handleSuccessB(res) {
190 219
             this.$message.success('上传成功');
191 220
             // this.submitForm.annexIds.push(res.annexId);

+ 2
- 4
vue.config.js Просмотреть файл

@@ -12,13 +12,11 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
12 12
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
13 13
 
14 14
 // const API = 'http://121.40.189.20:9001'  //生产
15
-// const API = 'http://121.40.189.20:6001'  //测试
15
+const API = 'http://121.40.189.20:6001'  //测试
16 16
 // const API = 'http://192.168.3.18:6001'  //B
17 17
 // const API = 'http://172.16.0.237:6001' //Q
18 18
 // const API = 'http://172.16.1.43:6001' //w
19
-// const API = 'http://172.16.1.30:6001' //Q
20
-// const API = 'http://172.16.1.43:6001' //w
21
-// const API = 'http://172.16.1.17:6001' //w
19
+
22 20
 // vue.config.js 配置说明
23 21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
24 22
 // 这里只列一部分,具体配置参考文档