'演示问题修复-2'

src/api/caseManagement/caseManagement.js

@@ -199,4 +199,20 @@ export function getInfoByIdCard(query) {
     params: query
   })
 }
+// 签名 
+export function msCaseSignUrlApplyPC(data) {
+  return request({
+    url: '/mssignSeal/msCaseSignUrlApplyPC',
+    method: 'post',
+    data: data
+  })
+}
+// 签名 
+export function getUserInfo(query) {
+  return request({
+    url: '/caseApplication/getUserInfo',
+    method: 'get',
+    params: query
+  })
+}
 

src/views/caseManagement/caseList.vue

@@ -3,8 +3,8 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
             <el-form-item label="案件状态" prop="caseFlowId">
                 <el-select v-model="queryParams.caseFlowId" placeholder="请选择" clearable>
-                    <el-option v-for="dict in dict.type.case_flow_node" :key="dict.value" :label="dict.label"
-                        :value="dict.value" @keyup.enter.native="handleQuery"></el-option>
+                    <el-option v-for="dict in buttonList" :key="dict.id" :label="dict.caseStatusName"
+                        :value="dict.id" @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="申请机构" prop="applicationOrganId">
@@ -35,10 +35,11 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase()">新增案件</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <!-- TODO 后期可能加上-->
+            <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini"
                     @click="compressedPackages">案件压缩包上传</el-button>
-            </el-col>
+            </el-col> -->
         </el-row>
         <el-table v-loading="loading" :data="dataList" style="width: 100%">
             <el-table-column label="序号" type="index" align="center">
@@ -143,7 +144,7 @@
 </template>
 
 <script>
-import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied} from '@/api/caseManagement/caseManagement.js'
+import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied,msCaseSignUrlApplyPC} from '@/api/caseManagement/caseManagement.js'
 import { listDept } from '@/api/system/dept.js'
 import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
 import moment from "moment";
@@ -292,6 +293,7 @@ export default {
                 this.confirmMediation(val)
             }else if(type == 11){
                 // 签名
+                this.msCaseSignUrlApplyPCFn(val)
             }else if(type == 12){
                 // 用印申请
                 this.consultantApplica(val)
@@ -384,6 +386,23 @@ export default {
                 })
                 .catch(() => { });
         },
+        /** 签名 */
+        msCaseSignUrlApplyPCFn(row) {
+            // this.$modal
+            //     .confirm("是否")
+            //     .then(function () {
+            //         return msCaseSignUrlApplyPC({ caseId: row.id });
+            //     })
+            //     .then(() => {
+            //         this.getList(this.queryParams);
+            //         this.$modal.msgSuccess("立案申请成功");
+            //     })
+            //     .catch(() => { });
+            msCaseSignUrlApplyPC({ caseId: row.id }).then(res=>{
+                console.log(res,"PPPPPPPPPPPPPPPPPPPP");
+                window.open(res.data.sealUrl);
+            })
+        },
         /** 选择调解员 */
         selectMediator(val) {
             this.mediatorVisable = true;

src/views/caseManagement/components/addCase.vue

@@ -51,7 +51,7 @@
                                 :autosize="{ minRows: 4, maxRows: 8 }" />
                         </el-form-item>
                     </el-col> -->
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="案件标的" prop="caseSubjectAmount" :rules="[
               {
                 required: true,
@@ -61,8 +61,8 @@
             ]">
               <el-input v-model="formData.caseSubjectAmount" placeholder="请输入案件标的" />
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
+          </el-col> -->
+          <!-- <el-col :span="24">
             <el-form-item label="调解模板" prop="templateId" :rules="[
               {
                 required: true,
@@ -74,7 +74,7 @@
                 <el-option v-for="item in templateList" :label="item.temName" :key="item.id" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="申请人案件证据资料上传：" prop="applicantEvidence">
               <el-upload class="upload-demo" ref="fileupload" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
@@ -115,7 +115,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
-              <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
+              <el-radio-group v-model="formData.affiliate.organizeFlag" :disabled="modelFlag" @change="clearValidate">
                 <el-radio :label="0">自然人</el-radio>
                 <el-radio :label="1">机构</el-radio>
               </el-radio-group>
@@ -140,7 +140,7 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.applicationName" placeholder="请输入申请机构名称" />
+              <el-input v-model="formData.affiliate.applicationName" disabled placeholder="请输入申请人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
@@ -168,7 +168,7 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.code" placeholder="请输入申请人的身份证号" />
+              <el-input v-model="formData.affiliate.code" disabled placeholder="请输入申请人的身份证号" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
@@ -185,10 +185,26 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.applicationEmail" placeholder="请输入申请人邮箱" />
+              <el-input v-model="formData.affiliate.applicationEmail" disabled placeholder="请输入申请人邮箱" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
+            <el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
+              {
+                required: true,
+                message: '申请人联系电话不能为空',
+                trigger: 'blur',
+              },
+              {
+                pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
+                message: '请输入正确的手机号码',
+                trigger: 'blur',
+              },
+            ]">
+              <el-input v-model="formData.affiliate.applicationPhone" disabled placeholder="请输入申请人联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="申请人电话" prop="affiliate.applicationPhone" :rules="[
               {
                 required: true,
@@ -204,7 +220,7 @@
               <el-input v-model="formData.affiliate.applicationPhone" placeholder="请输入申请人联系电话" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
               {
                 required: true,
@@ -250,7 +266,7 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.contactTelphoneAgent" placeholder="请输入代理人联系电话" />
+              <el-input v-model="formData.affiliate.contactTelphoneAgent" disabled placeholder="请输入代理人联系电话" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
@@ -259,19 +275,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
-            <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent" :rules="[
+            <el-form-item label="代理人姓名" prop="affiliate.nameAgent" :rules="[
               {
                 required: true,
-                message: '委托代理人姓名不能为空',
+                message: '代理人姓名不能为空',
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
+              <el-input v-model="formData.affiliate.nameAgent" disabled placeholder="请输入代理人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item label="委托代理人姓名" prop="affiliate.nameAgent">
-              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入委托代理人姓名" />
+            <el-form-item label="代理人姓名" prop="affiliate.nameAgent">
+              <el-input v-model="formData.affiliate.nameAgent" placeholder="请输入代理人姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
@@ -288,7 +304,7 @@
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
+              <el-input v-model="formData.affiliate.agentEmail" disabled placeholder="请输入代理人邮箱" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
@@ -395,13 +411,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-col :span="24" v-if="modelFlag">
-          <div style="display: inline-flex">
-            <div class="infoIcon"></div>
-            <div class="caseInfo">自定义规则内容</div>
-          </div>
-          <el-divider></el-divider>
-        </el-col>
         <el-col :span="24" v-if="modelFlag">
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
             <el-input type="textarea" v-model="item.value"></el-input>
@@ -428,7 +437,7 @@
           </div>
         </el-card>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" v-if="buttonFlag">
         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
         <el-button type="primary" @click="submitForm" class="endbutton"><span>确认</span></el-button>
       </div>
@@ -441,6 +450,7 @@ import {
   caseApplicationSelectById,
   updateComfire,
   getInfoByIdCard,
+  getUserInfo
 } from "@/api/caseManagement/caseManagement.js";
 import { getTemplate } from "@/api/officialSeal/officialSeal.js";
 import { getToken } from "@/utils/auth";
@@ -479,6 +489,8 @@ export default {
       },
       applicantEvidence: [], //申请人证据
       respondentEvidence: [], //被申请人证据
+      buttonFlag: true,
+      getUserInfoList: {}
     };
   },
   watch: {
@@ -486,6 +498,7 @@ export default {
       if (val == 1) {
         this.title = "新增案件";
         this.modelFlag = false;
+        this.buttonFlag = true;
         this.formData = {
           affiliate: {
             organizeFlag: 0,
@@ -497,9 +510,11 @@ export default {
       } else if (val == 3) {
         this.title = "修改案件";
         this.modelFlag = true;
+        this.buttonFlag = true;
       } else if (val == 2) {
         this.title = "案件详情";
         this.modelFlag = true;
+        this.buttonFlag = false;
       }
     },
     addVisable(val) {
@@ -509,11 +524,48 @@ export default {
         if (this.addModifyData != 1) {
           this.caseApplicationSelectByIdFn(this.caseData.id);
         }
+        if (this.formData.affiliate.organizeFlag == 0) {
+          this.formData.affiliate.applicationName = this.getUserInfoList.nickName;
+          this.formData.affiliate.code = this.getUserInfoList.idCard;
+          this.formData.affiliate.applicationEmail = this.getUserInfoList.email;
+          this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber;
+        } else if (this.formData.affiliate.organizeFlag == 1) {
+          this.formData.affiliate.nameAgent = this.getUserInfoList.nickName;
+          this.formData.affiliate.agentEmail = this.getUserInfoList.email;
+          this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber;
+        }
       }
     },
+    formData: {
+      handler(newVal) {
+        if (newVal) {
+          console.log('newVal========newVal==========newVal', newVal);
+          if (newVal.affiliate.organizeFlag == 0) {
+            this.formData.affiliate.applicationName = this.getUserInfoList.nickName;
+            this.formData.affiliate.code = this.getUserInfoList.idCard;
+            this.formData.affiliate.applicationEmail = this.getUserInfoList.email;
+            this.formData.affiliate.applicationPhone = this.getUserInfoList.phonenumber;
+            // this.formData.affiliate.nameAgent = '';
+            // this.formData.affiliate.agentEmail = '';
+            // this.formData.affiliate.contactTelphoneAgent = '';
+          } else if (newVal.affiliate.organizeFlag == 1) {
+            // this.formData.affiliate.applicationName = "";
+            // this.formData.affiliate.code = "";
+            // this.formData.affiliate.applicationEmail = "";
+            // this.formData.affiliate.applicationPhone = "";
+            this.formData.affiliate.nameAgent = this.getUserInfoList.nickName;
+            this.formData.affiliate.agentEmail = this.getUserInfoList.email;
+            this.formData.affiliate.contactTelphoneAgent = this.getUserInfoList.phonenumber;
+          }
+        }
+      },
+      deep: true, // 深度监听
+      immediate: true, // 初始化监听
+    }
   },
   created() {
     console.log(this.formData, "000000000000000000")
+    this.getUserInfoFn();
   },
   methods: {
     /** 切换申请类型 */
@@ -521,6 +573,13 @@ export default {
       console.log(val, "变化");
       // this.$refs["ruleForm"].resetFields();
     },
+    /**获取申请人信息 */
+    getUserInfoFn() {
+      getUserInfo().then(res => {
+        console.log(res, "信息信息信息信息信息信息信息信息信息信息信息信息信息信息");
+        this.getUserInfoList = res.data;
+      })
+    },
     /** 根据案件id获取对应信息 */
     caseApplicationSelectByIdFn(data) {
       this.applicantEvidence = [];
@@ -611,7 +670,7 @@ export default {
         }
       });
     },
-    clearValidate() {
+    clearValidate(val) {
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {

src/views/caseManagement/components/caseCompressionPackage.vue

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

src/views/system/dept/index.vue

@@ -197,7 +197,7 @@ export default {
       },
       options: [{
         value: 1,
-        label: '仲裁机构'
+        label: '调解机构'
       }, {
         value: 2,
         label: '金融公司'

vue.config.js

@@ -14,8 +14,17 @@ 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:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
+<<<<<<< HEAD
+// const API = 'http://172.16.0.237:6001' //Q
+// const API = 'http://172.16.1.43:6001' //w
+=======
 // const API = 'http://172.16.1.30:6001' //Q
+<<<<<<< HEAD
 // const API = 'http://172.16.1.43:6001' //w
+=======
+// const API = 'http://172.16.1.17:6001' //w
+>>>>>>> 14df1eebfbde9573a5c541678ad9dfbb33797007
+>>>>>>> 2fbaf17b60f7f1acb11b1a884129643927270d1b
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions