diff --git a/src/api/tenant/policy.js b/src/api/tenant/policy.js index 5a0aa9b..c6350f5 100644 --- a/src/api/tenant/policy.js +++ b/src/api/tenant/policy.js @@ -20,7 +20,7 @@ export const add = export const update = (row) => { return request({ - url: '/api/jobslink-api/policy/tenant/update', + url: '/api/jobslink-api/policy/update', method: 'post', data: row }) diff --git a/src/views/tenant/main/policy/index.vue b/src/views/tenant/main/policy/index.vue index cb86dd8..92e24fb 100644 --- a/src/views/tenant/main/policy/index.vue +++ b/src/views/tenant/main/policy/index.vue @@ -179,7 +179,7 @@ import ied from "@/views/util/import-error-dialog"; import { serviceType } from "@/common/dic"; import { excelAccept } from "@/common/accept"; import Tinymce from "@/components/Tinymce"; - +import _ from "lodash"; export default { filters: { ellipsis(value) { @@ -352,7 +352,7 @@ export default { trigger: "blur", }, ], - slot: true + // slot: true }, { label: "政策文号", @@ -367,7 +367,7 @@ export default { trigger: "blur", }, ], - slot: true + // slot: true }, { label: "发文机构", @@ -382,7 +382,7 @@ export default { trigger: "blur", }, ], - slot: true + // slot: true }, { label: "分组", @@ -410,7 +410,7 @@ export default { type: "tree", span: 12, display: true, - dicData: [{ name: "有效", value: "1" }, { name: "无效", value: "0" }], + dicData: [{ name: "有效", value: 1 }, { name: "无效", value: 0 }], props: { label: "name", value: "value", @@ -560,7 +560,7 @@ export default { // trigger: ["blur"], // }, // ], - slot: true, + // slot: true, formslot: true, span: 24, }, @@ -608,7 +608,7 @@ export default { // trigger: ["blur"], // }, // ], - slot: true, + // slot: true, formslot: true, span: 24, }, @@ -841,6 +841,8 @@ export default { (res) => { this.obj = res.data.data; this.tempWorkType = this.obj.labelName ? this.obj.labelName.split(",") : []; + this.guidelineContent = this.obj.guidelineContent + this.policyContent = this.obj.policyContent done(); }, (error) => { @@ -876,9 +878,9 @@ export default { // status: row.status, // issuingNumber: row.issuingNumber, ...row, - labelName: this.selectedWorkTypes, + labelName: this.selectedWorkTypes.join(','), policyContent: this.policyContent, - guidelineContent: this.guidelineContent, + guidelineContent: this.guidelineContent }).then( () => { this.$message({ @@ -896,6 +898,8 @@ export default { }, /*编辑人才*/ rowUpdate(row, index, done) { + const copyRow = _.cloneDeep(row) + // copyRow.labelNameArr = copyRow.labelNameArr.join(',') update({ // id: row.id, // groupId: row.groupId, @@ -904,7 +908,9 @@ export default { // telphone: row.telphone, // labelName: row.labelName, // remarks: row.remarks, - ...row + ...copyRow, + guidelineContent: this.guidelineContent, + policyContent: this.policyContent }).then( () => { done(); diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue index 9d9fd89..8eeaaf2 100644 --- a/src/views/tenant/mission/Dialog/CopyMission.vue +++ b/src/views/tenant/mission/Dialog/CopyMission.vue @@ -1250,6 +1250,7 @@ export default { this.workDataIdAttr = res.map((ele)=>{ return ele.id }) + console.log(123,res) let workDataIdState = this.workDataIdAttr.indexOf(this.obj.worktypeIds); //判断有无此工种 if(workDataIdState == -1){