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

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

gyj 2 лет назад
Родитель
Сommit
7f3138d499

+ 6
- 4
src/views/caseManagement/caseList.vue Просмотреть файл

63
                 <template slot-scope="scope">
63
                 <template slot-scope="scope">
64
                     <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
64
                     <!-- <el-button size="mini" type="text" icon="el-icon-check" @click="onsubmitRow(scope.row)" v-if="statusRole(scope.row.caseFlowId)">提交</el-button> -->
65
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
65
                     <el-button size="mini" @click="eidtNodeprocess(scope.row)" type="text"
66
-                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']">修改</el-button>
66
+                        icon="el-icon-edit" v-hasPermi="['caseManagement:list:edit']" v-if="scope.row.caseFlowId <= 1">修改</el-button>
67
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
67
                     <el-button size="mini" @click="checkDetail(scope.row)" type="text" icon="el-icon-view">查看详情</el-button>
68
                     <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
68
                     <!-- <el-button size="mini" @click="consultantApplica(scope.row)" type="text" icon="el-icon-tickets">法律顾问用印申请</el-button> -->
69
                     <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
69
                     <!-- <el-button size="mini" @click="departmentApplica(scope.row)" type="text" icon="el-icon-edit-outline">部门长用印</el-button> -->
78
                     <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
78
                     <!-- <el-button size="mini" @click="signMediation(scope.row)" type="text" icon="el-icon-edit-outline">申请人签收</el-button> -->
79
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
79
                     <!-- <el-button size="mini" @click="receivedMediation(scope.row)" type="text" icon="el-icon-edit-outline">被申请人签收</el-button>                 -->
80
                     <el-button size="mini" type="text" icon="el-icon-edit"
80
                     <el-button size="mini" type="text" icon="el-icon-edit"
81
-                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']">上传证据</el-button>
81
+                        @click="evidenceUpload(scope.row)" v-hasPermi="['caseManagement:list:evidenceEdit']" v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
82
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 || scope.row.caseFlowId == 16 || scope.row.caseFlowId == 17" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
82
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 || scope.row.caseFlowId == 16 || scope.row.caseFlowId == 17" @click="caseFilingDetails(scope.row)">归档详情</el-button>  
83
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
83
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="payStatus(scope.row)">缴费</el-button> -->
84
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
84
                     <!-- <el-button size="mini" type="text" icon="el-icon-tickets" @click="selectMediator(scope.row)">预约时间</el-button> -->
139
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
139
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
140
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
140
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
141
         <!-- 归档详情 -->
141
         <!-- 归档详情 -->
142
-        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"></caseFilingDetailsPage>
142
+        <caseFilingDetailsPage :showarchiveDetails="showarchiveDetails" :caseFilingData="caseFilingData" @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS"></caseFilingDetailsPage>
143
     </div>
143
     </div>
144
 </template>
144
 </template>
145
 
145
 
253
             buttonList: [],
253
             buttonList: [],
254
             caseStausArr: [],//案件状态
254
             caseStausArr: [],//案件状态
255
             isapplicant: true, //判断角色申请人或非申请人
255
             isapplicant: true, //判断角色申请人或非申请人
256
+            caseFilingData:{}
256
         };
257
         };
257
     },
258
     },
258
     created() {
259
     created() {
690
          },
691
          },
691
         //归档详情
692
         //归档详情
692
         caseFilingDetails(val){
693
         caseFilingDetails(val){
693
-            this.showarchiveDetails = true
694
+            this.showarchiveDetails = true;
695
+            this.caseFilingData = val;
694
             let vals = {id:val.id}
696
             let vals = {id:val.id}
695
             caseApplicationSelectById(vals).then(res=>{
697
             caseApplicationSelectById(vals).then(res=>{
696
                 res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)
698
                 res.data.affiliate.respondentSex = Number(res.data.affiliate.respondentSex)

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

10
             <el-tab-pane label="申请人案件证据资料" name="first"></el-tab-pane>
10
             <el-tab-pane label="申请人案件证据资料" name="first"></el-tab-pane>
11
             <!-- <el-tab-pane label="被申请人案件证据资料" name="second"></el-tab-pane> -->
11
             <!-- <el-tab-pane label="被申请人案件证据资料" name="second"></el-tab-pane> -->
12
             <el-tab-pane label="调解书" name="third"></el-tab-pane>
12
             <el-tab-pane label="调解书" name="third"></el-tab-pane>
13
-            <el-tab-pane label="案件视频" name="fourth"></el-tab-pane>
14
-            <el-tab-pane label="庭审笔录" name="six"></el-tab-pane>
13
+            <el-tab-pane label="案件视频" name="fourth" v-if="caseFilingData.mediationMethod == '1'"></el-tab-pane>
14
+            <el-tab-pane label="庭审笔录" name="six" v-if="caseFilingData.mediationMethod == '1'"></el-tab-pane>
15
          </el-tabs>
15
          </el-tabs>
16
          <div v-show="activeName=='first'">
16
          <div v-show="activeName=='first'">
17
              
17
              
252
 <script>
252
 <script>
253
 import { getToken } from "@/utils/auth";
253
 import { getToken } from "@/utils/auth";
254
 export default {
254
 export default {
255
-    props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts"],
255
+    props: ["showarchiveDetails","detailsAwardNum","videoList","flagLoadingS","trialTranscripts","caseFilingData"],
256
   components: {
256
   components: {
257
     
257
     
258
   },
258
   },

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

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <el-dialog title="秘书确认调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
3
+        <el-dialog title="核实调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
4
             :distroy-on-close="true">
4
             :distroy-on-close="true">
5
             <div>
5
             <div>
6
                 <div v-if="tableDataFlag">
6
                 <div v-if="tableDataFlag">

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

4
             <el-descriptions title="案件内容" :column="2" border>
4
             <el-descriptions title="案件内容" :column="2" border>
5
                 <el-descriptions-item label="案件编号">{{ evidenceData.caseNum }}</el-descriptions-item>
5
                 <el-descriptions-item label="案件编号">{{ evidenceData.caseNum }}</el-descriptions-item>
6
                 <el-descriptions-item label="申请人">{{ evidenceData.applicationName }}</el-descriptions-item>
6
                 <el-descriptions-item label="申请人">{{ evidenceData.applicationName }}</el-descriptions-item>
7
-                <el-descriptions-item label="案件标的">{{ evidenceData.caseSubjectAmount }}</el-descriptions-item>
7
+                <!-- <el-descriptions-item label="案件标的">{{ evidenceData.caseSubjectAmount }}</el-descriptions-item> -->
8
                 <el-descriptions-item label="案件状态">
8
                 <el-descriptions-item label="案件状态">
9
                     <el-tag size="small">{{ evidenceData.caseStatusName }}</el-tag>
9
                     <el-tag size="small">{{ evidenceData.caseStatusName }}</el-tag>
10
                 </el-descriptions-item>
10
                 </el-descriptions-item>

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

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <el-dialog title="秘书确认时间" :visible="timeConfirmVisable" v-if="timeConfirmVisable" @close="cancel" center
3
+        <el-dialog title="确认时间" :visible="timeConfirmVisable" v-if="timeConfirmVisable" @close="cancel" center
4
             :distroy-on-close="true">
4
             :distroy-on-close="true">
5
             <!-- <div style="margin-bottom: 20px;">
5
             <!-- <div style="margin-bottom: 20px;">
6
                 <el-radio-group v-model="confirmFlag">
6
                 <el-radio-group v-model="confirmFlag">
13
                     <!-- <div style="margin-top: 20px;margin-bottom: 20px;">时间</div> -->
13
                     <!-- <div style="margin-top: 20px;margin-bottom: 20px;">时间</div> -->
14
                     <el-form label-position="right" label-width="80px" :model="formLabelAlign">
14
                     <el-form label-position="right" label-width="80px" :model="formLabelAlign">
15
                         <el-form-item label="时间">
15
                         <el-form-item label="时间">
16
-                            <el-date-picker v-model="formLabelAlign.name" type="datetime" placeholder="选择日期时间">
16
+                            <el-date-picker v-model="formLabelAlign.name" type="datetime" :picker-options="pickerOptions" placeholder="选择日期时间">
17
                             </el-date-picker>
17
                             </el-date-picker>
18
                             <!-- <el-input v-else v-model="formLabelAlign.name"></el-input> -->
18
                             <!-- <el-input v-else v-model="formLabelAlign.name"></el-input> -->
19
                         </el-form-item>
19
                         </el-form-item>
43
                 time: [],
43
                 time: [],
44
                 name: ""
44
                 name: ""
45
             },
45
             },
46
-            formTimeArr: [],
46
+            pickerOptions: {
47
+                disabledDate(time) {
48
+                    return time.getTime() <= Date.now() -1 * 24 * 3600 * 1000; // 禁用超过当前时间的日期
49
+                },
50
+                selectableRange: `${new Date()}- 23:59:59`,//这
51
+            },
47
         };
52
         };
48
     },
53
     },
49
     watch: {
54
     watch: {
50
         timeConfirmVisable(val) {
55
         timeConfirmVisable(val) {
51
             if (val) {
56
             if (val) {
52
-                this.formTimeArr = [];
57
+                this.formLabelAlign.name = null;
53
             }
58
             }
54
         },
59
         },
55
     },
60
     },

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

139
         handleSuccessC(res) {
139
         handleSuccessC(res) {
140
         console.log(res,'自然人上传成功');
140
         console.log(res,'自然人上传成功');
141
             this.$message.success('上传成功');
141
             this.$message.success('上传成功');
142
-            this.submitForm.annexIds[4] = res.annexId;
142
+            this.submitForm.annexIds.push(res.annexId)
143
         },
143
         },
144
         handleRemoveC(file, fileList) {
144
         handleRemoveC(file, fileList) {
145
             console.log(file, fileList);
145
             console.log(file, fileList);
174
         submitUpload() {
174
         submitUpload() {
175
             this.$refs['ruleForm'].validate((valid) => {
175
             this.$refs['ruleForm'].validate((valid) => {
176
                 if (valid) {
176
                 if (valid) {
177
-                    if(this.submitForm.annexIds.length < 3){
178
-                        this.$message.error('种类型模板必须上传');
177
+                    if(this.submitForm.annexIds.length < 4){
178
+                        this.$message.error('种类型模板必须上传');
179
                         return
179
                         return
180
                     }
180
                     }
181
                     this.submitForm.identifyId = this.ruleForm.identifyId;
181
                     this.submitForm.identifyId = this.ruleForm.identifyId;

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

115
         },
115
         },
116
         editVisable(val){
116
         editVisable(val){
117
             if(val){
117
             if(val){
118
-                this.getTemplateDetailFn({ id: this.editData.id })
118
+                this.getTemplateDetailFn({ id: this.editData.id });
119
+                this.submitForm.annexIds = []
119
             }
120
             }
120
         }
121
         }
121
     },
122
     },
138
         getTemplateDetailFn(data) {
139
         getTemplateDetailFn(data) {
139
             getTemplateDetail(data).then(res => {
140
             getTemplateDetail(data).then(res => {
140
                 this.ruleForm = res;
141
                 this.ruleForm = res;
141
-                this.submitForm.annexIds = [this.ruleForm.agreementFile.fileId,this.ruleForm.applicationFile.fileId,this.ruleForm.bookFile.fileId]
142
-                console.log(this.submitForm.annexIds,"PPPPPPPPPPPPPPPPPPPPPPPP");
142
+                // this.submitForm.annexIds = [this.ruleForm.agreementFile.fileId,this.ruleForm.applicationFile.fileId,this.ruleForm.bookFile.fileId]
143
             })
143
             })
144
         },
144
         },
145
         submitUpload() {
145
         submitUpload() {
175
         console.log(res,'机构上传成功');
175
         console.log(res,'机构上传成功');
176
             this.$message.success('上传成功');
176
             this.$message.success('上传成功');
177
             // this.submitForm.annexIds.push(res.annexId);
177
             // this.submitForm.annexIds.push(res.annexId);
178
-            this.submitForm.annexIds[1] = res.annexId;
178
+            this.submitForm.annexIds.push(res.annexId);
179
         },
179
         },
180
         // 自然人
180
         // 自然人
181
         handleSuccessC(res) {
181
         handleSuccessC(res) {
182
         console.log(res,'自然人上传成功');
182
         console.log(res,'自然人上传成功');
183
             this.$message.success('上传成功');
183
             this.$message.success('上传成功');
184
-            this.submitForm.annexIds[4] = res.annexId;
184
+            this.submitForm.annexIds.push(res.annexId);
185
         },
185
         },
186
         handleRemoveC(file, fileList) {
186
         handleRemoveC(file, fileList) {
187
             console.log(file, fileList);
187
             console.log(file, fileList);
202
         handleSuccessA(res) {
202
         handleSuccessA(res) {
203
             this.$message.success('上传成功');
203
             this.$message.success('上传成功');
204
             // this.submitForm.annexIds.push(res.annexId);
204
             // this.submitForm.annexIds.push(res.annexId);
205
-            this.submitForm.annexIds[0] = res.annexId;
205
+            this.submitForm.annexIds.push(res.annexId);
206
         },
206
         },
207
 
207
 
208
         handleChangeB(file, fileList) {
208
         handleChangeB(file, fileList) {
218
         handleSuccessB(res) {
218
         handleSuccessB(res) {
219
             this.$message.success('上传成功');
219
             this.$message.success('上传成功');
220
             // this.submitForm.annexIds.push(res.annexId);
220
             // this.submitForm.annexIds.push(res.annexId);
221
-            this.submitForm.annexIds[3] = res.annexId;
221
+            this.submitForm.annexIds.push(res.annexId);
222
         },
222
         },
223
         // handleSuccess() {
223
         // handleSuccess() {
224
         //     this.$message.success('修改成功');
224
         //     this.$message.success('修改成功');