|
|
@@ -169,7 +169,7 @@
|
|
|
v-show="item.roleId"
|
|
|
style="margin-bottom: 10px">
|
|
|
<span class=" aaa">兼职{{ index + 1 }}:{{ item.roleName }}</span>
|
|
|
- <div class="lastspan">
|
|
|
+ <!-- <div class="lastspan">
|
|
|
<span class="star bbb">关联船舶</span>
|
|
|
<div class="ontent"
|
|
|
style="width: 800px;">
|
|
|
@@ -180,7 +180,7 @@
|
|
|
<span class="operaction shipSelectSet"
|
|
|
@click="setUpShip(item)">设置</span>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1230,6 +1230,7 @@ export default {
|
|
|
},
|
|
|
// 编辑
|
|
|
editSave () {
|
|
|
+ debugger
|
|
|
this.ruleForm.staffId = this.id;
|
|
|
changeInfo(this.ruleForm)
|
|
|
.then(() => {
|
|
|
@@ -1284,7 +1285,6 @@ export default {
|
|
|
addadmin(this.ruleForm)
|
|
|
.then(() => {
|
|
|
// this.cancel();
|
|
|
- debugger
|
|
|
var commonUser={};
|
|
|
commonUser.phone = this.ruleForm.staffMobilePhone
|
|
|
checkApp(commonUser).then(()=>{
|
|
|
@@ -1353,7 +1353,6 @@ export default {
|
|
|
save (formName, flag) {
|
|
|
this.$refs[formName].validate(valid => {
|
|
|
if (valid) {
|
|
|
- debugger
|
|
|
if (this.ruleForm.roles.length !== 0)
|
|
|
if (this.ruleForm.roles[0].roleId === "" || this.zhiwu1.roleName === null) {
|
|
|
this.$message({
|
|
|
@@ -1560,6 +1559,7 @@ export default {
|
|
|
// roleName: this.data1.find(item => item.roleId === value).roleName
|
|
|
// };
|
|
|
this.zhiwu1 = {
|
|
|
+ major:1,
|
|
|
roleId: value,
|
|
|
roleName: this.data1.find(item => item.roleId === value).roleName
|
|
|
};
|
|
|
@@ -1580,15 +1580,28 @@ export default {
|
|
|
// if (this.zhiwu1.roleId) {
|
|
|
this.setDuty = false;
|
|
|
this.ruleForm.roleVesselIds = [];
|
|
|
+ this.zhiwu2 = []
|
|
|
+ this.zhiwu11 = this.zhiwu1;
|
|
|
+ const zhiwuAll = [];
|
|
|
+ zhiwuAll.push(this.zhiwu1);
|
|
|
this.jobList.forEach(item => {
|
|
|
item.asd.forEach(ite => {
|
|
|
this.ruleForm.roleVesselIds.push(item.roleId + "_" + ite.vesselId);
|
|
|
});
|
|
|
+ this.zhiwu2.push({
|
|
|
+ roleId: item.roleId,
|
|
|
+ roleName: this.partTimeJobList.find(item1 => item1.roleId === item.roleId)
|
|
|
+ .roleName,
|
|
|
+ major: "0"
|
|
|
+ });
|
|
|
+ zhiwuAll.push({
|
|
|
+ roleId: item.roleId,
|
|
|
+ roleName: this.partTimeJobList.find(item1 => item1.roleId === item.roleId)
|
|
|
+ .roleName,
|
|
|
+ major: "0"
|
|
|
+ });
|
|
|
});
|
|
|
- // this.zhiwu11 = this.zhiwu1;
|
|
|
- // const zhiwuAll = [];
|
|
|
- // zhiwuAll.push(this.zhiwu1);
|
|
|
- // this.ruleForm.roles = zhiwuAll.concat(this.zhiwu2);
|
|
|
+ this.ruleForm.roles = zhiwuAll
|
|
|
// } else {
|
|
|
// this.$message({
|
|
|
// type: "error",
|
