Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb

src/api/caseManagement/caseManagement.js

@@ -175,3 +175,19 @@ export function confirmMediation(data) {
     data: data,
   })
 }
+// 查询部门列表
+export function listDeptApplied(query) {
+  return request({
+    url: '/system/dept/selectList',
+    method: 'get',
+    params: query
+  })
+}
+// 修改立案申请接口
+export function updateComfire(data) {
+  return request({
+    url: "/caseApplication/update",
+    method: "post",
+    data: data,
+  })
+}

src/views/caseManagement/caseList.vue

@@ -33,7 +33,7 @@
         </el-form>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase">新增案件</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addCase(2)">新增案件</el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini"
@@ -60,7 +60,7 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
-                    <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
+                    <el-button size="mini" @click="eidtNodeprocess(scope.row,1)" type="text"
                         icon="el-icon-edit">修改</el-button>
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
                     <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
@@ -91,7 +91,7 @@
             @pagination="getList(queryParams)" />
         <!-- 新增编辑详情 -->
         <addCase :addVisable="addVisable" :queryParams="queryParams" @cancelCaseAdd="cancelCaseAdd" @getList="getList"
-            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag"></addCase>
+            :caseData="caseData" :caseDisabled="caseDisabled" :tabFlag="tabFlag" :addModifyData="addModifyData"></addCase>
         <!-- 压缩包导入     -->
         <caseCompressionPackage :openCompressedPackages="openCompressedPackages" :queryParams="queryParams"
             @cancelCompreess="cancelCompreess" :getList="getList">
@@ -136,7 +136,7 @@
 </template>
 
 <script>
-import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign} from '@/api/caseManagement/caseManagement.js'
+import { caseApplicationList, caseApplicationSelectById,submitCaseApply,selectPaymentDetail,sealApply,selectSealUrl,listCaseLogRecord,msCaseFile,msCaseSign,listDeptApplied} from '@/api/caseManagement/caseManagement.js'
 import { listDept } from '@/api/system/dept.js'
 import { queryCaseFlowInfo } from '@/api/caseprocessManagement/caseprocessManagement.js'
 import moment from "moment";
@@ -212,6 +212,7 @@ export default {
             caselogDataArr:[],//案件日志数据
             flagLoading: true, //案件日志弹框loading
             confirmTionVisable:false,//确认调解书弹窗
+            addModifyData:null,//新增修改传的参数
             mediatorData:{},
             flag: null,
             caseData: {},
@@ -299,7 +300,8 @@ export default {
             })
         },
         /** 新增案件 */
-        addCase() {
+        addCase(val) {
+            this.addModifyData =val;
             this.addVisable = true;
             this.caseData = {};
             this.caseDisabled = false;
@@ -314,7 +316,8 @@ export default {
             this.tabFlag = true;
         },
         /** 修改案件 */
-        eidtNodeprocess(row) {
+        eidtNodeprocess(row,val) {
+            this.addModifyData = val
             this.addVisable = true;
             this.caseData = row;
             this.caseDisabled = false;
@@ -402,7 +405,7 @@ export default {
         },
         /** 获取所有部门 */
         listDeptFn() {
-            listDept().then(res => {
+            listDeptApplied().then(res => {
                 this.deptList = res.data;
             })
         },

src/views/caseManagement/components/addCase.vue

@@ -307,7 +307,7 @@
                 <el-col :span="24" v-if="modelFlag">
                     <div style="display: inline-flex">
                         <div class="infoIcon"></div>
-                        <div class="caseInfo">抓取规则设置</div>
+                        <div class="caseInfo">自定义规则内容</div>
                     </div>
                     <el-divider></el-divider>
                 </el-col>
@@ -347,14 +347,15 @@
 <script>
 import {
     caseApplicationInsert,
-    caseApplicationSelectById
+    caseApplicationSelectById,
+    updateComfire
 } from "@/api/caseManagement/caseManagement.js";
 import {
     getTemplate,
 } from "@/api/officialSeal/officialSeal.js";
 import { getToken } from "@/utils/auth";
 export default {
-    props: ["addVisable", "queryParams", "caseData", "caseDisabled","tabFlag"],
+    props: ["addVisable", "queryParams", "caseData", "caseDisabled","tabFlag","addModifyData"],
     dicts: ["case_built_type"],
     data() {
         return {
@@ -440,6 +441,14 @@ export default {
                 this.$emit('getList', this.queryParams);
             })
         },
+        // 修改确定
+        modifyData(data) {
+            updateComfire(data).then(res => {
+                this.$modal.msgSuccess("修改成功！");
+                this.$emit("cancelCaseAdd");
+                this.$emit('getList', this.queryParams);
+            })
+        },
         /** 获取裁决书模板 */
         getTemplateFn(data) {
             getTemplate(data).then(res => {
@@ -491,7 +500,12 @@ export default {
         submitForm() {
             this.$refs['ruleForm'].validate((valid) => {
                 if (valid) {
-                    this.insertFn(this.formData)
+                    if(this.addModifyData == 1){
+                        this.modifyData(this.formData)
+                    }else if(this.addModifyData == 2){
+                        this.insertFn(this.formData)
+                    }
+                    
                 }
             });
         },