Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/DepartProcessAdd.vue

@@ -314,7 +314,7 @@ export default {
             this.mainTasks.push({
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,
@@ -330,7 +330,7 @@ export default {
             this.mainTasks.splice(index, 0, {
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,
@@ -346,7 +346,7 @@ export default {
             this.mainTasks.splice(index + 1, 0, {
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,
@@ -603,7 +603,7 @@ export default {
             this.extraTasks.push({
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,
@@ -619,7 +619,7 @@ export default {
             this.extraTasks.splice(index, 0, {
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,
@@ -635,7 +635,7 @@ export default {
             this.extraTasks.splice(index + 1, 0, {
                 "id": 0,
                 "name": "",
-                "priorityId": 1456,
+                "priorityId": 1455,
                 "isUrgent": false,
                 "assignedUserId": this.form.assignedUserId || '',
                 "durationHours": 0,

src/components/OP/DepartProcessList.vue

@@ -12,6 +12,7 @@
                                 <el-input placeholder="流程名称" v-model="loadData.search_Name" clearable
                                     style="width: 200px;display: inline-block;"></el-input>
                                 <el-button type="primary" @click="Search">筛选</el-button>
+                                <el-checkbox style="padding: 10px;" @change="lvSort">加急排序</el-checkbox>
                             </div>
                             <div style="flex: 1; text-align: right;">
                                 <el-button type="primary" @click="add">新增</el-button>
@@ -88,6 +89,8 @@
                             </el-table-column>
                             <el-table-column label="工单开始时间" prop="startTime">
                             </el-table-column>
+                            <el-table-column label="加急任务数量" prop="urgentCount">
+                            </el-table-column>
                             <el-table-column label="所属团组" prop="team">
                             </el-table-column>
                             <el-table-column label="指派给谁" prop="assignee">
@@ -96,9 +99,12 @@
                             </el-table-column>
                             <el-table-column label="操作">
                                 <template slot-scope="scope">
-                                    <el-button type="primary" size="mini" @click="handleEdit(scope.row)">编辑</el-button>
-                                    <el-button type="danger" size="mini"
-                                        @click="DeleteWorkOrder(scope.row.id)">删除</el-button>
+                                    <div v-if="scope.row.isReview == 1">
+                                        <el-button type="primary" size="mini"
+                                            @click="handleEdit(scope.row)">编辑</el-button>
+                                        <el-button type="danger" size="mini"
+                                            @click="DeleteWorkOrder(scope.row.id)">删除</el-button>
+                                    </div>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -328,6 +334,9 @@ export default {
         },
         load() {
             this.loadData.userId = this.userId;
+            if (!this.loadData.isLv) {
+                this.loadData.isLv = 0;
+            }
             console.log(this.loadData, "this.loadData");
             this.$axios({
                 method: 'post',
@@ -529,6 +538,14 @@ export default {
                 });
             });
         },
+        lvSort(value) {
+            if (value) {
+                this.loadData.isLv = 1;
+            } else {
+                this.loadData.isLv = 0;
+            }
+            this.load();
+        },
     },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
@@ -555,9 +572,11 @@ export default {
     font-size: 12px;
     font-family: "\5FAE\8F6F\96C5\9ED1";
 }
+
 #DepartProcessListConter .el-table .el-table__expanded-cell[class*=cell] {
     background-color: #fff;
 }
+
 .step_icon:hover {
     /* ransform: scale(1.1); */
 }