瀏覽代碼

调整代码

humingbo 2 年之前
父節點
當前提交
202a83ffbc
共有 2 個文件被更改,包括 29 次插入4 次删除
  1. 12 0
      src/api/meeting/enforce.js
  2. 17 4
      src/views/enforceflow/enforceflow.vue

+ 12 - 0
src/api/meeting/enforce.js

@@ -121,6 +121,18 @@ export function getEnforceFlowsByEnforceIdAndStep(id, step){
   })
 }
 
+/**
+ * 根据流程id 获取当前流程上传的文件列表
+ * @param id
+ * @returns {*}
+ */
+export function getEnforceFlowFiles(id){
+  return request({
+    url:'/enforceFlow/getEnforceFlowFiles',
+    method: 'get'
+  })
+}
+
 
 
 

+ 17 - 4
src/views/enforceflow/enforceflow.vue

@@ -284,7 +284,7 @@
       </el-steps>
 
       <div>
-        <div v-if="active!==12" style="margin-top: 5px">
+        <div v-if="active!==12 && active!==11" style="margin-top: 5px">
           <el-form label-width="120px" :model="enforceForm" size="mini">
             <el-descriptions title="" :column="2" border size="mini">
               <el-descriptions-item>
@@ -368,12 +368,12 @@
               </el-descriptions-item>
             </el-descriptions>
           </el-form>
-          <div slot="footer"style="margin-top: 25px;text-align: right;margin-right: 85px">
+          <div slot="footer" style="margin-top: 25px;text-align: right;margin-right: 85px">
             <el-button size="medium" @click="enforceManageDialog">取消</el-button>
             <el-button size="medium" type="primary" class="title" @click="submitEnforceForm('editForm')">确定处理</el-button>
           </div>
         </div>
-        <div v-else style="margin-top:5px ">
+        <div v-else-if="active===12" style="margin-top:5px ">
           <el-tabs type="card" @tab-click="chooseTab" v-model="activeName">
             <el-tab-pane label="运维提醒设置" name="1">
               <el-button type="primary" size="mini" @click="addenforceRemindRow">添加</el-button>
@@ -408,7 +408,11 @@
               <el-table :data="enforceRecordData" stripe  style="width: 100%;margin-top: 15px;">
                 <el-table-column type="index" label="序号" width="60"></el-table-column>
                 <el-table-column prop="enforceType" label="运维类型" width="180"></el-table-column>
-                <el-table-column prop="enforceTime" label="运维时间"></el-table-column>
+                <el-table-column prop="enforceTime" label="运维时间">
+                  <template slot-scope="scope">
+                    <div>{{scope.row.enforceTime.substr(0,10)}}</div>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="enforcer" label="运维人员"></el-table-column>
                 <el-table-column prop="op" label="操作">
                   <template slot-scope="scope">
@@ -419,7 +423,15 @@
             </el-tab-pane>
           </el-tabs>
         </div>
+        <div v-else>
+          <el-table :data="enforceFileData" stripe  style="width: 100%;margin-top: 15px;">
+            <el-table-column type="index" label="序号" width="60"></el-table-column>
+            <el-table-column prop="enforceType" label="运维类型" width="180"></el-table-column>
+
+          </el-table>
+        </div>
       </div>
+
     </el-dialog>
 
     <el-dialog :visible.sync="addEnforceRecordWin" center width="65%" title="添加运维记录">
@@ -484,6 +496,7 @@ export default {
         enforceId:null,
         remark:''
       },
+      enforceFileData:[],
       addEnforceRecordWin:false,
       enforceFlowVisble: false,
       usersVisble: false,