liuhj пре 3 месеци
родитељ
комит
eaa412e218
3 измењених фајлова са 53 додато и 11 уклоњено
  1. 28 10
      src/components/OP/DepartProcessAdd.vue
  2. 19 0
      src/components/OP/GroupProgress.vue
  3. 6 1
      src/router/index.js

+ 28 - 10
src/components/OP/DepartProcessAdd.vue

@@ -51,8 +51,8 @@
                     <el-collapse v-model="activeNames">
                     <el-collapse v-model="activeNames">
                         <el-collapse-item title="主要任务" name="1">
                         <el-collapse-item title="主要任务" name="1">
                             <el-table :data="mainTasks" style="width: 100%" border>
                             <el-table :data="mainTasks" style="width: 100%" border>
-                                <el-table-column type="index" label="序号" width="80"></el-table-column>
-                                <el-table-column prop="name" label="单项任务名称" width="300">
+                                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                                <el-table-column prop="name" label="单项任务名称" width="250">
                                     <template slot-scope="scope">
                                     <template slot-scope="scope">
                                         <el-input :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)" height="70"
                                         <el-input :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)" height="70"
                                             type="textarea" v-model="scope.row.name" size="mini"></el-input>
                                             type="textarea" v-model="scope.row.name" size="mini"></el-input>
@@ -67,7 +67,7 @@
                                         </el-select>
                                         </el-select>
                                     </template>
                                     </template>
                                 </el-table-column>
                                 </el-table-column>
-                                <el-table-column prop="isUrgent" label="是否加急" width="100">
+                                <el-table-column prop="isUrgent" label="是否加急" width="80">
                                     <template slot-scope="scope">
                                     <template slot-scope="scope">
                                         <el-switch :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)"
                                         <el-switch :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)"
                                             v-model="scope.row.isUrgent">
                                             v-model="scope.row.isUrgent">
@@ -100,6 +100,12 @@
                                             :step="1"></el-input-number>
                                             :step="1"></el-input-number>
                                     </template>
                                     </template>
                                 </el-table-column>
                                 </el-table-column>
+                                <el-table-column prop="remark" label="备注" width="250">
+                                    <template slot-scope="scope">
+                                        <el-input :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)" height="70"
+                                            type="textarea" v-model="scope.row.remark" size="mini"></el-input>
+                                    </template>
+                                </el-table-column>
                                 <!-- <el-table-column prop="requiredFieldsValue" label="必填项设置" width="120">
                                 <!-- <el-table-column prop="requiredFieldsValue" label="必填项设置" width="120">
                                     <template slot-scope="scope">
                                     <template slot-scope="scope">
                                         <el-checkbox-group v-model="scope.row.requiredFieldsValue"
                                         <el-checkbox-group v-model="scope.row.requiredFieldsValue"
@@ -138,7 +144,7 @@
                         <el-collapse-item title="临时额外任务" name="2">
                         <el-collapse-item title="临时额外任务" name="2">
                             <el-table :data="extraTasks" style="width: 100%" border>
                             <el-table :data="extraTasks" style="width: 100%" border>
                                 <el-table-column type="index" label="序号" width="80"></el-table-column>
                                 <el-table-column type="index" label="序号" width="80"></el-table-column>
-                                <el-table-column prop="name" label="单项任务名称" width="300">
+                                <el-table-column prop="name" label="单项任务名称" width="250">
                                     <template slot-scope="scope">
                                     <template slot-scope="scope">
                                         <el-input :disabled="forbidden=='true'?true:false" height="70" type="textarea" v-model="scope.row.name"
                                         <el-input :disabled="forbidden=='true'?true:false" height="70" type="textarea" v-model="scope.row.name"
                                             size="mini"></el-input>
                                             size="mini"></el-input>
@@ -181,6 +187,12 @@
                                             :step="1"></el-input-number>
                                             :step="1"></el-input-number>
                                     </template>
                                     </template>
                                 </el-table-column>
                                 </el-table-column>
+                                <el-table-column prop="remark" label="备注" width="250">
+                                    <template slot-scope="scope">
+                                        <el-input :disabled="forbidden=='true'?true:(scope.$index + 1 <= form.action - 1)" height="70"
+                                            type="textarea" v-model="scope.row.remark" size="mini"></el-input>
+                                    </template>
+                                </el-table-column>
                                 <el-table-column label="操作" width="120">
                                 <el-table-column label="操作" width="120">
                                     <template slot-scope="scope">
                                     <template slot-scope="scope">
                                         <!-- <el-button class="czbtn" size="mini" type="primary"
                                         <!-- <el-button class="czbtn" size="mini" type="primary"
@@ -325,7 +337,8 @@ export default {
                 "sort": this.mainTasks.length + 1,
                 "sort": this.mainTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": false
+                "isExtraTask": false,
+                "remark": ""
             });
             });
         },
         },
         insertTaskAbove(index) {
         insertTaskAbove(index) {
@@ -341,7 +354,8 @@ export default {
                 "sort": this.mainTasks.length + 1,
                 "sort": this.mainTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": false
+                "isExtraTask": false,
+                "remark": ""
             });
             });
         },
         },
         insertTaskBelow(index) {
         insertTaskBelow(index) {
@@ -357,7 +371,8 @@ export default {
                 "sort": this.mainTasks.length + 1,
                 "sort": this.mainTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": false
+                "isExtraTask": false,
+                "remark": ""
             });
             });
         },
         },
         deleteTask(index) {
         deleteTask(index) {
@@ -614,7 +629,8 @@ export default {
                 "sort": this.extraTasks.length + 1,
                 "sort": this.extraTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": true
+                "isExtraTask": true,
+                "remark": ""
             });
             });
         },
         },
         insertExtraTaskAbove(index) {
         insertExtraTaskAbove(index) {
@@ -630,7 +646,8 @@ export default {
                 "sort": this.extraTasks.length + 1,
                 "sort": this.extraTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": true
+                "isExtraTask": true,
+                "remark": ""
             });
             });
         },
         },
         insertExtraTaskBelow(index) {
         insertExtraTaskBelow(index) {
@@ -646,7 +663,8 @@ export default {
                 "sort": this.extraTasks.length + 1,
                 "sort": this.extraTasks.length + 1,
                 "timeRange": [],
                 "timeRange": [],
                 "requiredFieldsValue": [],
                 "requiredFieldsValue": [],
-                "isExtraTask": true
+                "isExtraTask": true,
+                "remark": ""
             });
             });
         },
         },
         deleteExtraTask(index) {
         deleteExtraTask(index) {

+ 19 - 0
src/components/OP/GroupProgress.vue

@@ -0,0 +1,19 @@
+<template>
+    <div class="group-progress">
+        团组进度总览
+    </div>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style>
+    .group-progress{
+        background-color: #fff;
+        padding: 10px;
+        box-shadow: 0 0 5px #0005;
+        border-radius: 10px;
+        min-height: 830px;
+    }
+</style> 

+ 6 - 1
src/router/index.js

@@ -143,7 +143,7 @@ import AffairsBackward from '@/components/OP/AffairsBackward';
 import DepartProcessList from '@/components/OP/DepartProcessList'
 import DepartProcessList from '@/components/OP/DepartProcessList'
 import DepartProcessAdd from '@/components/OP/DepartProcessAdd'
 import DepartProcessAdd from '@/components/OP/DepartProcessAdd'
 import TaskReview from '@/components/OP/TaskReview'
 import TaskReview from '@/components/OP/TaskReview'
-
+import GroupProgress from '@/components/OP/GroupProgress'
 
 
 
 
 Vue.use(Router)
 Vue.use(Router)
@@ -856,6 +856,11 @@ export default new Router({
           name: 'TaskReview',
           name: 'TaskReview',
           component: TaskReview
           component: TaskReview
         },
         },
+        {
+          path: '/home/GroupProgress',
+          name: 'GroupProgress',
+          component: GroupProgress
+        },
       ]
       ]
     },
     },
     {
     {