Browse Source

高质量修改内容时去掉第一牵头部门领导

master
周江龙 2 years ago
parent
commit
e09d4ab4a3
4 changed files with 30 additions and 36 deletions
  1. +1
    -1
      .env.development
  2. +1
    -1
      .env.test
  3. +15
    -18
      src/views/second/segmentation/contentDetail.vue
  4. +13
    -16
      src/views/second/taskSummary/basicTable.vue

+ 1
- 1
.env.development View File

NODE_ENV=development NODE_ENV=development
VUE_APP_BASE_URL="http://121.40.249.52:9031/api"
VUE_APP_BASE_URL="http://47.98.157.120:9031/api/"

+ 1
- 1
.env.test View File

NODE_ENV=test NODE_ENV=test
VUE_APP_BASE_URL="http://127.0.0.1:9031/api/"
VUE_APP_BASE_URL="http://47.98.157.120:9031/api/"

+ 15
- 18
src/views/second/segmentation/contentDetail.vue View File

</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="第一牵头部门和责任领导"
label="第一牵头部门"
width="250" width="250"
align="center" align="center"
> >
" "
/> />
</el-col> </el-col>
<el-col :span="4" class="edit-title"
<!-- <el-col :span="4" class="edit-title"
><span style="color: red">* </span>责任领导:</el-col ><span style="color: red">* </span>责任领导:</el-col
>
<el-col :span="7">
> -->
<!-- <el-col :span="7">
<el-select <el-select
v-model="form.leaderPrincipal" v-model="form.leaderPrincipal"
multiple multiple
></el-option> ></el-option>
</template> </template>
</el-select> </el-select>
</el-col>
</el-col> -->
</el-row> </el-row>
<div class="leader"> <div class="leader">
<div <div
let arr = []; let arr = [];
for (let key in data[type + "DeptList"]) { for (let key in data[type + "DeptList"]) {
arr.push( arr.push(
`${data[type + "DeptList"][key]}(${
data[type + "PrincipalList"][key]
})`
`${data[type + "DeptList"][key]}`
); );
} }
return arr.join("\n"); return arr.join("\n");
edit(row) { edit(row) {
this.form = {}; this.form = {};
let form = JSON.parse(JSON.stringify(row)); let form = JSON.parse(JSON.stringify(row));
form.leaderPrincipal =
form.leaderPrincipal &&
form.leaderPrincipal.split("|").map((num) => parseInt(num));
// form.leaderPrincipal =
// form.leaderPrincipal &&
// form.leaderPrincipal.split("|").map((num) => parseInt(num));
form.cooperateDept = form.cooperateDept =
(form.cooperateDept && (form.cooperateDept &&
form.cooperateDept form.cooperateDept
}, },
add() { add() {
let form = this.form; let form = this.form;
let params = ["itemContent", "points", "leaderDept", "leaderPrincipal"];
let params = ["itemContent", "points", "leaderDept"]
let arr = [ let arr = [
"otherDept", "otherDept",
"otherPrincipal", "otherPrincipal",
return; return;
} }
} }
if (param == "leaderPrincipal" && form[param].length == 0) {
this.$message.error("请选择第一牵头部门责任领导");
return;
}
// if (param == "leaderPrincipal" && form[param].length == 0) {
// this.$message.error("请选择第一牵头部门责任领导");
// return;
// }
} }
form = JSON.parse(JSON.stringify(form)); form = JSON.parse(JSON.stringify(form));
form.leaderPrincipal =
form.leaderPrincipal && form.leaderPrincipal.join("|");
form.leaderPrincipal ="";
form.cooperateDept = form.cooperateDept && form.cooperateDept.join(","); form.cooperateDept = form.cooperateDept && form.cooperateDept.join(",");
form.cooperatePrincipal = form.cooperatePrincipal =
form.cooperatePrincipal && form.cooperatePrincipal &&

+ 13
- 16
src/views/second/taskSummary/basicTable.vue View File

</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="第一牵头部门和责任领导"
label="第一牵头部门"
width="250" width="250"
align="center" align="center"
> >
" "
/> />
</el-col> </el-col>
<el-col :span="4" class="title"
<!-- <el-col :span="4" class="title"
><span style="color: red">*</span> 责任领导: ><span style="color: red">*</span> 责任领导:
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
></el-option> ></el-option>
</template> </template>
</el-select> </el-select>
</el-col>
</el-col> -->
</el-row> </el-row>
<div class="leader"> <div class="leader">
<div <div
let arr = []; let arr = [];
for (let key in data[type + "DeptList"]) { for (let key in data[type + "DeptList"]) {
arr.push( arr.push(
`${data[type + "DeptList"][key]}(${
data[type + "PrincipalList"][key]
})`
`${data[type + "DeptList"][key]}`
); );
} }
return arr.join("\n"); return arr.join("\n");
}, },
edit(row) { edit(row) {
let form = JSON.parse(JSON.stringify(row)); let form = JSON.parse(JSON.stringify(row));
form.leaderPrincipal =
form.leaderPrincipal &&
form.leaderPrincipal.split("|").map((num) => parseInt(num));
// form.leaderPrincipal =
// form.leaderPrincipal &&
// form.leaderPrincipal.split("|").map((num) => parseInt(num));
form.cooperateDept = form.cooperateDept =
(form.cooperateDept && (form.cooperateDept &&
form.cooperateDept form.cooperateDept
}, },
save() { save() {
let form = this.form; let form = this.form;
let params = ["itemContent", "points", "leaderDept", "leaderPrincipal"];
let params = ["itemContent", "points", "leaderDept", ];
let arr = [ let arr = [
"otherDept", "otherDept",
"otherPrincipal", "otherPrincipal",
return; return;
} }
} }
if (param == "leaderPrincipal" && form[param].length == 0) {
this.$message.error("请选择第一牵头部门责任领导");
return;
}
// if (param == "leaderPrincipal" && form[param].length == 0) {
// this.$message.error("请选择第一牵头部门责任领导");
// return;
// }
} }
form = JSON.parse(JSON.stringify(form)); form = JSON.parse(JSON.stringify(form));
form.leaderPrincipal =
form.leaderPrincipal && form.leaderPrincipal.join("|");
form.leaderPrincipal ="";
form.cooperateDept = form.cooperateDept && form.cooperateDept.join(","); form.cooperateDept = form.cooperateDept && form.cooperateDept.join(",");
form.cooperatePrincipal = form.cooperatePrincipal =
form.cooperatePrincipal && form.cooperatePrincipal &&

Loading…
Cancel
Save