Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -1135,8 +1135,8 @@ export default {
         if(type!='edit'){
           getLastTaskInfo().then(res=>{
             const data=res.data.data;
-            this.obj.callName=data.callName;
-            this.obj.callTel=data.callTel;
+            // this.obj.callName=data.callName;
+            // this.obj.callTel=data.callTel;
           })
         }
 

src/views/tenant/mission/Table/WaitingMission.vue

@@ -56,7 +56,7 @@
         <el-button type="text" size="mini" @click="employ(row, 1)">录用登记</el-button>
         <el-button icon="el-icon-view" :size="size" :type="type" @click.stop="rowView(row)"
           v-show="vaildData(permission.tenant_mission_view, false)">查看</el-button>
-        <save-button icon="el-icon-check" :size="size" :type="type" @click="rowCopy(row, 'copy')">复制</save-button>
+        <!-- <save-button icon="el-icon-check" :size="size" :type="type" @click="rowCopy(row, 'copy')">复制</save-button> -->
         <el-button icon="el-icon-edit" :size="size" :type="type" @click="rowCopy(row, 'edit')"
           :disabled="row.signUpCount !== 0" v-show="vaildData(permission.tenant_mission_edit, false)">编辑</el-button>
         <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row)"

src/views/tenant/mission/index.vue

@@ -97,16 +97,15 @@
           status: 1
         },
         timeScreenTerm:[{
-          value: 1,
-          label: '报名截止日期',
-        },
-          {
             value: 2,
-            label: '开始日期',
+            label: '任务开始日期',
           },
           {
             value: 3,
-            label: '完成日期',
+            label: '任务结束日期',
+          }, {
+            value: 1,
+            label: '报名截止日期',
           }],
       }
     },