zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zcdsj:b3c74912650562578d5c32872174dcc2f58261b4
Branches Tags
zcdsj:master
zcdsj:base
zcdsj:gzerp
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916
..
compare: zcdsj:0cc6d2a3414591f54bfa0261abb8e11efc320dae
Branches Tags
zcdsj:master
zcdsj:base
zcdsj:gzerp
zcdsj:scui
zcdsj:2.6.2025040209
zcdsj:2.6.2025031916

No commits in common. "b3c74912650562578d5c32872174dcc2f58261b4" and "0cc6d2a3414591f54bfa0261abb8e11efc320dae" have entirely different histories.
b3c7491265 ... 0cc6d2a341

2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
src/views/ofm/publicity_form.vue
View File

@ -111,10 +111,9 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<!-- 综合管理部审查意见：部门负责人审批/综合管理部审批可填，总经理审批/档案管理员审批/结束只读 --> <!-- 综合管理部审查意见：综合管理部审批可填，总经理审批/档案管理员审批/结束只读 -->
<!-- 在部门负责人审批步骤即可填写，避免同一人连续审批时被自动跳过导致该字段为空 --> <el-form-item label="综合管理部审查意见" prop="dept_opinion_review" v-if="['综合管理部审批','总经理审批','档案管理员审批','结束'].includes(stateName)">
<el-form-item label="综合管理部审查意见" prop="dept_opinion_review" v-if="['部门负责人审批','综合管理部审批','总经理审批','档案管理员审批','结束'].includes(stateName)"> <el-radio-group v-model="addForm.dept_opinion_review" :disabled="stateName !== '综合管理部审批'">
<el-radio-group v-model="addForm.dept_opinion_review" :disabled="!['部门负责人审批','综合管理部审批'].includes(stateName)">
<el-radio label="内容不涉及国家秘密和商业秘密，同意公开"></el-radio> <el-radio label="内容不涉及国家秘密和商业秘密，同意公开"></el-radio>
<el-radio label="内容不涉及国家秘密、但涉及商业秘密，同意受控公开"></el-radio> <el-radio label="内容不涉及国家秘密、但涉及商业秘密，同意受控公开"></el-radio>
<el-radio label="内容涉及国家秘密，同意按涉密渠道发布"></el-radio> <el-radio label="内容涉及国家秘密，同意按涉密渠道发布"></el-radio>
@ -272,8 +271,7 @@ export default {
if (that.localMode === "add") { if (that.localMode === "add") {
let res = await that.$API.ofm.publicity.create.req(that.addForm); let res = await that.$API.ofm.publicity.create.req(that.addForm);
that.addForm.id = res.id; that.addForm.id = res.id;
} else if (that.localMode === "edit") { } else {
// 仅创建人在草稿态(start state)可编辑业务表；其他审批场景下数据通过工作流 save_ticket_data 回写
await that.$API.ofm.publicity.update.req( await that.$API.ofm.publicity.update.req(
that.addForm.id, that.addForm.id,
that.addForm that.addForm

2
src/views/wf/myticket.vue
View File

@ -228,7 +228,7 @@ export default {
} catch (e) { } catch (e) {
console.error("获取用户岗位失败:", e); console.error("获取用户岗位失败:", e);
} }
const restrictedKeys = { wf_leave: isDeptHead, wf_patent: isDeptHead, wf_paperse: isDeptHead }; const restrictedKeys = { wf_leave: isDeptHead };
const groups = {}; const groups = {};
this.$API.wf.workflow.list.req({ page: 0 }).then((res) => { this.$API.wf.workflow.list.req({ page: 0 }).then((res) => {
res.forEach((item) => { res.forEach((item) => {