diff --git a/src/api/model/ofm.js b/src/api/model/ofm.js index 86b78dc1..bdd39a0a 100644 --- a/src/api/model/ofm.js +++ b/src/api/model/ofm.js @@ -291,26 +291,26 @@ export default { patentinfo: { list: { url: `${config.API_URL}/ofm/patentinfo/`, - name: "宣传报道列表", + name: "专利列表", req: async function(data){ return await http.get(this.url, data); } }, item: { - name: "宣传报道详情", + name: "专利详情", req: async function(id){ return await http.get( `${config.API_URL}/ofm/patentinfo/${id}/`); } }, create: { url: `${config.API_URL}/ofm/patentinfo/`, - name: "创建宣传报道", + name: "专利创建", req: async function(data){ return await http.post(this.url, data); } }, update: { - name: "删除宣传报道", + name: "专利更新", req: async function(id, data){ return await http.put( `${config.API_URL}/ofm/patentinfo/${id}/`, @@ -319,10 +319,47 @@ export default { } }, delete: { - name: "删除宣传报道", + name: "专利删除", req: async function(id){ return await http.delete(`${config.API_URL}/ofm/patentinfo/${id}/`); } } }, + papersecret: { + list: { + url: `${config.API_URL}/ofm/paperse/`, + name: "论文列表", + req: async function(data){ + return await http.get(this.url, data); + } + }, + item: { + name: "论文详情", + req: async function(id){ + return await http.get( `${config.API_URL}/ofm/paperse/${id}/`); + } + }, + create: { + url: `${config.API_URL}/ofm/paperse/`, + name: "论文创建", + req: async function(data){ + return await http.post(this.url, data); + } + }, + update: { + name: "论文更新", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/ofm/paperse/${id}/`, + data + ); + } + }, + delete: { + name: "删除论文", + req: async function(id){ + return await http.delete(`${config.API_URL}/ofm/paperse/${id}/`); + } + } + }, } diff --git a/src/views/enm_report/quality.vue b/src/views/enm_report/quality.vue index 50f89c4e..e5628d25 100644 --- a/src/views/enm_report/quality.vue +++ b/src/views/enm_report/quality.vue @@ -306,8 +306,8 @@ that.header2 = ['辅料','干混生料'];//物料 }else if(that.deptName=='烧成车间'){ - that.header2Obj=[{name:'出窑熟料',lengths:4},{name:'熟料',lengths:4}]; - that.header2 = ['出窑熟料','熟料'];//物料 + that.header2Obj=[{name:'氧化钙',lengths:4},{name:'熟料',lengths:4}]; + that.header2 = ['氧化钙','熟料'];//物料 }else{ that.header2Obj=[{name:'出磨水泥',lengths:3}]; that.header2 = ['出磨水泥'];//物料 diff --git a/src/views/ofm/borrowfile_form.vue b/src/views/ofm/borrowfile_form.vue index ae333c29..6e0142b7 100644 --- a/src/views/ofm/borrowfile_form.vue +++ b/src/views/ofm/borrowfile_form.vue @@ -154,14 +154,13 @@ export default { getFileList() { return this.$API.ofm.filerecord.list.req(this.query).then((res) => { this.fileList = res.results; - console.log('----111---',this.fileList); }); }, getTid (){ var that = this; if (that.t_id) { that.$API.ofm.borrow.item.req(that.t_id).then(res=>{ - that.form = res; + that.addForm = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; }else{ diff --git a/src/views/ofm/paperse.vue b/src/views/ofm/paperse.vue new file mode 100644 index 00000000..bea296d0 --- /dev/null +++ b/src/views/ofm/paperse.vue @@ -0,0 +1,328 @@ + + + + + 新增 + + + + + + + + + + + + + + + + + + {{ scope.row.is_chinese_core ? '是' : '否'}} + + + + + + + {{ scope.row.is_sci ? '是' : '否'}} + + + + + + + + {{item.name}}: + {{ item.status }} + + 文件下载 + + + — + + + + + + + {{item.name}}: + {{ item.pages }}页 + + + — + + + + + {{scope.row.ticket_?.state_?.name}} + + + + + {{statusOptions[scope.row.ticket_?.state_?.type]}} + + + + + 详情 + + + + 删除 + + + + + + + + + + + {handleQuery(); limitedVisible = false}" + @closed="limitedVisible = false" + /> + + + + + + + diff --git a/src/views/ofm/paperse_form.vue b/src/views/ofm/paperse_form.vue new file mode 100644 index 00000000..ddd3094f --- /dev/null +++ b/src/views/ofm/paperse_form.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + 是 + 否 + + + + + 是 + 否 + + + + + + + {{ item.name }} + + 是 + 否 + + + + fileUPSuccess(res, item)" + :disabled="localMode ==='view'" + > + + + + + + + + + + {{ item.name }} + + + 页/张 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/ofm/patent.vue b/src/views/ofm/patent.vue index c373b66d..0703aeaa 100644 --- a/src/views/ofm/patent.vue +++ b/src/views/ofm/patent.vue @@ -39,7 +39,7 @@ - + {{ scope.row.is_public ? '是' : '否'}} @@ -108,12 +108,7 @@ {{statusOptions[scope.row.ticket_.state_.type]}} - - + - - + + @@ -129,17 +131,30 @@ export default { ...(this.modelValue || {}) } }; }, - - mounted() { - console.log('mode', this.localMode) - }, + // mounted() { + // let that = this; + // console.log('666666',that.ticket_data) + // }, + watch: { + localForm: { + handler(val) { + Object.assign(this.ticket_data, { + author: val.author, + // 其他需要同步的字段... + }); + }, + deep: true, + } + }, methods: { async submit_b_func() { - let that = this; - this.ticketTitle = `${this.localForm.filename}-专利审批` + let that = this; + if(that.localForm?.id){ + that.localMode = "edit"; + } + console.log('that.localForm',that.localMode, that.localForm) if(that.localMode == "add") { let res = await that.$API.ofm.patentinfo.create.req(that.localForm); - that.localForm.id = res.id; } else if (that.localMode == "edit") { await that.$API.ofm.patentinfo.update.req(that.localForm.id, that.localForm); @@ -149,7 +164,7 @@ export default { var that = this; if (that.t_id) { that.$API.ofm.patentinfo.item.req(that.t_id).then(res=>{ - that.form = res; + that.localForm = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; }else{ diff --git a/src/views/ofm/publicityForm.vue b/src/views/ofm/publicityForm.vue index 3b0a9c29..2e0c0cfe 100644 --- a/src/views/ofm/publicityForm.vue +++ b/src/views/ofm/publicityForm.vue @@ -214,7 +214,7 @@ export default { var that = this; if (that.t_id) { that.$API.ofm.publicity.item.req(that.t_id).then(res=>{ - that.form = res; + that.addForm = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; }else{ diff --git a/src/views/ofm/sealForm.vue b/src/views/ofm/sealForm.vue index 0880499f..7db9b171 100644 --- a/src/views/ofm/sealForm.vue +++ b/src/views/ofm/sealForm.vue @@ -141,7 +141,7 @@ export default { }; }, mounted() { - console.log('------------------',this.t_id) + // console.log('--------this.t_id----------',this.t_id) this.getTid(); this.initTimeRange(); if (this.localForm.ticket_?.state_.type===1){ @@ -189,11 +189,11 @@ export default { }, getTid (){ var that = this; - console.log('----------that--------',that.t_id) + // console.log('----------that--------',that.t_id) if (that.t_id) { that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{ that.localForm = res; - console.log('----------ticket_--------',that.localForm.ticket_) + // console.log('----------ticket_--------',that.localForm.ticket_) that.ticketview = true; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; diff --git a/src/views/ofm/vehicleForm.vue b/src/views/ofm/vehicleForm.vue index b6d1d3f1..c85d0ae4 100644 --- a/src/views/ofm/vehicleForm.vue +++ b/src/views/ofm/vehicleForm.vue @@ -178,7 +178,7 @@ export default { var that = this; if (that.t_id) { that.$API.ofm.vehicle.item.req(that.t_id).then(res=>{ - that.form = res; + that.addForm = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; }else{