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

@@ -1,2 +1,2 @@
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

@@ -1,2 +1,2 @@
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

@@ -138,7 +138,7 @@
</template>
</el-table-column>
<el-table-column
label="第一牵头部门和责任领导"
label="第一牵头部门"
width="250"
align="center"
>
@@ -269,10 +269,10 @@
"
/>
</el-col>
<el-col :span="4" class="edit-title"
<!-- <el-col :span="4" class="edit-title"
><span style="color: red">* </span>责任领导:</el-col
>
<el-col :span="7">
> -->
<!-- <el-col :span="7">
<el-select
v-model="form.leaderPrincipal"
multiple
@@ -290,7 +290,7 @@
></el-option>
</template>
</el-select>
</el-col>
</el-col> -->
</el-row>
<div class="leader">
<div
@@ -521,9 +521,7 @@ export default {
let arr = [];
for (let key in data[type + "DeptList"]) {
arr.push(
`${data[type + "DeptList"][key]}(${
data[type + "PrincipalList"][key]
})`
`${data[type + "DeptList"][key]}`
);
}
return arr.join("\n");
@@ -559,9 +557,9 @@ export default {
edit(row) {
this.form = {};
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
@@ -638,7 +636,7 @@ export default {
},
add() {
let form = this.form;
let params = ["itemContent", "points", "leaderDept", "leaderPrincipal"];
let params = ["itemContent", "points", "leaderDept"]
let arr = [
"otherDept",
"otherPrincipal",
@@ -682,14 +680,13 @@ export default {
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.leaderPrincipal =
form.leaderPrincipal && form.leaderPrincipal.join("|");
form.leaderPrincipal ="";
form.cooperateDept = form.cooperateDept && form.cooperateDept.join(",");
form.cooperatePrincipal =
form.cooperatePrincipal &&

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

@@ -85,7 +85,7 @@
</template>
</el-table-column>
<el-table-column
label="第一牵头部门和责任领导"
label="第一牵头部门"
width="250"
align="center"
>
@@ -219,7 +219,7 @@
"
/>
</el-col>
<el-col :span="4" class="title"
<!-- <el-col :span="4" class="title"
><span style="color: red">*</span> 责任领导:
</el-col>
<el-col :span="7">
@@ -240,7 +240,7 @@
></el-option>
</template>
</el-select>
</el-col>
</el-col> -->
</el-row>
<div class="leader">
<div
@@ -519,9 +519,7 @@ export default {
let arr = [];
for (let key in data[type + "DeptList"]) {
arr.push(
`${data[type + "DeptList"][key]}(${
data[type + "PrincipalList"][key]
})`
`${data[type + "DeptList"][key]}`
);
}
return arr.join("\n");
@@ -776,9 +774,9 @@ export default {
},
edit(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
@@ -816,7 +814,7 @@ export default {
},
save() {
let form = this.form;
let params = ["itemContent", "points", "leaderDept", "leaderPrincipal"];
let params = ["itemContent", "points", "leaderDept", ];
let arr = [
"otherDept",
"otherPrincipal",
@@ -858,14 +856,13 @@ export default {
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.leaderPrincipal =
form.leaderPrincipal && form.leaderPrincipal.join("|");
form.leaderPrincipal ="";
form.cooperateDept = form.cooperateDept && form.cooperateDept.join(",");
form.cooperatePrincipal =
form.cooperatePrincipal &&

Loading…
Cancel
Save