From 3af6cba243fb7a77dc07a7c7ef385389b13a9f99 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Wed, 5 Nov 2025 16:10:12 +0800 Subject: [PATCH 1/8] feat: ofm-seal bug fix --- src/views/ofm/mroombooking.vue | 4 +- src/views/ofm/seal.vue | 226 +++----------------------- src/views/ofm/sealForm.vue | 130 +++++++-------- src/views/ofm/vehicle.vue | 141 +++------------- src/views/ofm/vehicleForm.vue | 55 ++++--- src/views/srm/plat.vue | 289 +++++++++++++++++++++++++++++++++ src/views/srm/plat_form.vue | 204 +++++++++++++++++++++++ 7 files changed, 624 insertions(+), 425 deletions(-) create mode 100644 src/views/srm/plat.vue create mode 100644 src/views/srm/plat_form.vue diff --git a/src/views/ofm/mroombooking.vue b/src/views/ofm/mroombooking.vue index 8f869950..f616c94a 100644 --- a/src/views/ofm/mroombooking.vue +++ b/src/views/ofm/mroombooking.vue @@ -68,7 +68,7 @@ 内用 - 外借 + >新增
否 - + - - - - @@ -113,64 +117,44 @@ import ticketd_b from "@/views/wf/ticketd_b.vue"; import ticketd from '@/views/wf/ticketd.vue' export default { props: { - mode: { type: String, default: "view" }, // add / edit / view - lending_type: { type: String, default: "outer" }, // inner / outer - modelValue: { type: Object, default: () => ({}) }, + mode: { + type: String, default: "show" + }, // add / edit / show t_id: { - type: String, - default: null - }, - }, + type: String, default: null + }, + }, components: {ticketd, ticketd_b }, - emits: ["update:modelValue", "submit", "cancel"], data() { return { - ticket_data: {}, - ticketview: false, ticketTitle: "用印申请", - localForm: { - ticket_: { - state_: { type: '' } - }, - ...this.modelValue }, - localMode : this.mode, + ticket_data: {}, + localForm: {}, + localMode: this.mode, timeRange: [], rules: { filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], }, }; }, - mounted() { - // console.log('--------this.t_id----------',this.t_id) - this.getTid(); - this.initTimeRange(); - if (this.localForm.ticket_?.state_.type===1){ - this.localMode = 'edit' - } - if(this.lending_type === 'outer'){ - this.ticket_data = { - is_lending: true - }; + mounted() { + let that = this; + if (that.t_id) { + that.getTid(); + }else { + if(that.lending_type == 'outer'){ + that.localForm.is_lending = true; }else{ - this.ticket_data={is_lending: false} - }; + that.localForm.is_lending = false; + } + } + that.initTimeRange(); }, watch: { 'localForm.actual_return_date'(val) { this.ticket_data.actual_return_date = val }, }, - computed: { - addForm: { - get() { - return this.modelValue; - }, - set(val) { - this.$emit("update:modelValue", val); - }, - }, - }, - methods: { handleDateChange(val) { this.localForm.lending_date = val?.[0] || null @@ -181,7 +165,6 @@ export default { this.ticketTitle = `${this.localForm.filename}-用印申请` if(that.localMode == "add") { let res = await that.$API.ofm.lendingseal.create.req(that.localForm); - that.localForm.id = res.id; } else if (that.localMode == "edit") { await that.$API.ofm.lendingseal.update.req(that.localForm.id, that.localForm); @@ -189,18 +172,15 @@ export default { }, getTid (){ var that = this; - // 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_) - that.ticketview = true; - if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { - that.localMode = "edit"; - }else{ - that.localMode = "show"; - } - }) + if (that.t_id) { + that.$API.ofm.lendingseal.item.req(that.t_id).then(res=>{ + that.localForm = res; + if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { + that.localMode = "edit"; + }else{ + that.localMode = "show"; + } + }) } }, initTimeRange() { diff --git a/src/views/ofm/vehicle.vue b/src/views/ofm/vehicle.vue index ec88f806..13915464 100644 --- a/src/views/ofm/vehicle.vue +++ b/src/views/ofm/vehicle.vue @@ -80,16 +80,15 @@ prop="actual_km" min-width="100" > - + - - - - diff --git a/src/views/ofm/vehicleForm.vue b/src/views/ofm/vehicleForm.vue index c85d0ae4..0c4529ed 100644 --- a/src/views/ofm/vehicleForm.vue +++ b/src/views/ofm/vehicleForm.vue @@ -62,10 +62,11 @@ - + ({}) }, - transitions: { type: Array, default: () => [] }, + mode: { + type: String, default: "view" + }, // add / edit / view + formData: { + type: Object, default: () => ({}) + }, t_id: { type: String, default: null @@ -108,27 +113,30 @@ export default { ticket_: { state_: { type: '' } }, - ...this.modelValue }, - - ticketTitle: "用车申请", - ticket_data: {}, - localMode : this.mode, - rules:{ - filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], - }, - workflow_key: "vehicle_in", - vehicle_scope:[{name: '市内', is_city: true},{name: '市外', is_city: false}], - } + ...this.modelValue + }, + ticketed_show: false, + ticketTitle: "用车申请", + ticket_data: {}, + localMode : this.mode, + rules:{ + filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], + }, + workflow_key: "vehicle_in", + vehicle_scope:[{name: '市内', is_city: true},{name: '市外', is_city: false}], + } }, mounted() { - if (this.addForm.ticket_?.state_.type===1){ - this.localMode = 'edit' + let that = this; + that.addForm = that.formData; + // if (that.addForm.ticket_?.state_.type===1){ + // that.localMode = 'edit' + // }; + that.ticket_data = { + ...that.ticket_data, + is_city: that.addForm.is_city, }; - this.ticket_data = { - ...this.ticket_data, - is_city: this.addForm.is_city, - }; - this.getTid(); + that.getTid(); }, watch: { @@ -157,7 +165,6 @@ export default { deep: true, } }, - methods: { async submit_b_func() { let that = this; diff --git a/src/views/srm/plat.vue b/src/views/srm/plat.vue new file mode 100644 index 00000000..39bab92b --- /dev/null +++ b/src/views/srm/plat.vue @@ -0,0 +1,289 @@ + + + + diff --git a/src/views/srm/plat_form.vue b/src/views/srm/plat_form.vue new file mode 100644 index 00000000..997443f6 --- /dev/null +++ b/src/views/srm/plat_form.vue @@ -0,0 +1,204 @@ + + + + \ No newline at end of file From be9db477324813221a06060d420e14a78cf87969 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Wed, 5 Nov 2025 16:58:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20ofm-seal=20=E4=BF=AE=E6=94=B9form?= =?UTF-8?q?=20=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ofm/sealForm.vue | 41 ++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/src/views/ofm/sealForm.vue b/src/views/ofm/sealForm.vue index 6a94ce6c..1fc290b0 100644 --- a/src/views/ofm/sealForm.vue +++ b/src/views/ofm/sealForm.vue @@ -27,22 +27,23 @@ - 是 - 否 + 是 + 否 - - - +
+ + +
@@ -66,8 +67,6 @@ :disabled="localMode ==='show'"> - - { that.localForm = res; + that.initTimeRange(); if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.localMode = "edit"; }else{ From a40dd9079a7bbe47b5926fd9352e484ac4524804 Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Wed, 5 Nov 2025 17:41:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20ofm-veicle=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ofm/sealForm.vue | 1 - src/views/ofm/vehicle.vue | 38 ++---------- src/views/ofm/vehicleForm.vue | 106 ++++++++++------------------------ 3 files changed, 34 insertions(+), 111 deletions(-) diff --git a/src/views/ofm/sealForm.vue b/src/views/ofm/sealForm.vue index 1fc290b0..e5503d19 100644 --- a/src/views/ofm/sealForm.vue +++ b/src/views/ofm/sealForm.vue @@ -154,7 +154,6 @@ export default { }, async submit_b_func() { let that = this; - this.ticketTitle = `${this.localForm.filename}-用印申请` if(that.localMode == "add") { let res = await that.$API.ofm.lendingseal.create.req(that.localForm); that.localForm.id = res.id; diff --git a/src/views/ofm/vehicle.vue b/src/views/ofm/vehicle.vue index 13915464..b8a88343 100644 --- a/src/views/ofm/vehicle.vue +++ b/src/views/ofm/vehicle.vue @@ -95,7 +95,7 @@ link size="small" type="primary" - @click="vehicleEidt(scope.row)" + @click="handleShow(scope.row)" v-auth="'vehicle.update'" >详情 @@ -128,7 +128,6 @@
{ - this.isSaving = false; - if (res.err_code) { - this.$message.error(res.err_msg); - } else { - this.$message.success("更新成功"); - this.limitedVisible = false; - this.$refs.table.refresh(); - } - }); - }, async vehicleDel(row) { var id = row.id; var res = await this.$API.ofm.vehicle.delete.req(id); diff --git a/src/views/ofm/vehicleForm.vue b/src/views/ofm/vehicleForm.vue index 0c4529ed..37843430 100644 --- a/src/views/ofm/vehicleForm.vue +++ b/src/views/ofm/vehicleForm.vue @@ -9,29 +9,25 @@ label-position="left" > - + - - - + + 市内 + 市外 + - + - + - + - + @@ -41,21 +37,21 @@ @@ -64,22 +60,19 @@ ({}) - }, + type: String, default: "show" + }, // add / edit / show t_id: { type: String, default: null }, }, components: {ticketd, ticketd_b}, - emits: ["update:modelValue", "submit", "cancel"], data() { return { - addForm: { - ticket_: { - state_: { type: '' } - }, - ...this.modelValue - }, - ticketed_show: false, + addForm: {}, ticketTitle: "用车申请", ticket_data: {}, localMode : this.mode, rules:{ filename: [{ required: true, message: "请输入文件名称", trigger: "blur" }], }, - workflow_key: "vehicle_in", - vehicle_scope:[{name: '市内', is_city: true},{name: '市外', is_city: false}], } }, mounted() { let that = this; - that.addForm = that.formData; - // if (that.addForm.ticket_?.state_.type===1){ - // that.localMode = 'edit' - // }; - that.ticket_data = { - ...that.ticket_data, - is_city: that.addForm.is_city, - }; - that.getTid(); - + if (that.t_id) { + that.getTid(); + } }, watch: { - // 父组件数据变动 -> 同步到本地 - modelValue: { - handler(val) { - this.addForm = { ...val }; - }, - deep: true, - }, - // 本地数据变动 -> 同步回父组件 - addForm: { - handler(val) { - this.$emit("update:modelValue", val); - }, - deep: true, - }, addForm: { handler(val) { Object.assign(this.ticket_data, { @@ -167,20 +127,14 @@ export default { }, methods: { async submit_b_func() { - let that = this; - if (this.addForm.is_city === true){ - that.workflow_key = "vehicle" - }else{ - that.workflow_key = "vehicle_out" - } - this.ticketTitle = `${this.addForm.reason}-用车申请` - if(that.localMode == "add") { - let res = await that.$API.ofm.vehicle.create.req(that.addForm); - that.addForm.id = res.id; - } else if (that.localMode == "edit") { - await that.$API.ofm.vehicle.update.req(that.addForm.id, that.addForm); - } - }, + let that = this; + if(that.localMode == "add") { + let res = await that.$API.ofm.vehicle.create.req(that.addForm); + that.addForm.id = res.id; + } else if (that.localMode == "edit") { + await that.$API.ofm.vehicle.update.req(that.addForm.id, that.addForm); + } + }, getTid (){ var that = this; if (that.t_id) { From 5799a3680ba7751c3700bff7c0e8f33eca58b195 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 6 Nov 2025 09:13:39 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95expend=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wpm_bx/handover.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue index 00ec3ee5..ed8f5632 100644 --- a/src/views/wpm_bx/handover.vue +++ b/src/views/wpm_bx/handover.vue @@ -61,6 +61,7 @@ row-key="id" :params="params" :query="query" + default-expand-all > Date: Thu, 6 Nov 2025 11:07:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20base=20xtSelect=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/xtSelect/index.vue | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue index c6cd0080..23e88e31 100644 --- a/src/components/xtSelect/index.vue +++ b/src/components/xtSelect/index.vue @@ -69,7 +69,7 @@ - diff --git a/src/views/ofm/archive_form.vue b/src/views/ofm/archive_form.vue deleted file mode 100644 index fa75442d..00000000 --- a/src/views/ofm/archive_form.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - diff --git a/src/views/ofm/borrowfile.vue b/src/views/ofm/borrowfile.vue index 910d8293..8c53bf21 100644 --- a/src/views/ofm/borrowfile.vue +++ b/src/views/ofm/borrowfile.vue @@ -6,7 +6,6 @@ type="primary" icon="el-icon-plus" @click="handleAdd" - v-auth="'fileborrow.create'" >
@@ -61,23 +60,22 @@ prop="return_date" min-width="100" > - + - - - - diff --git a/src/views/ofm/publicityForm.vue b/src/views/ofm/publicityForm.vue index 2e0c0cfe..33ff4873 100644 --- a/src/views/ofm/publicityForm.vue +++ b/src/views/ofm/publicityForm.vue @@ -9,35 +9,35 @@ label-position="left" > - + - + - + - + - + - + @@ -47,14 +47,14 @@ placeholder = "请输入名称" size = "small" style="margin-top: 10;" - :disabled="localMode ==='view'" + :disabled="localMode ==='show'" > - + - + @@ -67,42 +67,44 @@ placeholder = "请输入渠道名称" size = "small" style="margin-top: 10;" - :disabled="localMode ==='view'" + :disabled="localMode ==='show'" > - + - +
- - - - ，应做 - - - - + + 不符合定密要求 + 同意内容为涉密事项 + +
+ + +
+ 应做 + + 公开 + 受控 + 处理。
-
- - - - ，涉密等级为： - - - - +
+ 涉密等级为： + + 机密 + 秘密 + ，保密期限（解密时间或解密条件）为：
- - + + - - + + @@ -127,7 +129,7 @@ - + + /> + :ticket_="addForm.ticket_" + :ticket_data="ticket_data" + @success="$emit('success')" + style="margin-top: 20px;" + /> - diff --git a/src/views/ofm/seal.vue b/src/views/ofm/seal.vue index c8474c87..10cac5a1 100644 --- a/src/views/ofm/seal.vue +++ b/src/views/ofm/seal.vue @@ -6,7 +6,6 @@ type="primary" icon="el-icon-plus" @click="handleAdd" - v-auth="'seal.create'" >新增
From 02e849bdba7d2df1fea1a6736cffe99e5d56796f Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 7 Nov 2025 15:08:51 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90bx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/defect.vue | 40 +++++-------------- src/views/statistics/bxerp/workerTimes.vue | 46 ++++++++++++---------- 2 files changed, 35 insertions(+), 51 deletions(-) diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue index 7a5d3259..ef36b4a1 100644 --- a/src/views/statistics/bxerp/defect.vue +++ b/src/views/statistics/bxerp/defect.vue @@ -41,8 +41,8 @@ @@ -52,36 +52,30 @@ - - - @@ -134,34 +128,18 @@ export default { item.可加工数 = 0; if(item['剪切￠18.3mm不合格']){ if(item['剪切￠18.3mm可加工']){ - item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工']- item['剪切￠18.3mm不合格']; + item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含- item['剪切￠18.3mm不合格'].含; }else{ - item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格']; - } - if(item.暗点不合格){ - item.不合格数 = item['剪切￠18.3mm不合格'] + item.暗点不合格; - item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格'] - item.暗点不合格; - }else{ - item.不合格数 = item['剪切￠18.3mm不合格']; - item.可加工数 = item.总切片数 - item['剪切￠18.3mm不合格']; + item.剪切合格 = item.总切片数 - item['剪切￠18.3mm不合格'].含; } }else{ if(item['剪切￠18.3mm可加工']){ - item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工']; + item.剪切合格 = item.总切片数 - item['剪切￠18.3mm可加工'].含; }else{ item.剪切合格 = item.总切片数; } - if(item.暗点不合格){ - item.不合格数 = item.暗点不合格; - item.可加工数 = item.总切片数 - item.暗点不合格; - }else{ - item.不合格数 = 0; - item.可加工数 = item.总切片数; - } } }) - - console.log('data',data) that.tableData = data; }); }, diff --git a/src/views/statistics/bxerp/workerTimes.vue b/src/views/statistics/bxerp/workerTimes.vue index fad96345..7fbbba30 100644 --- a/src/views/statistics/bxerp/workerTimes.vue +++ b/src/views/statistics/bxerp/workerTimes.vue @@ -3,19 +3,19 @@
- - - + --> + > - + - + + + - - - - - - - - - - + @@ -78,7 +75,7 @@ export default { dept_name:'', start_date:'', }, - group: [], + mgroups: [], tableData:[], groupsProps: { value: "name", @@ -107,8 +104,17 @@ export default { let that = this; let params = {}; params.query = that.query; - that.$API.bi.dataset.exec.req('performance', params).then((res) => { - that.tableData = res.data2.ds0; + that.$API.bi.dataset.exec.req('lineDay_p', params).then((res) => { + let data = res.data2.ds0; + that.lists = []; + data.forEach(item=>{ + let obj = JSON.parse(item.工段物料生产数); + for(let key in obj){ + item[key]= obj[key]; + if(that.lists.indexOf(key)>-1){}else{that.lists.push(key)} + } + }) + that.tableData = data; }); }, deptChange(){ From 80f329c617e00d694771d45dd900d32c96aa8a7d Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Fri, 7 Nov 2025 15:40:35 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20srm=20=E7=A7=91=E7=A0=94=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=89=B9=E4=BF=AE=E6=94=B9=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/srm/paperse.vue | 142 +++++++----------------- src/views/srm/paperse_form.vue | 73 +++++++------ src/views/srm/patent.vue | 192 +++++++-------------------------- src/views/srm/patent_form.vue | 97 ++++++++--------- 4 files changed, 167 insertions(+), 337 deletions(-) diff --git a/src/views/srm/paperse.vue b/src/views/srm/paperse.vue index b2341b69..3815795d 100644 --- a/src/views/srm/paperse.vue +++ b/src/views/srm/paperse.vue @@ -94,24 +94,22 @@ — - + - - -