zhuliu 5 місяців тому
батько
коміт
0ce1ad2f85

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

@@ -18,16 +18,19 @@
             </el-form-item>
           </template>
           <template v-else>
-            <el-form-item label="案件子阶段">
+            <el-form-item label="案件子阶段" v-if="type.type!=6">
               <span>{{ type.caseChildPhase }}</span>
             </el-form-item>
+            <el-form-item label="文档类型">
+              <span>{{ type.documentType }}</span>
+            </el-form-item>
           </template>
           <el-form-item :label="type.time">
             <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">
             <el-form-item  label="口审日期">
-              <el-date-picker type="datetime" :placeholder="请选择" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" v-model="form.oralDate" style="width: 100%"></el-date-picker>
+              <el-date-picker type="datetime" placeholder="请选择" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" v-model="form.oralDate" style="width: 100%"></el-date-picker>
             </el-form-item>
           </template>
           <template v-if="type.type==6 || type.type == 31">
@@ -43,7 +46,7 @@
           </template>
           <template v-if="type.type ==1">
             <div>
-                <el-form-item label="文日">
+                <el-form-item label="文日">
                     <el-date-picker v-model="form.invalidFileSendDate" value-format="yyyy-MM-dd" type="date"  placeholder="请选择时间" style="width: 100%;"></el-date-picker>
                 </el-form-item>
             </div>
@@ -93,7 +96,7 @@
           </el-form-item>
           <template v-if="$permission.FunPermissions('xiaoshi/sendEmail')">
             <el-form-item label="邮件通知:">
-              <div style="display:flex;align-items:center;flex-wrap: wrap;">
+              <div style="min-height: 40px;display:flex;align-items:center;flex-wrap: wrap;">
                 <el-switch
                   v-model="form.ifSendEmail"
                   active-color="#13ce66"
@@ -177,6 +180,12 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
                 time:'口审时间',
                 timeField:'oralTrailTime'
             },
+            31:{
+                type:'31',
+                title:'口审记录',
+                time:'口审时间',
+                timeField:'oralTrailTime'
+            },
             1:{
                 type:'1',
                 title:'无效请求书',
@@ -283,7 +292,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:'发文日',
+              time:type.documentType + '日',
               timeField:'occurredTime'
             }
             this.type = {

+ 5 - 2
src/views/report/InvalidResponse/components/flowPath/flowPath.vue

@@ -52,8 +52,10 @@
                   <span  @click="dele(item)"><el-link>删除</el-link></span>
               </div>
             </div>
-            
-            <div v-if="item.flowType==6">
+            <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.recordDescription }}</span></p>
@@ -209,6 +211,7 @@ export default {
     edit(item) {
       var field= {
         6:'oralTrailVO',
+        31:'oralTrailVO',
         1:'invalidRequestFileVO',
         5:'stateOpinionVO',
         7:'invalidDecisionFileVO',