From aa725bcdcae0b515f12d3b73be90b81432627727 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 8 Apr 2026 21:51:10 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/common/JcgjList.vue | 180 +++++++++++++++++++-------- src/views/business/study/comp/tbbd/Fh.vue | 51 ++++---- 2 files changed, 157 insertions(+), 74 deletions(-) diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue index 8be3449..1dbae8d 100644 --- a/src/views/business/comps/common/JcgjList.vue +++ b/src/views/business/comps/common/JcgjList.vue @@ -1,11 +1,12 @@ @@ -55,35 +75,35 @@ export default { name: "JcgjList", components: {}, - props:{ - showRy:{ - type:Boolean, - default:false + props: { + showRy: { + type: Boolean, + default: false }, - showXg:{ - type:Boolean, - default:false + showXg: { + type: Boolean, + default: false }, - showLc:{ - type:Boolean, - default:true + showLc: { + type: Boolean, + default: true }, - showBj:{ - type:Boolean, - default:true + showBj: { + type: Boolean, + default: true }, - showBcsm:{ - type:Boolean, - default:false + showBcsm: { + type: Boolean, + default: false }, // 更换笼具 showLj: { - type:Boolean, - default:false + type: Boolean, + default: false }, readonly: { - type:Boolean, - default:false + type: Boolean, + default: false }, }, data() { @@ -96,11 +116,71 @@ export default { }; }, mounted() { - this.list=[] + this.list = [] }, methods: { + openFileEn(ppindex, pitem, item) { + let result='' + if (pitem.name == 'Old Value') { + let _oldUrl = "" + for (var i = 0; i < item.jcnrList.length; i++) { + if (item.jcnrList[i].name == 'oldUrl') { + _oldUrl = item.jcnrList[i].value + break; + } + } + if (_oldUrl && _oldUrl != '') { + let oldUrl = _oldUrl.split(";") + result=process.env.VUE_APP_FILE_DOMAIN +oldUrl[ppindex] + } + } + if (pitem.name == 'New Value') { + let _url = "" + for (var i = 0; i < item.jcnrList.length; i++) { + if (item.jcnrList[i].name == 'url') { + _url = item.jcnrList[i].value + break; + } + } + if (_url && _url != '') { + let url = _url.split(";") + result=process.env.VUE_APP_FILE_DOMAIN +url[ppindex]; + } + } + return result; + }, + openFile(ppindex, pitem, item) { + let result='' + if (pitem.name == '原值') { + let _oldUrl = "" + for (var i = 0; i < item.jcnrList.length; i++) { + if (item.jcnrList[i].name == 'oldUrl') { + _oldUrl = item.jcnrList[i].value + break; + } + } + if (_oldUrl && _oldUrl != '') { + let oldUrl = _oldUrl.split(";") + result=process.env.VUE_APP_FILE_DOMAIN +oldUrl[ppindex] + } + } + if (pitem.name == '新值') { + let _url = "" + for (var i = 0; i < item.jcnrList.length; i++) { + if (item.jcnrList[i].name == 'url') { + _url = item.jcnrList[i].value + break; + } + } + if (_url && _url != '') { + let url = _url.split(";") + result=process.env.VUE_APP_FILE_DOMAIN +url[ppindex]; + } + } + return result; + }, handleQuery() { - this.$emit('handleQuery',this.queryParams) + this.$emit('handleQuery', this.queryParams) }, init(val) { let that = this diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue index b83c35c..1a43ce3 100644 --- a/src/views/business/study/comp/tbbd/Fh.vue +++ b/src/views/business/study/comp/tbbd/Fh.vue @@ -48,18 +48,17 @@
{{ $t('page.business.study.studyFormFill.jcgj') }}
- + + @pagination="getJjcgjList" :page.sync="queryParamsJcgj.pageNum" :limit.sync="queryParamsJcgj.pageSize" /> -
+
@@ -97,8 +96,8 @@ - + @@ -191,8 +190,8 @@ export default { }, getJjcgjList(val) { this.$modal.loading() - if(val){ - this.queryParamsJcgj=_.merge({}, this.queryParamsJcgj, val) + if (val) { + this.queryParamsJcgj = _.merge({}, this.queryParamsJcgj, val) } studyFormFill_jcgj(this.queryParamsJcgj).then(response => { this.jcgjList = response.rows @@ -234,22 +233,26 @@ export default { }) }, async showApprove(qmyy) { - let content = await this.$refs.templateTable.getFormData() - if (content) { - this.openApprove = true - this.resetApprove() - this.formApprove.id = this.form.id - this.formApprove.bdnr = JSON.stringify(content) - this.formApprove.qmyy = qmyy - if (qmyy == '复核通过') { - this.openTitle = 'page.business.study.studyFormFill.fhtg' - this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhtg') - } else if (qmyy == '复核拒绝') { - this.openTitle = 'page.business.study.studyFormFill.fhjj' - this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhjj') - } else if (qmyy == '通过') { - this.openTitle = 'page.business.study.studyFormFill.tongguo' - this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.mfhtg') + if (!this.$refs.templateTable.isReply()) { + this.$modal.msgError("还有疑问项未回复"); + } else { + let content = await this.$refs.templateTable.getFormData() + if (content) { + this.openApprove = true + this.resetApprove() + this.formApprove.id = this.form.id + this.formApprove.bdnr = JSON.stringify(content) + this.formApprove.qmyy = qmyy + if (qmyy == '复核通过') { + this.openTitle = 'page.business.study.studyFormFill.fhtg' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhtg') + } else if (qmyy == '复核拒绝') { + this.openTitle = 'page.business.study.studyFormFill.fhjj' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhjj') + } else if (qmyy == '通过') { + this.openTitle = 'page.business.study.studyFormFill.tongguo' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.mfhtg') + } } } }, From 0ed001a3186c6407c691b320897f8ccd6a375610 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 8 Apr 2026 21:54:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?= =?UTF-8?q?]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/tbbd/Fh.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue index 1a43ce3..27830a2 100644 --- a/src/views/business/study/comp/tbbd/Fh.vue +++ b/src/views/business/study/comp/tbbd/Fh.vue @@ -233,7 +233,7 @@ export default { }) }, async showApprove(qmyy) { - if (!this.$refs.templateTable.isReply()) { + if ((qmyy == '通过'||qmyy == '复核通过')&&!this.$refs.templateTable.isReply()) { this.$modal.msgError("还有疑问项未回复"); } else { let content = await this.$refs.templateTable.getFormData() From 5916d9e001f03a2e1c390abdca8fe96d28c3280b Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 9 Apr 2026 10:23:16 +0800 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20[=E4=BB=AA=E5=99=A8=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5]=20=E6=B5=8B=E8=AF=95=E5=A4=A9=E5=B9=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tpph.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/tpph.js b/src/utils/tpph.js index 96718a6..92df568 100644 --- a/src/utils/tpph.js +++ b/src/utils/tpph.js @@ -13,7 +13,7 @@ export async function getBalance( parity ) { let val = {} - let url = `http://localhost/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` + let url = `/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` await axios .get( @@ -44,7 +44,7 @@ export async function getBalance( export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) { let val = {} - let url = `http://localhost/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` + let url = `/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` await axios .get( @@ -67,7 +67,7 @@ export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) { Message.error(data.msg || '获取PH数据失败') return } - val = parseBalanceData(data.data) + val = extractPHValue(data.data) debugger }) debugger From c6476fcf6899051bb82a6e3dcb678d0ed2abf54f Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 9 Apr 2026 11:23:51 +0800 Subject: [PATCH 04/13] =?UTF-8?q?feat:=20[=E6=95=B0=E6=8D=AE=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5]=20=E5=A4=A9=E5=B9=B3+PH=E6=B5=8B=E8=AF=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tpph.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/utils/tpph.js b/src/utils/tpph.js index 92df568..c505042 100644 --- a/src/utils/tpph.js +++ b/src/utils/tpph.js @@ -12,6 +12,13 @@ export async function getBalance( byteSize, parity ) { + return { + success: true, + originalValue: '1000', + originalUnit: 'g', + message: '' + } + let val = {} let url = `/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` @@ -43,6 +50,12 @@ export async function getBalance( } export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) { + return { + success: true, + value: '900', + message: '' + } + let val = {} let url = `/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` From e3e4f17e5b2b2970afc59e5114014dcf329705b0 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Thu, 9 Apr 2026 14:19:27 +0800 Subject: [PATCH 05/13] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86][update]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/HandleFormItem.vue | 9 +++++++-- src/components/Template/StepComponents/ZLSubPackage.vue | 7 ++++--- .../business/comps/template/dialog/SubPackageDialog.vue | 12 +++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 4028574..a11a224 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -343,6 +343,7 @@ export default { }] }, allowedTypes: ["zip","rar","doc","docx","pdf","jpg"], + signData: null,//签名数据 } }, watch: { @@ -699,6 +700,7 @@ export default { } }, onEditSignSave(data) { + this.signData = data; // 检查是否有待上传的文件 if (this.pendingUploadFile) { // 签名验证通过，将文件添加到列表并上传 @@ -1286,8 +1288,8 @@ export default { const oldAttList = JSON.parse(recordOldVlaue || "[]"); recordValue = attList.map(item => item.name).join(";"); recordOldVlaue = oldAttList.map(item => item.name).join(";"); - oldUrl = oldAttList.map(item => item.url).join(";"); - url = attList.map(item => item.url).join(";"); + oldUrl = oldAttList.map(item => item.url).join("|"); + url = attList.map(item => item.url).join("|"); } const record = { @@ -1304,6 +1306,9 @@ export default { if (data) { record.reason = data.remark } + if(this.type === "attachment" && this.signData){ + record.reason = this.signData.remark; + } const params = { type: "fieldChanged", diff --git a/src/components/Template/StepComponents/ZLSubPackage.vue b/src/components/Template/StepComponents/ZLSubPackage.vue index 264812f..58c357f 100644 --- a/src/components/Template/StepComponents/ZLSubPackage.vue +++ b/src/components/Template/StepComponents/ZLSubPackage.vue @@ -11,6 +11,7 @@ @blur = "(e)=>onCommonBlur(e,item.key)" v-model="formData[item.key]" /> {{ item.unit }} + 确定
分装单位
@@ -359,9 +360,9 @@ export default { if (this.formData[field]) { this.formErrors[field] = false; } - if(field === 'fzsl'){ - this.onBlurFzsl(e); - } + }, + onConfirm(field){ + this.onBlurFzsl(this.formData[field]); }, onBlurFzNum(index, field) { if (this.fzList[index]) { diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue index 5ad7543..9b2ee4f 100644 --- a/src/views/business/comps/template/dialog/SubPackageDialog.vue +++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue @@ -1,5 +1,5 @@