hhl123456789 преди 2 години
родител
ревизия
3ab7eacc73

+ 16
- 0
src/api/caseManagement/caseManagement.js Целия файл

199
     params: query
199
     params: query
200
   })
200
   })
201
 }
201
 }
202
+// 签名 
203
+export function msCaseSignUrlApplyPC(data) {
204
+  return request({
205
+    url: '/mssignSeal/msCaseSignUrlApplyPC',
206
+    method: 'post',
207
+    data: data
208
+  })
209
+}
210
+// 签名 
211
+export function getUserInfo(query) {
212
+  return request({
213
+    url: '/caseApplication/getUserInfo',
214
+    method: 'get',
215
+    params: query
216
+  })
217
+}
202
 
218
 

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

3
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
3
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
4
             <el-form-item label="案件状态" prop="caseFlowId">
4
             <el-form-item label="案件状态" prop="caseFlowId">
5
                 <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
5
                 <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
6
-                    <el-option v-for="dict in dict.type.case_flow_node" :key="dict.value" :label="dict.label"
7
-                        :value="dict.value" @keyup.enter.native="handleQuery"></el-option>
6
+                    <el-option v-for="dict in buttonList" :key="dict.id" :label="dict.caseStatusName"
7
+                        :value="dict.id" @keyup.enter.native="handleQuery"></el-option>
8
                 </el-select>
8
                 </el-select>
9
             </el-form-item>
9
             </el-form-item>
10
             <!-- <el-form-item label="申请机构" prop="applicationOrganId">
10
             <!-- <el-form-item label="申请机构" prop="applicationOrganId">
35
             <el-col :span="1.5">
35
             <el-col :span="1.5">
36
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase()">新增案件</el-button>
36
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase()">新增案件</el-button>
37
             </el-col>
37
             </el-col>
38
-            <el-col :span="1.5">
38
+            <!-- TODO 后期可能加上-->
39
+            <!-- <el-col :span="1.5">
39
                 <el-button type="primary" plain icon="el-icon-plus" size="mini"
40
                 <el-button type="primary" plain icon="el-icon-plus" size="mini"
40
                     @click="compressedPackages">案件压缩包上传</el-button>
41
                     @click="compressedPackages">案件压缩包上传</el-button>
41
-            </el-col>
42
+            </el-col> -->
42
         </el-row>
43
         </el-row>
43
         <el-table v-loading="loading" :data="dataList" style="width: 100%">
44
         <el-table v-loading="loading" :data="dataList" style="width: 100%">
44
             <el-table-column label="序号" type="index" align="center">
45
             <el-table-column label="序号" type="index" align="center">
143
 </template>
144
 </template>
144
 
145
 
145
 <script>
146
 <script>
146
-import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied} from '@/api/caseManagement/caseManagement.js'
147
+import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied,msCaseSignUrlApplyPC} from '@/api/caseManagement/caseManagement.js'
147
 import { listDept } from '@/api/system/dept.js'
148
 import { listDept } from '@/api/system/dept.js'
148
 import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
149
 import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
149
 import moment from "moment";
150
 import moment from "moment";
292
                 this.confirmMediation(val)
293
                 this.confirmMediation(val)
293
             }else if(type == 11){
294
             }else if(type == 11){
294
                 // 签名
295
                 // 签名
296
+                this.msCaseSignUrlApplyPCFn(val)
295
             }else if(type == 12){
297
             }else if(type == 12){
296
                 // 用印申请
298
                 // 用印申请
297
                 this.consultantApplica(val)
299
                 this.consultantApplica(val)
384
                 })
386
                 })
385
                 .catch(() => { });
387
                 .catch(() => { });
386
         },
388
         },
389
+        /** 签名 */
390
+        msCaseSignUrlApplyPCFn(row) {
391
+            // this.$modal
392
+            //     .confirm("是否")
393
+            //     .then(function () {
394
+            //         return msCaseSignUrlApplyPC({ caseId: row.id });
395
+            //     })
396
+            //     .then(() => {
397
+            //         this.getList(this.queryParams);
398
+            //         this.$modal.msgSuccess("立案申请成功");
399
+            //     })
400
+            //     .catch(() => { });
401
+            msCaseSignUrlApplyPC({ caseId: row.id }).then(res=>{
402
+                console.log(res,"PPPPPPPPPPPPPPPPPPPP");
403
+                window.open(res.data.sealUrl);
404
+            })
405
+        },
387
         /** 选择调解员 */
406
         /** 选择调解员 */
388
         selectMediator(val) {
407
         selectMediator(val) {
389
             this.mediatorVisable = true;
408
             this.mediatorVisable = true;

+ 85
- 26
src/views/caseManagement/components/addCase.vue Целия файл

51
                                 :autosize="{ minRows: 4, maxRows: 8 }" />
51
                                 :autosize="{ minRows: 4, maxRows: 8 }" />
52
                         </el-form-item>
52
                         </el-form-item>
53
                     </el-col> -->
53
                     </el-col> -->
54
-          <el-col :span="12">
54
+          <!-- <el-col :span="12">
55
             <el-form-item label="案件标的" prop="caseSubjectAmount" :rules="[
55
             <el-form-item label="案件标的" prop="caseSubjectAmount" :rules="[
56
               {
56
               {
57
                 required: true,
57
                 required: true,
61
             ]">
61
             ]">
62
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" />
62
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" />
63
             </el-form-item>
63
             </el-form-item>
64
-          </el-col>
65
-          <el-col :span="24">
64
+          </el-col> -->
65
+          <!-- <el-col :span="24">
66
             <el-form-item label="调解模板" prop="templateId" :rules="[
66
             <el-form-item label="调解模板" prop="templateId" :rules="[
67
               {
67
               {
68
                 required: true,
68
                 required: true,
74
                 <el-option v-for="item in templateList" :label="item.temName" :key="item.id" :value="item.id"></el-option>
74
                 <el-option v-for="item in templateList" :label="item.temName" :key="item.id" :value="item.id"></el-option>
75
               </el-select>
75
               </el-select>
76
             </el-form-item>
76
             </el-form-item>
77
-          </el-col>
77
+          </el-col> -->
78
           <el-col :span="12">
78
           <el-col :span="12">
79
             <el-form-item label="申请人案件证据资料上传:" prop="applicantEvidence">
79
             <el-form-item label="申请人案件证据资料上传:" prop="applicantEvidence">
80
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
80
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
115
           </el-col>
115
           </el-col>
116
           <el-col :span="24">
116
           <el-col :span="24">
117
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
117
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
118
-              <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
118
+              <el-radio-group v-model="formData.affiliate.organizeFlag" :disabled="modelFlag" @change="clearValidate">
119
                 <el-radio :label="0">自然人</el-radio>
119
                 <el-radio :label="0">自然人</el-radio>
120
                 <el-radio :label="1">机构</el-radio>
120
                 <el-radio :label="1">机构</el-radio>
121
               </el-radio-group>
121
               </el-radio-group>
140
                 trigger: 'blur',
140
                 trigger: 'blur',
141
               },
141
               },
142
             ]">
142
             ]">
143
-              <el-input v-model="formData.affiliate.applicationName" placeholder="请输入申请机构名称" />
143
+              <el-input v-model="formData.affiliate.applicationName" disabled placeholder="请输入申请人姓名" />
144
             </el-form-item>
144
             </el-form-item>
145
           </el-col>
145
           </el-col>
146
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
146
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
168
                 trigger: 'blur',
168
                 trigger: 'blur',
169
               },
169
               },
170
             ]">
170
             ]">
171
-              <el-input v-model="formData.affiliate.code" placeholder="请输入申请人的身份证号" />
171
+              <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
172
             </el-form-item>
172
             </el-form-item>
173
           </el-col>
173
           </el-col>
174
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
174
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
185
                 trigger: 'blur',
185
                 trigger: 'blur',
186
               },
186
               },
187
             ]">
187
             ]">
188
-              <el-input v-model="formData.affiliate.applicationEmail" placeholder="请输入申请人邮箱" />
188
+              <el-input v-model="formData.affiliate.applicationEmail" disabled placeholder="请输入申请人邮箱" />
189
             </el-form-item>
189
             </el-form-item>
190
           </el-col>
190
           </el-col>
191
-          <el-col :span="12">
191
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
192
+            <el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
193
+              {
194
+                required: true,
195
+                message: '申请人联系电话不能为空',
196
+                trigger: 'blur',
197
+              },
198
+              {
199
+                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
200
+                message: '请输入正确的手机号码',
201
+                trigger: 'blur',
202
+              },
203
+            ]">
204
+              <el-input v-model="formData.affiliate.applicationPhone" disabled placeholder="请输入申请人联系电话" />
205
+            </el-form-item>
206
+          </el-col>
207
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
192
             <el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
208
             <el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
193
               {
209
               {
194
                 required: true,
210
                 required: true,
204
               <el-input v-model="formData.affiliate.applicationPhone" placeholder="请输入申请人联系电话" />
220
               <el-input v-model="formData.affiliate.applicationPhone" placeholder="请输入申请人联系电话" />
205
             </el-form-item>
221
             </el-form-item>
206
           </el-col>
222
           </el-col>
207
-          <el-col :span="12">
223
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
208
             <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
224
             <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
209
               {
225
               {
210
                 required: true,
226
                 required: true,
250
                 trigger: 'blur',
266
                 trigger: 'blur',
251
               },
267
               },
252
             ]">
268
             ]">
253
-              <el-input v-model="formData.affiliate.contactTelphoneAgent" placeholder="请输入代理人联系电话" />
269
+              <el-input v-model="formData.affiliate.contactTelphoneAgent" disabled placeholder="请输入代理人联系电话" />
254
             </el-form-item>
270
             </el-form-item>
255
           </el-col>
271
           </el-col>
256
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
272
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
259
             </el-form-item>
275
             </el-form-item>
260
           </el-col>
276
           </el-col>
261
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
277
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
262
-            <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent" :rules="[
278
+            <el-form-item label="代理人姓名" prop="affiliate.nameAgent" :rules="[
263
               {
279
               {
264
                 required: true,
280
                 required: true,
265
-                message: '委托代理人姓名不能为空',
281
+                message: '代理人姓名不能为空',
266
                 trigger: 'blur',
282
                 trigger: 'blur',
267
               },
283
               },
268
             ]">
284
             ]">
269
-              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
285
+              <el-input v-model="formData.affiliate.nameAgent" disabled placeholder="请输入代理人姓名" />
270
             </el-form-item>
286
             </el-form-item>
271
           </el-col>
287
           </el-col>
272
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
288
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
273
-            <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent">
274
-              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
289
+            <el-form-item label="代理人姓名" prop="affiliate.nameAgent">
290
+              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入代理人姓名" />
275
             </el-form-item>
291
             </el-form-item>
276
           </el-col>
292
           </el-col>
277
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
293
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
288
                 trigger: 'blur',
304
                 trigger: 'blur',
289
               },
305
               },
290
             ]">
306
             ]">
291
-              <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
307
+              <el-input v-model="formData.affiliate.agentEmail" disabled placeholder="请输入代理人邮箱" />
292
             </el-form-item>
308
             </el-form-item>
293
           </el-col>
309
           </el-col>
294
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
310
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
395
             </el-form-item>
411
             </el-form-item>
396
           </el-col>
412
           </el-col>
397
         </el-row>
413
         </el-row>
398
-        <el-col :span="24" v-if="modelFlag">
399
-          <div style="display: inline-flex">
400
-            <div class="infoIcon"></div>
401
-            <div class="caseInfo">自定义规则内容</div>
402
-          </div>
403
-          <el-divider></el-divider>
404
-        </el-col>
405
         <el-col :span="24" v-if="modelFlag">
414
         <el-col :span="24" v-if="modelFlag">
406
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
415
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
407
             <el-input type="textarea" v-model="item.value"></el-input>
416
             <el-input type="textarea" v-model="item.value"></el-input>
428
           </div>
437
           </div>
429
         </el-card>
438
         </el-card>
430
       </div>
439
       </div>
431
-      <div slot="footer" class="dialog-footer">
440
+      <div slot="footer" class="dialog-footer" v-if="buttonFlag">
432
         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
441
         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
433
         <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
442
         <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
434
       </div>
443
       </div>
441
   caseApplicationSelectById,
450
   caseApplicationSelectById,
442
   updateComfire,
451
   updateComfire,
443
   getInfoByIdCard,
452
   getInfoByIdCard,
453
+  getUserInfo
444
 } from "@/api/caseManagement/caseManagement.js";
454
 } from "@/api/caseManagement/caseManagement.js";
445
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
455
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
446
 import { getToken } from "@/utils/auth";
456
 import { getToken } from "@/utils/auth";
479
       },
489
       },
480
       applicantEvidence: [], //申请人证据
490
       applicantEvidence: [], //申请人证据
481
       respondentEvidence: [], //被申请人证据
491
       respondentEvidence: [], //被申请人证据
492
+      buttonFlag: true,
493
+      getUserInfoList: {}
482
     };
494
     };
483
   },
495
   },
484
   watch: {
496
   watch: {
486
       if (val == 1) {
498
       if (val == 1) {
487
         this.title = "新增案件";
499
         this.title = "新增案件";
488
         this.modelFlag = false;
500
         this.modelFlag = false;
501
+        this.buttonFlag = true;
489
         this.formData = {
502
         this.formData = {
490
           affiliate: {
503
           affiliate: {
491
             organizeFlag: 0,
504
             organizeFlag: 0,
497
       } else if (val == 3) {
510
       } else if (val == 3) {
498
         this.title = "修改案件";
511
         this.title = "修改案件";
499
         this.modelFlag = true;
512
         this.modelFlag = true;
513
+        this.buttonFlag = true;
500
       } else if (val == 2) {
514
       } else if (val == 2) {
501
         this.title = "案件详情";
515
         this.title = "案件详情";
502
         this.modelFlag = true;
516
         this.modelFlag = true;
517
+        this.buttonFlag = false;
503
       }
518
       }
504
     },
519
     },
505
     addVisable(val) {
520
     addVisable(val) {
509
         if (this.addModifyData != 1) {
524
         if (this.addModifyData != 1) {
510
           this.caseApplicationSelectByIdFn(this.caseData.id);
525
           this.caseApplicationSelectByIdFn(this.caseData.id);
511
         }
526
         }
527
+        if (this.formData.affiliate.organizeFlag == 0) {
528
+          this.formData.affiliate.applicationName = this.getUserInfoList.nickName;
529
+          this.formData.affiliate.code = this.getUserInfoList.idCard;
530
+          this.formData.affiliate.applicationEmail = this.getUserInfoList.email;
531
+          this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber;
532
+        } else if (this.formData.affiliate.organizeFlag == 1) {
533
+          this.formData.affiliate.nameAgent = this.getUserInfoList.nickName;
534
+          this.formData.affiliate.agentEmail = this.getUserInfoList.email;
535
+          this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber;
536
+        }
512
       }
537
       }
513
     },
538
     },
539
+    formData: {
540
+      handler(newVal) {
541
+        if (newVal) {
542
+          console.log('newVal========newVal==========newVal', newVal);
543
+          if (newVal.affiliate.organizeFlag == 0) {
544
+            this.formData.affiliate.applicationName = this.getUserInfoList.nickName;
545
+            this.formData.affiliate.code = this.getUserInfoList.idCard;
546
+            this.formData.affiliate.applicationEmail = this.getUserInfoList.email;
547
+            this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber;
548
+            // this.formData.affiliate.nameAgent = '';
549
+            // this.formData.affiliate.agentEmail = '';
550
+            // this.formData.affiliate.contactTelphoneAgent = '';
551
+          } else if (newVal.affiliate.organizeFlag == 1) {
552
+            // this.formData.affiliate.applicationName = "";
553
+            // this.formData.affiliate.code = "";
554
+            // this.formData.affiliate.applicationEmail = "";
555
+            // this.formData.affiliate.applicationPhone = "";
556
+            this.formData.affiliate.nameAgent = this.getUserInfoList.nickName;
557
+            this.formData.affiliate.agentEmail = this.getUserInfoList.email;
558
+            this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber;
559
+          }
560
+        }
561
+      },
562
+      deep: true, // 深度监听
563
+      immediate: true, // 初始化监听
564
+    }
514
   },
565
   },
515
   created() {
566
   created() {
516
     console.log(this.formData, "000000000000000000")
567
     console.log(this.formData, "000000000000000000")
568
+    this.getUserInfoFn();
517
   },
569
   },
518
   methods: {
570
   methods: {
519
     /** 切换申请类型 */
571
     /** 切换申请类型 */
521
       console.log(val, "变化");
573
       console.log(val, "变化");
522
       // this.$refs["ruleForm"].resetFields();
574
       // this.$refs["ruleForm"].resetFields();
523
     },
575
     },
576
+    /**获取申请人信息 */
577
+    getUserInfoFn() {
578
+      getUserInfo().then(res => {
579
+        console.log(res, "信息信息信息信息信息信息信息信息信息信息信息信息信息信息");
580
+        this.getUserInfoList = res.data;
581
+      })
582
+    },
524
     /** 根据案件id获取对应信息 */
583
     /** 根据案件id获取对应信息 */
525
     caseApplicationSelectByIdFn(data) {
584
     caseApplicationSelectByIdFn(data) {
526
       this.applicantEvidence = [];
585
       this.applicantEvidence = [];
611
         }
670
         }
612
       });
671
       });
613
     },
672
     },
614
-    clearValidate() {
673
+    clearValidate(val) {
615
       this.$refs["ruleForm"].clearValidate()
674
       this.$refs["ruleForm"].clearValidate()
616
     },
675
     },
617
     cancel() {
676
     cancel() {

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

15
               </div>
15
               </div>
16
             </el-upload>
16
             </el-upload>
17
           </el-form-item>
17
           </el-form-item>
18
-          <el-form-item :span="24" label="裁决书模板" prop="templateId">
18
+          <el-form-item :span="24" label="调解书模板" prop="templateId">
19
             <el-select v-model="form.templateId" placeholder="请选择">
19
             <el-select v-model="form.templateId" placeholder="请选择">
20
               <el-option v-for="dict in templateList" :key="dict.id" :label="dict.temName" :value="dict.id"></el-option>
20
               <el-option v-for="dict in templateList" :key="dict.id" :label="dict.temName" :value="dict.id"></el-option>
21
             </el-select>
21
             </el-select>
48
         //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
48
         //   { required: true, message: "案件压缩包不能为空", trigger: "blur" },
49
         // ],
49
         // ],
50
         templateId: [
50
         templateId: [
51
-          { required: true, message: "裁决书模板不能为空", trigger: "blur" },
51
+          { required: true, message: "调解书模板不能为空", trigger: "blur" },
52
         ],
52
         ],
53
       },
53
       },
54
       paramsData:{
54
       paramsData:{

+ 1
- 1
src/views/system/dept/index.vue Целия файл

197
       },
197
       },
198
       options: [{
198
       options: [{
199
         value: 1,
199
         value: 1,
200
-        label: '仲裁机构'
200
+        label: '调解机构'
201
       }, {
201
       }, {
202
         value: 2,
202
         value: 2,
203
         label: '金融公司'
203
         label: '金融公司'

+ 9
- 0
vue.config.js Целия файл

14
 // const API = 'http://121.40.189.20:9001'  //生产
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
 // const API = 'http://192.168.3.18:6001'  //B
16
 // const API = 'http://192.168.3.18:6001'  //B
17
+<<<<<<< HEAD
18
+// const API = 'http://172.16.0.237:6001' //Q
19
+// const API = 'http://172.16.1.43:6001' //w
20
+=======
17
 // const API = 'http://172.16.1.30:6001' //Q
21
 // const API = 'http://172.16.1.30:6001' //Q
22
+<<<<<<< HEAD
18
 // const API = 'http://172.16.1.43:6001' //w
23
 // const API = 'http://172.16.1.43:6001' //w
24
+=======
25
+// const API = 'http://172.16.1.17:6001' //w
26
+>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
27
+>>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
19
 
28
 
20
 // vue.config.js 配置说明
29
 // vue.config.js 配置说明
21
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
30
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions