Commit 613d0c6e authored by 耿迪迪's avatar 耿迪迪

任务下发问题修改 gengdidi

parent 2dd93bed
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']" v-hasPermi="['system:order:remove']"
>删除</el-button> >删除</el-button>
<el-button v-if="(('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == null))) && scope.row.workStatus == '0'" <el-button v-if=" (('enterprise'== roleType && (scope.row.workAssignManId == '' || scope.row.workAssignManId == null)) || ('zhengfu'== roleType && (scope.row.workAssignEnterproseId == '' || scope.row.workAssignEnterproseId == null))) && scope.row.workStatus == '0'"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="指派人" prop="workAssignMan"> <el-form-item label="指派人" prop="workAssignMan">
<!--<el-input v-model="form.workAssignManId" placeholder="请输入指派人" />--> <!--<el-input v-model="form.workAssignManId" placeholder="请输入指派人" />-->
<el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 350px" @change="selectInspection($event,'edit')" :disabled="isDetail"> <el-select v-model="form.workAssignManId" placeholder="请输入指派人" style="width: 350px" @change="selectInspection($event,'edit')" :disabled="isDetail" clearable>
<el-option <el-option
v-for="item in inspectors" v-for="item in inspectors"
:key="item.userId " :key="item.userId "
...@@ -706,6 +706,8 @@ export default { ...@@ -706,6 +706,8 @@ export default {
selectworkAssignEnterprose(enterpriseId){ selectworkAssignEnterprose(enterpriseId){
this.form.workAssignManId = ""; this.form.workAssignManId = "";
this.workForm.workAssignManId = ""; this.workForm.workAssignManId = "";
this.workForm.workAssignMan="";
this.form.workAssignMan = "";
this.getInspectionUserList(enterpriseId); this.getInspectionUserList(enterpriseId);
let enterpriseName = this.enterprises.find(val=>val.enterpriseId == enterpriseId).enterpriseName; let enterpriseName = this.enterprises.find(val=>val.enterpriseId == enterpriseId).enterpriseName;
this.form.workAssignEnterproseName = enterpriseName; this.form.workAssignEnterproseName = enterpriseName;
...@@ -741,6 +743,7 @@ export default { ...@@ -741,6 +743,7 @@ export default {
//任务下发 //任务下发
workIssue(row){ workIssue(row){
this.title = "任务下发"; this.title = "任务下发";
this.workForm = {};
this.workForm.workId = row.workId; this.workForm.workId = row.workId;
this.workForm.workTitle = row.workTitle; this.workForm.workTitle = row.workTitle;
this.workForm.workType = row.workType; this.workForm.workType = row.workType;
...@@ -748,10 +751,10 @@ export default { ...@@ -748,10 +751,10 @@ export default {
this.workForm.workAssignEnterproseId = row.workAssignEnterproseId; this.workForm.workAssignEnterproseId = row.workAssignEnterproseId;
this.workForm.workAssignEnterproseName = row.workAssignEnterproseName; this.workForm.workAssignEnterproseName = row.workAssignEnterproseName;
} }
if(row.workAssignManId){ /* if(row.workAssignManId){
this.workForm.workAssignManId = row.workAssignManId; this.workForm.workAssignManId = row.workAssignManId;
this.workForm.workAssignMan = row.workAssignMan; this.workForm.workAssignMan = row.workAssignMan;
} }*/
//this.workForm = row; //this.workForm = row;
this.workForm.workStatus = '1'; this.workForm.workStatus = '1';
this.workOpen = true; this.workOpen = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment