zhuliu 5 miesięcy temu
rodzic
commit
6004869266

+ 2 - 2
src/views/report/InvalidResponse/components/dialog/editFlowPath.vue

@@ -25,7 +25,7 @@
               <span>{{ type.documentType }}</span>
             </el-form-item>
           </template>
-          <el-form-item :label="type.time">
+          <el-form-item :label="type.time || (form.documentType?`${form.documentType}日`:'时间')">
             <el-date-picker v-model="form[type.timeField]" value-format="yyyy-MM-dd" type="date"  placeholder="请选择时间" style="width: 100%;"></el-date-picker>
           </el-form-item>
           <template v-if="type.type == 31">
@@ -300,7 +300,7 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
         open(type,form) {
             let type1 = this.types[type.flowType] || {
               type:type.flowType,
-              time:type.documentType + '日',
+              time:type.documentType? `${type.documentType}日`:'时间',
               timeField:'occurredTime'
             }
             this.type = {

+ 12 - 6
src/views/report/InvalidResponse/components/flowPath/flowPath.vue

@@ -45,8 +45,11 @@
         <el-timeline-item v-for="item in timelineList" :timestamp="item.occurredTime" :key="item.id" placement="top">
           <div v-if="item.showCasePhase" class="timelinePosition">{{ item.casePhase }}</div>
           <el-card>
+            <div v-if="item.documentType">
+              <p><span>文档类型:</span><span style="font-weight:bold;color:red">{{ item.documentType }}</span></p>
+            </div>
             <div>
-              <span>{{ timeType[item.flowType] || '发文日' }}:</span><span>{{ item.occurredTime}}</span>
+              <span>{{ timeType[item.flowType] || (item.documentType?`${item.documentType}日`:'时间') }}:</span><span>{{ item.occurredTime}}</span>
               <div style="float: right;">
                   <span style="margin-right: 10px;"  @click="edit(item)"><el-link>编辑</el-link></span>
                   <span  @click="dele(item)"><el-link>删除</el-link></span>
@@ -54,14 +57,16 @@
             </div>
             <div v-if="item.flowType==31">
               <p><span>口审时间:</span><span>{{ item.oralTrailVO.oralDate }}</span></p>
-            </div>
-            <div v-if="item.flowType==6 || item.flowType==31">
               <p><span>地点:</span><span>{{ item.oralTrailVO.position }}</span></p>
-              <p><span>参与人:</span><span>{{ item.oralTrailVO.participator }}</span></p>
+              <p><span>合议庭人员:</span><span>{{ item.oralTrailVO.participator }}</span></p>
+            </div>
+            <div v-if="item.flowType==6">
+              <p v-if="item.oralTrailVO.position"><span>地点:</span><span>{{ item.oralTrailVO.position }}</span></p>
+              <p v-if="item.oralTrailVO.participator"><span>合议庭人员:</span><span>{{ item.oralTrailVO.participator }}</span></p>
               <p><span>口审笔录描述:</span><span>{{ item.oralTrailVO.recordDescription }}</span></p>
             </div>
             <div v-if="item.flowType==1">
-              <p><span>发文日:</span><span>{{ item.invalidRequestFileVO.invalidFileSendDate }}</span></p>
+              <p><span>文日:</span><span>{{ item.invalidRequestFileVO.invalidFileSendDate }}</span></p>
             </div>
             <div v-if="item.flowType==7">
               <p><span>决定书号码:</span><span>{{ item.invalidDecisionFileVO.fileNo }}</span></p>
@@ -234,7 +239,8 @@ export default {
         flowName:item.flowName,
         casePhase:item.casePhase,
         caseChildPhase:item.caseChildPhase,
-        flowType:item.flowType
+        flowType:item.flowType,
+        documentType:item.documentType
       }
       this.$refs.responseDialog.open(type,form)
     },