Преглед изворни кода

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

fz пре 2 година
родитељ
комит
55add30b22

+ 18
- 11
src/views/awardManagement/components/paymentdetailsDialog.vue Прегледај датотеку

74
             v-model="arbitrateRecord.verificaOpinion" />
74
             v-model="arbitrateRecord.verificaOpinion" />
75
         </el-form-item> -->
75
         </el-form-item> -->
76
         <el-form-item label="笔录内容:" prop="responCrossOpin">
76
         <el-form-item label="笔录内容:" prop="responCrossOpin">
77
-            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" />
77
+            <!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
78
+            <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
78
           </el-form-item>
79
           </el-form-item>
79
         <el-form-item label="审核意见:" prop="checkOpinion" v-if="flag == 2">
80
         <el-form-item label="审核意见:" prop="checkOpinion" v-if="flag == 2">
80
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
81
           <el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
111
   data() {
112
   data() {
112
     return {
113
     return {
113
       // key: value
114
       // key: value
115
+      arbitrateRecordt: {},
114
       form: {},
116
       form: {},
115
       arbitrateRecord: {
117
       arbitrateRecord: {
116
-        checkOpinion:"同意"
118
+        // checkOpinion:"同意"
119
+        checkOpinion:""
117
       },
120
       },
118
       // 表单校验
121
       // 表单校验
119
       rules: {
122
       rules: {
187
             (this.respondenPathArr = []), //被申请人
190
             (this.respondenPathArr = []), //被申请人
188
             (this.awardFileArr = []), //裁决书
191
             (this.awardFileArr = []), //裁决书
189
             (this.awardPathArr = []), //裁决书
192
             (this.awardPathArr = []), //裁决书
190
-            setTimeout(() => {
193
+            // setTimeout(() => {
191
               this.form = this.detailform;
194
               this.form = this.detailform;
192
-              console.log(this.detailform)
193
-              if(this.form.arbitrateRecord.checkOpinion == null ){
194
-                this.form.arbitrateRecord.checkOpinion = '同意'
195
-              }
196
-              this.arbitrateRecord = this.form.arbitrateRecord;
195
+              // if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
196
+                // this.form.arbitrateRecord.checkOpinion = '同意';
197
+                this.arbitrateRecord.checkOpinion = '';
198
+              // }
199
+              // this.arbitrateRecord = this.form.arbitrateRecord;
197
               this.evidenceFile(this.form);
200
               this.evidenceFile(this.form);
198
-            }, 1000);
201
+            // }, 1000);
199
         }
202
         }
200
       },
203
       },
201
     },
204
     },
204
     // 申请人裁决书
207
     // 申请人裁决书
205
     evidenceFile(val) {
208
     evidenceFile(val) {
206
       if (val) {
209
       if (val) {
210
+        this.applicantFileArr = [];
211
+        this.applicantPathArr = [];
212
+        this.respondentFileArr = [];
213
+        this.respondenPathArr = [];        
214
+        this.awardFileArr = [];
215
+        this.awardPathArr = [];
207
         this.bookFileArr = [];
216
         this.bookFileArr = [];
208
         this.bookPathArr = [];
217
         this.bookPathArr = [];
209
         val.caseAttachList.forEach((item) => {
218
         val.caseAttachList.forEach((item) => {
214
             this.respondentFileArr.push(item.annexName);
223
             this.respondentFileArr.push(item.annexName);
215
             this.respondenPathArr.push(item.annexPath);
224
             this.respondenPathArr.push(item.annexPath);
216
           } else if (item.annexType == 3) {
225
           } else if (item.annexType == 3) {
217
-            this.awardFileArr = [];
218
-            this.awardPathArr = [];
219
             this.awardFileArr.push(item.annexName);
226
             this.awardFileArr.push(item.annexName);
220
             this.awardPathArr.push(item.annexPath);
227
             this.awardPathArr.push(item.annexPath);
221
           } else if (item.annexType == 7) {
228
           } else if (item.annexType == 7) {

+ 3
- 3
src/views/caseFiling/components/archiveDetailsDialog.vue Прегледај датотеку

16
           <!-- <el-tab-pane label="快递信息" name="third" v-if="false">
16
           <!-- <el-tab-pane label="快递信息" name="third" v-if="false">
17
             <expressDeliveryInfo :deliveryDataArr="detailform"></expressDeliveryInfo>
17
             <expressDeliveryInfo :deliveryDataArr="detailform"></expressDeliveryInfo>
18
           </el-tab-pane> -->
18
           </el-tab-pane> -->
19
-          <!-- <el-tab-pane label="案件视频" name="fourth"> -->
19
+          <el-tab-pane label="案件视频" name="fourth" v-if="caseDetail.arbitratMethodName=='开庭审理'?true:false">
20
             <!-- <div @click="getVideo">chakanshipin</div> -->
20
             <!-- <div @click="getVideo">chakanshipin</div> -->
21
-            <!-- <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
21
+            <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>
22
             <video style="background-color: #181717;width: 400px;height: 200px;margin: 30px;" v-if="videoFlag" :src="headPath + item.annexPath" controls="controls" v-for="(item,index) in videoUrl" :key="index"></video>
22
             <video style="background-color: #181717;width: 400px;height: 200px;margin: 30px;" v-if="videoFlag" :src="headPath + item.annexPath" controls="controls" v-for="(item,index) in videoUrl" :key="index"></video>
23
-          </el-tab-pane> -->
23
+          </el-tab-pane>
24
         </el-tabs>
24
         </el-tabs>
25
       </div>
25
       </div>
26
       <div slot="footer" class="dialog-footer">
26
       <div slot="footer" class="dialog-footer">

+ 1
- 1
src/views/caseManagement/caseList.vue Прегледај датотеку

837
     },
837
     },
838
     // 表格显示高亮
838
     // 表格显示高亮
839
     tableRowClassName(row){
839
     tableRowClassName(row){
840
-      if(row.row.caseStatus==8){
840
+      if(row.row.arbitratMethodName=="开庭审理"){
841
         return 'pendingTrial'
841
         return 'pendingTrial'
842
       }
842
       }
843
       
843
       

+ 13
- 2
src/views/caseManagement/components/caseCompressionPackage.vue Прегледај датотеку

138
       this.$emit("cancelCompreess");
138
       this.$emit("cancelCompreess");
139
       this.upload.isUploading = false;
139
       this.upload.isUploading = false;
140
       this.$refs.uploadZipBatch.clearFiles();
140
       this.$refs.uploadZipBatch.clearFiles();
141
-      this.$alert(
141
+      if(response.code ==200){
142
+        this.$alert(
142
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
143
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
143
           response.msg +
144
           response.msg +
144
           "</div>",
145
           "</div>",
145
         "导入结果",
146
         "导入结果",
146
         { dangerouslyUseHTMLString: true }
147
         { dangerouslyUseHTMLString: true }
147
-      );
148
+      )
149
+      }else{
150
+        this.$alert(
151
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
152
+          "导入压缩失败" +
153
+          "</div>",
154
+        "导入结果",
155
+        { dangerouslyUseHTMLString: true }
156
+      )
157
+      }
158
+      
148
       this.getcaseApply(this.queryParams);
159
       this.getcaseApply(this.queryParams);
149
     },
160
     },
150
   },
161
   },

+ 1
- 1
src/views/caseManagement/components/caseentryDialog.vue Прегледај датотеку

163
                   message: '申请人不能为空',
163
                   message: '申请人不能为空',
164
                   trigger: 'blur',
164
                   trigger: 'blur',
165
                 },
165
                 },
166
-                { max: 20, message: '长度应小于20个字符', trigger: 'blur' }
166
+                { max: 50, message: '长度应小于50个字符', trigger: 'blur' }
167
               ]">
167
               ]">
168
                 <el-input v-model="item.name" placeholder="请输入" />
168
                 <el-input v-model="item.name" placeholder="请输入" />
169
               </el-form-item>
169
               </el-form-item>

+ 2
- 2
src/views/caseManagement/components/caseentryExamine.vue Прегледај датотеку

165
               </div>
165
               </div>
166
             </el-form-item>
166
             </el-form-item>
167
           </el-col>
167
           </el-col>
168
-          <el-col :span="12">
168
+          <!-- <el-col :span="12">
169
             <el-form-item
169
             <el-form-item
170
               label="被申请人案件证据资料:"
170
               label="被申请人案件证据资料:"
171
               prop="respondentEvidence"
171
               prop="respondentEvidence"
176
                 </a>
176
                 </a>
177
               </div>
177
               </div>
178
             </el-form-item>
178
             </el-form-item>
179
-          </el-col>
179
+          </el-col> -->
180
         </el-row>
180
         </el-row>
181
       </el-form>
181
       </el-form>
182
       <!-- 申请人主体信息 -->
182
       <!-- 申请人主体信息 -->