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

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
shijing 2025-11-26 16:47:29 +08:00
parent fe3b653890 5eeb4fd498
commit f1889ac062
6 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/ofm/vehicle_form.vue
View File

@ -221,7 +221,6 @@ export default {
getTid (){
var that = this;
that.$API.ofm.vehicleUse.item.req(that.t_id).then(res=>{
console.log('res', res)
that.form = res;
that.handleEidt(that.t_id);
if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) {

1
src/views/srm/paperlist.vue
View File

@ -377,6 +377,7 @@ export default {
this.type = "edit";
this.editId = row.id;
this.limitedVisible = true;
console.log('row--',row);
this.addForm = Object.assign({}, row);
},
async filerecordDel(row) {

12
src/views/srm/paperse.vue
View File

@ -26,11 +26,6 @@
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id">
<el-table-column label="#" type="index"></el-table-column>
<el-table-column
label="申请部门"
prop="belong_dept_name"
min-width="60"
></el-table-column>
<el-table-column
label="拟发表论文名称"
prop="paper_name"
@ -44,7 +39,12 @@
<el-table-column
label="作者"
prop="author"
min-width="120"
min-width="60"
></el-table-column>
<el-table-column
label="申请部门"
prop="organization"
min-width="60"
></el-table-column>
<el-table-column
label="拟发表文章类型"

12
src/views/srm/paperse_form.vue
View File

@ -5,6 +5,9 @@
<el-form-item label="拟发表论文名称" prop="paper_name">
<el-input v-model="localForm.paper_name" clearable :disabled="localMode ==='show'"></el-input>
</el-form-item>
<el-form-item label="申请部门" prop="orginization">
<el-input v-model="localForm.organization" clearable :disabled="localMode ==='show'"></el-input>
</el-form-item>
<el-form-item label="拟投期刊名称" prop="publication_name">
<el-input v-model="localForm.publication_name" clearable :disabled="localMode ==='show'"></el-input>
</el-form-item>
@ -152,6 +155,15 @@ export default {
methods: {
async submit_b_func() {
let that = this;
if(that.localForm.ticket_?.state_?.name == '总经理审批'){
const papertData = {
paper: that.localForm.id,
pa_type: that.localForm.paper_type,
author: that.localForm.author,
organization: that.localForm.organization
};
that.$API.srm.paperrecord.create.req(papertData);
}
if(that.localForm?.id){
that.localMode = "edit";
}

31
src/views/srm/patent.vue
View File

@ -28,7 +28,7 @@
<el-table-column label="#" type="index"></el-table-column>
<el-table-column
label="申请部门"
prop="belong_dept_name"
prop="organization"
min-width="60"
></el-table-column>
<el-table-column
@ -39,12 +39,12 @@
<el-table-column
label="发明人（设计人）"
prop="author"
min-width="120"
min-width="60"
></el-table-column>
<el-table-column
label="拟申请专利类型"
prop="type"
min-width="120">
min-width="60">
<template #default="scope">
{{patentType[scope.row.type]}}
</template>
@ -69,7 +69,7 @@
prop="other_area"
min-width="60"
></el-table-column>
<el-table-column label="技术状态" prop="tech_status" min-width="200">
<el-table-column label="技术状态" prop="tech_status" min-width="160">
<template #default="{row}">
<div v-if="row.tech_status && row.tech_status.length">
<div v-for="(item, index) in row.tech_status" :key="index">
@ -87,7 +87,7 @@
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column label="技术文件" prop="tech_file" min-width="120">
<el-table-column label="技术文件" prop="tech_file" min-width="160">
<template #default="{row}">
<div v-if="row.tech_file && row.tech_file.length">
<div v-for="(item, index) in row.tech_file" :key="index">
@ -189,27 +189,6 @@ export default {
this.limitedVisible = true;
},
// getDefaultForm(){
// return {
// name: "",
// author: "",
// type: "",
// is_public: false,
// area: null,
// other_area: null,
// tech_status: [{ name: "是否进行过科技成果鉴定", status: "", fileList: [] },
// { name: "是否发表过文章", status: "", fileList: [] },
// { name: "是否参与过展会展出", status: "", fileList: [] },
// { name: "是否应用于生产/销售", status: "", fileList: [] },
// { name: "是否参与过技术交流", status: "", fileList: [] }],
// tech_file: [ { name: "技术背景材料", status: "", pages: "" },
// { name: "技术交底材料", pages: "" },
// { name: "查新检索报告", pages: "" },
// { name: "图或者照片", pages: "" }],
// ticket_:null
// }
// },
// 审批流结束之后才可以编辑
patentShow(row) {
this.mode = "show";
this.t_id = row.id;

14
src/views/srm/patent_form.vue
View File

@ -5,6 +5,9 @@
<el-form-item label="拟申请专利名称" prop="name">
<el-input v-model="localForm.name" clearable :disabled="localMode ==='show'"></el-input>
</el-form-item>
<el-form-item label="申请部门" prop="organization">
<el-input v-model="localForm.organization" clearable :disabled="localMode ==='show'"></el-input>
</el-form-item>
<el-form-item label="发明人（设计人）"
prop="author"
>
@ -163,6 +166,15 @@ export default {
methods: {
async submit_b_func() {
let that = this;
if(that.localForm.ticket_?.state_?.name == '总经理审批'){
const patentData = {
patent: that.localForm.id,
pc_type: that.localForm.type,
inventors: that.localForm.author,
organization: that.localForm.organization
};
that.$API.srm.patentrecord.create.req(patentData);
}
if(that.localForm?.id){
that.localMode = "edit";
}
@ -170,7 +182,7 @@ export default {
let res = await that.$API.srm.patentinfo.create.req(that.localForm);
that.localForm.id = res.id;
} else if (that.localMode == "edit") {
await that.$API.srm.patentinfo.update.req(that.localForm.id, that.localForm);
that.$API.srm.patentinfo.update.req(that.localForm.id, that.localForm);
}
},
getTid (){