From 3c03d44a3a3c1fec7d01815e0be51fdd8c92e990 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期二, 10 六月 2025 09:53:36 +0800 Subject: [PATCH] Merge branch 'refs/heads/dev' into dev_ztns --- src/views/business/materialOrder/customsInspectionOrder.vue | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/views/business/materialOrder/customsInspectionOrder.vue b/src/views/business/materialOrder/customsInspectionOrder.vue index cfb2675..044ca47 100644 --- a/src/views/business/materialOrder/customsInspectionOrder.vue +++ b/src/views/business/materialOrder/customsInspectionOrder.vue @@ -778,9 +778,8 @@ if (this.orderType == 1) { this.$set(this.addObj, 'orderType', 'Quarterly inspection') } - const str = res.data.treeName.split('-') - this.selectTreeTem = str.join(' - ') - this.selectTree = str.join(' - ') + this.selectTreeTem = res.data.treeName + this.selectTree = res.data.treeName this.addListInfo(this.codeLevel, res.data) // 鍘熸潗鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒� this.selectInsOrderTemplate() // 鍘熸潗鏂欐ā鏉垮垪琛ㄦ煡璇� } else { @@ -1456,10 +1455,10 @@ }).then(res => { this.methodLoad = false try { - if (res.data.standardMethodList.length == 0 && this.selectTree.split('-').length == 5) { - let arr = this.selectTree.split('-') + if (res.data.standardMethodList.length == 0 && this.selectTree.split(' - ').length == 5) { + let arr = this.selectTree.split(' - ') let arr0 = arr.slice(0, arr.length - 1) - let selectTree = arr0.join('-').substring(0, arr0.join('-').length - 1) + let selectTree = arr0.join(' - ').substring(0, arr0.join(' - ').length - 1) selectsStandardMethodByFLSSM({ tree: selectTree }).then(ress => { @@ -1651,7 +1650,7 @@ }) } this.productList = [] - let num = this.selectTreeTem.split('-').length; + let num = this.selectTreeTem.split(' - ').length; if (num != 5) { this.selectTree = this.selectTreeTem + ' - ' + e } else { -- Gitblit v1.9.3