Browse Source

bug修改

hanchaobo 2 years ago
parent
commit
fea5e406b6

+ 26
- 9
src/views/caseManagement/components/caseCompressionPackage.vue View File

@@ -47,6 +47,16 @@
47 47
               <el-option v-for="dict in templateList" :key="dict.id" :label="dict.temName" :value="dict.id"></el-option>
48 48
             </el-select>
49 49
           </el-form-item>
50
+          <el-form-item :span="24" label="申请人类型" prop="applicantType">
51
+            <el-select v-model="form.applicantType" placeholder="请选择">
52
+              <el-option v-for="item in appList" :key="item.id" :label="item.temName" :value="item.id"></el-option>
53
+            </el-select>
54
+          </el-form-item>
55
+          <el-form-item :span="24" label="被申请人类型" prop="resType">
56
+            <el-select v-model="form.resType" placeholder="请选择">
57
+              <el-option v-for="item in resList" :key="item.id" :label="item.temName" :value="item.id"></el-option>
58
+            </el-select>
59
+          </el-form-item>
50 60
         </el-row>
51 61
       </el-form>
52 62
       <div slot="footer" class="dialog-footer">
@@ -69,15 +79,26 @@ export default {
69 79
       //   key: value,
70 80
       form: {},
71 81
       fileList: [],
82
+      appList: [
83
+        { id: 1, temName: "自然人" },
84
+        { id: 2, temName: "机构" },
85
+      ],
86
+      resList: [
87
+        { id: 1, temName: "自然人" },
88
+        { id: 2, temName: "机构" },
89
+      ],
72 90
       templateList: [],
73 91
       loadingSubmit:false,
74 92
       rules: {
75
-        // upload: [
76
-        //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
77
-        // ],
78 93
         templateId: [
79 94
           { required: true, message: "裁决书模板不能为空", trigger: "blur" },
80 95
         ],
96
+        applicantType: [
97
+          { required: true, message: "申请人类型不能为空", trigger: "blur" },
98
+        ],
99
+        resType: [
100
+          { required: true, message: "被申请人类型不能为空", trigger: "blur" },
101
+        ],
81 102
       },
82 103
       paramsData:{
83 104
         // templateId:this.form.templateId
@@ -112,8 +133,9 @@ export default {
112 133
   },
113 134
   methods: {
114 135
     submitForm() {
115
-      
116 136
       this.paramsData.templateId = this.form.templateId;
137
+      this.paramsData.applicantType = this.form.applicantType;
138
+      this.paramsData.resType = this.form.resType;
117 139
       this.$refs["form"].validate((valid) => {
118 140
          this.loadingSubmit = true
119 141
         if (valid) {
@@ -126,7 +148,6 @@ export default {
126 148
     // 获取裁决书模板
127 149
     getTemplateFn(data) {
128 150
       getTemplate(data).then(res => {
129
-        console.log(res.rows, "KKKKKKKKKKKKKKKKKKKKKKK");
130 151
         this.templateList = res.rows;
131 152
       })
132 153
     },
@@ -146,7 +167,6 @@ export default {
146 167
     },
147 168
     // 下载模板 importTemplate
148 169
     downloadTemplate() {
149
-      //   console.log("下载模板");
150 170
       this.download(
151 171
         "caseApplication/uploadCaseZipFile",
152 172
         {},
@@ -159,7 +179,6 @@ export default {
159 179
     },
160 180
     // 文件上传成功处理
161 181
     handleFileSuccess(response, file, fileList) {
162
-      //   this.upload.open = false;
163 182
       this.$emit("cancelCompreess");
164 183
       this.upload.isUploading = false;
165 184
       this.$refs.uploadZipBatch.clearFiles();
@@ -183,8 +202,6 @@ export default {
183 202
           { dangerouslyUseHTMLString: true }
184 203
         )
185 204
       }
186
-
187
-      
188 205
     },
189 206
     onError(){
190 207
       this.loadingSubmit = false

+ 134
- 144
src/views/caseManagement/components/caseentryDialog.vue View File

@@ -270,7 +270,7 @@
270 270
             </el-col>
271 271
             <el-col :span="12" v-if="item.applicant.organizeFlag == 0">
272 272
               <el-form-item label-width="140px" label="出生年月:" :prop="'applicant.' + index + '.applicant.birth'">
273
-                <el-date-picker disabled v-model="item.applicant.birth" type="date" placeholder="申请人出生年月日">
273
+                <el-date-picker v-model="item.applicant.birth" type="date" placeholder="申请人出生年月日">
274 274
                 </el-date-picker>
275 275
               </el-form-item>
276 276
             </el-col>
@@ -281,7 +281,7 @@
281 281
         message: '请选择性别',
282 282
       },
283 283
     ]">
284
-                <el-radio-group v-model="item.applicant.sex" disabled>
284
+                <el-radio-group v-model="item.applicant.sex">
285 285
                   <el-radio :label="'0'">男</el-radio>
286 286
                   <el-radio :label="'1'">女</el-radio>
287 287
                 </el-radio-group>
@@ -554,7 +554,7 @@
554 554
             </el-col>
555 555
             <el-col :span="12" v-if="item.res.organizeFlag == 0">
556 556
               <el-form-item label-width="140px" label="出生年月:" :prop="'res.' + index + '.res.birth'">
557
-                <el-date-picker disabled v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
557
+                <el-date-picker v-model="item.res.birth" type="date" placeholder="被申请人出生年月日">
558 558
                 </el-date-picker>
559 559
               </el-form-item>
560 560
             </el-col>
@@ -565,7 +565,7 @@
565 565
         message: '请选择性别',
566 566
       },
567 567
     ]">
568
-                <el-radio-group v-model="item.res.sex" disabled>
568
+                <el-radio-group v-model="item.res.sex">
569 569
                   <el-radio :label="'0'">男</el-radio>
570 570
                   <el-radio :label="'1'">女</el-radio>
571 571
                 </el-radio-group>
@@ -820,7 +820,7 @@ export default {
820 820
     "initpaymentArr",
821 821
     "initpaymentArr1",
822 822
     "queryParams",
823
-    "caseAttachList",
823
+    // "caseAttachList",
824 824
     "columnValues",
825 825
     "detailsAwardForm"
826 826
   ],
@@ -1086,147 +1086,112 @@ export default {
1086 1086
     };
1087 1087
   },
1088 1088
   watch: {
1089
-    formData: {
1090
-      handler(val) {
1091
-        this.activeName = "first"
1092
-        this.formGrab.list = this.columnValues
1093
-        this.caseAttachListArr = []
1094
-        if (val) {
1095
-          this.applicateArr = [];
1096
-          this.quiltArr = [];
1097
-          // this.formData = this.form;
1098
-          this.fileList = [];
1089
+    visible(val) {
1090
+      this.activeName = "first"
1091
+      this.formGrab.list = this.columnValues
1092
+      this.caseAttachListArr = []
1093
+      if (val) {
1094
+        this.applicateArr = [];
1095
+        this.quiltArr = [];
1096
+        this.fileList = [];
1099 1097
 
1100
-          if (this.flag == "1" || this.flag == "0") {
1101
-            // this.form2.paymentArr = this.initpaymentArr;
1102
-            // this.form3.paymentArr1 = this.initpaymentArr1;
1103
-            this.caseAttachList.forEach((item) => {
1104
-              if (item.annexType == 2) {
1105
-                this.applicateArr.push({
1106
-                  annexName: item.annexName,
1107
-                  annexPath: item.annexPath,
1108
-                });
1109
-              }
1110
-              if (item.annexType == 6) {
1111
-                this.quiltArr.push({
1112
-                  annexName: item.annexName,
1113
-                  annexPath: item.annexPath,
1114
-                });
1115
-              }
1116
-            });
1117
-            if (this.caseAttachList.length > 0) {
1118
-              this.caseAttachListArr = this.caseAttachList
1119
-            }
1120
-            this.caseAttachList.forEach((item) => {
1121
-              if (item.annexType == 2) {
1122
-                this.fileList.push(item)
1123
-              }
1124
-            });
1125
-            this.fileList.forEach((item) => {
1126
-              item["name"] = item.annexName;
1127
-              item["certificatePath"] = item.annexPath;
1128
-            });
1129
-          }
1130
-          if (this.flag == "2") {
1131
-            this.form2 = {
1132
-              applicant: [
1133
-                {
1134
-                  applicant: {
1135
-                    roleType: 1,
1136
-                    name: "",
1137
-                    idCard: "",
1138
-                    code: "",
1139
-                    phone: "",
1140
-                    compLegalPerson: "",
1141
-                    email: "",
1142
-                    home: "",
1143
-                    address: "",
1144
-                    idType: 0,
1145
-                    nationality: 1,
1146
-                    birth: "",
1147
-                    sex: "1",
1148
-                    operatorFlag: 1,
1149
-                    organizeFlag: 0,
1150
-                  },
1151
-                  applicantAgent: {
1152
-                    roleType: 2,
1153
-                    name: "",
1154
-                    idCard: "",
1155
-                    code: "",
1156
-                    phone: "",
1157
-                    compLegalPerson: "",
1158
-                    email: "",
1159
-                    home: "",
1160
-                    address: "",
1161
-                    idType: 0,
1162
-                    nationality: 1,
1163
-                    birth: "",
1164
-                    sex: "1",
1165
-                    operatorFlag: 1,
1166
-                    organizeFlag: 0,
1167
-                  },
1168
-                },
1169
-              ],
1170
-              res: [
1171
-                {
1172
-                  res: {
1173
-                    roleType: 3,
1174
-                    name: "",
1175
-                    idCard: "",
1176
-                    code: "",
1177
-                    phone: "",
1178
-                    compLegalPerson: "",
1179
-                    email: "",
1180
-                    home: "",
1181
-                    address: "",
1182
-                    idType: 0,
1183
-                    nationality: 1,
1184
-                    birth: "",
1185
-                    sex: "0",
1186
-                    operatorFlag: 1,
1187
-                    organizeFlag: 0,
1188
-                  },
1189
-                  resAgent: {
1190
-                    roleType: 4,
1191
-                    name: "",
1192
-                    idCard: "",
1193
-                    code: "",
1194
-                    phone: "",
1195
-                    compLegalPerson: "",
1196
-                    email: "",
1197
-                    home: "",
1198
-                    address: "",
1199
-                    idType: 0,
1200
-                    nationality: 1,
1201
-                    birth: "",
1202
-                    sex: "",
1203
-                    operatorFlag: 1,
1204
-                    organizeFlag: 0,
1205
-                  }
1206
-                }
1207
-              ]
1208
-            }
1209
-            this.form3.paymentArr1 = [
1098
+
1099
+        if (this.flag == "2") {
1100
+          this.form2 = {
1101
+            applicant: [
1210 1102
               {
1211
-                identityType: 2,
1212
-                name: "",
1213
-                identityNum: "",
1214
-                contactTelphone: "",
1215
-                email: "",
1216
-                workAddress: "",
1217
-                workTelphone: "",
1218
-                contactAddress: "",
1219
-                nameAgent: "",
1220
-                contactTelphoneAgent: "",
1221
-                contactAddressAgent: "",
1103
+                applicant: {
1104
+                  roleType: 1,
1105
+                  name: "",
1106
+                  idCard: "",
1107
+                  code: "",
1108
+                  phone: "",
1109
+                  compLegalPerson: "",
1110
+                  email: "",
1111
+                  home: "",
1112
+                  address: "",
1113
+                  idType: 0,
1114
+                  nationality: 1,
1115
+                  birth: "",
1116
+                  sex: "1",
1117
+                  operatorFlag: 1,
1118
+                  organizeFlag: 0,
1119
+                },
1120
+                applicantAgent: {
1121
+                  roleType: 2,
1122
+                  name: "",
1123
+                  idCard: "",
1124
+                  code: "",
1125
+                  phone: "",
1126
+                  compLegalPerson: "",
1127
+                  email: "",
1128
+                  home: "",
1129
+                  address: "",
1130
+                  idType: 0,
1131
+                  nationality: 1,
1132
+                  birth: "",
1133
+                  sex: "1",
1134
+                  operatorFlag: 1,
1135
+                  organizeFlag: 0,
1136
+                },
1222 1137
               },
1223
-            ];
1138
+            ],
1139
+            res: [
1140
+              {
1141
+                res: {
1142
+                  roleType: 3,
1143
+                  name: "",
1144
+                  idCard: "",
1145
+                  code: "",
1146
+                  phone: "",
1147
+                  compLegalPerson: "",
1148
+                  email: "",
1149
+                  home: "",
1150
+                  address: "",
1151
+                  idType: 0,
1152
+                  nationality: 1,
1153
+                  birth: "",
1154
+                  sex: "0",
1155
+                  operatorFlag: 1,
1156
+                  organizeFlag: 0,
1157
+                },
1158
+                resAgent: {
1159
+                  roleType: 4,
1160
+                  name: "",
1161
+                  idCard: "",
1162
+                  code: "",
1163
+                  phone: "",
1164
+                  compLegalPerson: "",
1165
+                  email: "",
1166
+                  home: "",
1167
+                  address: "",
1168
+                  idType: 0,
1169
+                  nationality: 1,
1170
+                  birth: "",
1171
+                  sex: "",
1172
+                  operatorFlag: 1,
1173
+                  organizeFlag: 0,
1174
+                }
1175
+              }
1176
+            ]
1224 1177
           }
1178
+          this.form3.paymentArr1 = [
1179
+            {
1180
+              identityType: 2,
1181
+              name: "",
1182
+              identityNum: "",
1183
+              contactTelphone: "",
1184
+              email: "",
1185
+              workAddress: "",
1186
+              workTelphone: "",
1187
+              contactAddress: "",
1188
+              nameAgent: "",
1189
+              contactTelphoneAgent: "",
1190
+              contactAddressAgent: "",
1191
+            },
1192
+          ];
1225 1193
         }
1226
-      },
1227
-      deep: true,
1228
-    },
1229
-    visible(val) {
1194
+      }
1230 1195
       if (val && (this.flag == "0" || this.flag == "1")) {
1231 1196
         setTimeout(() => {
1232 1197
           this.detailsAwardNum = this.detailsAwardForm;
@@ -1258,6 +1223,33 @@ export default {
1258 1223
               item.resAgent = {}
1259 1224
             }
1260 1225
           })
1226
+          this.caseAttachList = data.caseAttachList;
1227
+          this.caseAttachList.forEach((item) => {
1228
+            if (item.annexType == 2) {
1229
+              this.applicateArr.push({
1230
+                annexName: item.annexName,
1231
+                annexPath: item.annexPath,
1232
+              });
1233
+            }
1234
+            if (item.annexType == 6) {
1235
+              this.quiltArr.push({
1236
+                annexName: item.annexName,
1237
+                annexPath: item.annexPath,
1238
+              });
1239
+            }
1240
+          });
1241
+          if (this.caseAttachList.length > 0) {
1242
+            this.caseAttachListArr = this.caseAttachList
1243
+          }
1244
+          this.caseAttachList.forEach((item) => {
1245
+            if (item.annexType == 2) {
1246
+              this.fileList.push(item)
1247
+            }
1248
+          });
1249
+          this.fileList.forEach((item) => {
1250
+            item["name"] = item.annexName;
1251
+            item["certificatePath"] = item.annexPath;
1252
+          });
1261 1253
           this.formData = data;
1262 1254
           this.form2 = data.affiliate;
1263 1255
         })
@@ -1308,7 +1300,7 @@ export default {
1308 1300
     // 文件上传成功
1309 1301
     handlSuccess(res, file) {
1310 1302
       this.caseAttachListArr.push(
1311
-        res.data,
1303
+        res
1312 1304
       );
1313 1305
     },
1314 1306
     // 文件超出个数限制时的钩子
@@ -1330,8 +1322,6 @@ export default {
1330 1322
       return this.$confirm(`确定移除 ${file.name}?`);
1331 1323
     },
1332 1324
     handleRemove(file, fileList) {
1333
-      console.log(file)
1334
-      console.log(fileList)
1335 1325
       console.log(this.caseAttachListArr)
1336 1326
       this.caseAttachListArr = this.caseAttachListArr.filter(item => item.annexId != file.annexId)
1337 1327
       // (this.caseAttachListArr = []),

+ 2
- 2
vue.config.js View File

@@ -12,10 +12,10 @@ 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:8001'  //测试
15
+  const API = 'http://121.40.189.20:8001'  //测试
16 16
 // const API = 'http://172.16.1.26:8001'  //Bs
17 17
 // const API = 'http://192.168.3.77:9001' //Q
18
-// const API = 'http://172.16.1.26:8001' //W
18
+// const API = 'http://172.16.0.103:8001' //W
19 19
 
20 20
 // vue.config.js 配置说明 
21 21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions