Merge remote-tracking branch 'origin/dev' into dev

public/MP_verify_mBPdY2fftmI0FSmM.txt

@@ -0,0 +1 @@
+mBPdY2fftmI0FSmM

public/MP_verify_ntaR65cxT5j4cakf.txt

@@ -0,0 +1 @@
+ntaR65cxT5j4cakf

src/views/TaskKanban/index.vue

@@ -28,6 +28,10 @@
             <span :style="scope.row.isDateExceeded=='已超时'?'color: #de4a3b':'color: #65da78'">{{scope.row.isDateExceeded}}</span>
         </template>
         <template slot-scope="scope" slot="menuLeft">
+            <el-button
+                type="primary"
+                @click.stop="rowAddfun(scope.row, scope.index)">添加任务
+            </el-button>
             <div style="display: flex;align-items: center;margin-top: 10px">
                 <div class="bottomStatistics" style="background: #ffff00" @click="searchChangefun()">全部({{page.total}})</div>
                 <div class="bottomStatistics" style="background: #f8cbad" @click="searchChangefun({type:1})">待执行({{statistics.waitingQuantity}})</div>
@@ -172,6 +176,7 @@ import {dateFormat} from "@/util/date";
                   prop: "responsibleUserId",
                   search: true,
                   type:'select',
+                  filterable:true,
                   dicUrl: "/api/blade-user/userList",
                   props: {
                       label: "realName",
@@ -208,6 +213,7 @@ import {dateFormat} from "@/util/date";
               prop: "postId",
               search: true,
               type:'select',
+                filterable:true,
                 dicData:[],
                 props: {
                     label: "postName",
@@ -434,7 +440,7 @@ import {dateFormat} from "@/util/date";
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          // addBtn: this.vaildData(this.permission.task_add, false),
+          addBtn: this.vaildData(this.permission.task_add, false),
           viewBtn: this.vaildData(this.permission.task_view, false),
           delBtn: this.vaildData(this.permission.task_delete, false),
           editBtn: this.vaildData(this.permission.task_edit, false)
@@ -560,6 +566,18 @@ import {dateFormat} from "@/util/date";
                 column.dicData = res.data.data;
             });
         },
+        // 添加
+        rowAddfun(row,index) {
+            this.findObject(this.option.column, "ccId").disabled = false
+            this.findObject(this.option.column, "responsibleUserId").disabled = false
+            this.findObject(this.option.column, "postId").disabled = false
+            this.findObject(this.option.column, "tsInfo").disabled = false
+            this.findObject(this.option.column, "completionTime").disabled = false
+            this.findObject(this.option.column, "isUrgency").disabled = false
+            this.findObject(this.option.column, "accessory").disabled = false
+            this.$refs.crud.rowAdd()
+        },
+        // 添加确认
       rowSave(row, done, loading) {
             row.ccId = row.ccId.join()
           this.dicDataName.map(item=>{
@@ -604,7 +622,6 @@ import {dateFormat} from "@/util/date";
         // 编辑
         editOpen(row,index){
             if (this.responsibleUserObj.createUser == row.createUser) {
-
             }else {
                 this.findObject(this.option.column, "ccId").disabled = true
                 this.findObject(this.option.column, "responsibleUserId").disabled = true