Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -50,8 +50,8 @@
                       <div class="disZhuyuan" v-for="second_item,index in item.prodProcedureTeamList " :key="index">
                             <span>{{ second_item.user.name }}</span>
                             <span>{{ second_item.status==0?"待接收":second_item.status==1?"进行中":second_item.status==2?"已完工":second_item.status==3?"已中止":"已换人"}}</span>
-                            <span class="" v-if="second_item.status==3" @click="distributionProp(item,index,'change', second_item)"  style="color: #1989fa;">换人</span>
-                            <span class="" v-if="second_item.status==0&&second_item.isChange==1" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
+                            <span class="" v-if="second_item.status==3&&beDeptList" @click="distributionProp(item,index,'change', second_item)"  style="color: #1989fa;">换人</span>
+                            <span class="" v-if="second_item.status==0&&second_item.isChange==1&&beDeptList" @click="deletePeople(second_item.id)"  style="color: #1989fa;">删除</span>
                       </div>
                       <p style="margin-top:20px;">
                         <span class="" v-if="beDeptList" @click="distributionProp(item,index,'add')"  style="color: #1989fa;">新增</span>

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -743,7 +743,7 @@ export default {
         },
         taskRules : {
             name: [{ required: true, message: this.$t('enterthetaskcontent'), trigger: "blur" }],
-            serviceId: [{ required: true, message: '请选择任务内容', trigger: "blur" }],
+            serviceId: [{ required: true, message: '请选择服务', trigger: "blur" }],
             projectId: [{ required: true, message: '请选择所属项目', trigger: "blur" }],
             groupId: [{ required: true, message: '请选择所属任务分组', trigger: "blur" }],
             stagesId: [{ required: true, message: '请选择所属任务列表', trigger: "blur" }],
@@ -1446,7 +1446,7 @@ export default {
                 //去掉没有执行人的.(因为要有计划工时，执行人可以暂不设置)
                 // this.addForm.executorListFront = this.addForm.executorListFront.filter(exe=>exe.executorId);
                 if(this.addForm.executorListFront.serviceId){
-                    this.addForm.executorListFront.serviceId= JSON.stringify(this.addForm.executorListFront.serviceId);
+                    this.addForm.executorListFront.serviceId= this.addForm.executorListFront.serviceId;
                 }
                 this.addForm.executorListStr = JSON.stringify(this.addForm.executorListFront);
                 this.addForm.aheadTid = JSON.stringify(this.addForm.aheadTidList);
@@ -1702,7 +1702,7 @@ export default {
         this.addFormVisible = true;
         this.addForm = {parentTname: this.addForm.name,parentTid: this.addForm.id,projectId: this.addForm.projectId, groupId: this.addForm.groupId,  taskLevel:0, planHours: 8, taskType: 0};
         // this.addForm.executorListFront = [{executorId:null, planHours:8}];
-        this.addForm.executorListFront = [{executorId:null, planHours:8, serviceId: []}];
+        this.addForm.executorListFront = [{executorId:null, planHours:8, serviceId: null}];
         this.addLoading = false;
 
         //创建子任务，非编辑状态