From fb0ec7cb813d74d62f57e880f3b2ba1cf6770530 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Mon, 17 Jun 2024 18:02:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/components/FormModel/index.vue | 1 + .../claimAndRefund/return/returnApplyByCq.vue | 3 ++- .../src/views/claimAndRefund/return/tree.vue | 9 ++++++++- .../secondStore/outStoreBook.vue | 2 ++ .../cost/csotSettlement/costApplyList.vue | 3 +-- .../src/views/cost/csotSettlement/costList.vue | 1 - sgzb-ui/src/views/repairTest/repair/tree.vue | 18 +++++++++++++----- sgzb-ui/src/views/store/tools/accessory.vue | 2 +- .../warehouseManage/machinery/parts/index.vue | 1 + 9 files changed, 29 insertions(+), 11 deletions(-) diff --git a/sgzb-ui/src/components/FormModel/index.vue b/sgzb-ui/src/components/FormModel/index.vue index 742b699c..00621f8f 100644 --- a/sgzb-ui/src/components/FormModel/index.vue +++ b/sgzb-ui/src/components/FormModel/index.vue @@ -44,6 +44,7 @@ :show-all-levels="false" @change="casCadeChange" clearable + filterable style="width: 240px" /> diff --git a/sgzb-ui/src/views/claimAndRefund/return/tree.vue b/sgzb-ui/src/views/claimAndRefund/return/tree.vue index 1d40b846..7f9f7ab4 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/tree.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/tree.vue @@ -19,6 +19,7 @@ highlight-current @node-click="handleNodeClick" :props="defaultProps" + :filter-node-method="filterNode" > @@ -47,7 +48,9 @@ export default { } }, watch: { - + inputValue(val) { + this.$refs.tree.filter(val); + } }, data() { return { @@ -85,6 +88,10 @@ export default { this.inputValue = e.label this.$emit('changeId', e.id) this.ishowTree = false + }, + filterNode(value, data) { + if (!value) return true; + return data.label.indexOf(value) !== -1; } } diff --git a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue index 65d6f151..6c5b20b6 100644 --- a/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue +++ b/sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue @@ -235,6 +235,8 @@ export default { typeId: undefined, keyword: '', }, + typeList: [], + equipmentTypeList: [], } }, created() { diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue index 180138a0..64920045 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue @@ -202,7 +202,6 @@ export default { // 工程数据 projectList: [], statusList: [ - { id: '0', name: '请选择' }, { id: '1', name: '未结算' }, { id: '2', name: '已结算' }, { id: '3', name: '待审核' }, @@ -220,7 +219,7 @@ export default { pageNum: 1, pageSize: 10, keyWord: undefined, - sltStatus: '0', + sltStatus: '', unitId: '', projectId: '', }, diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue index b1f677e7..fa731d5e 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costList.vue @@ -196,7 +196,6 @@ export default { // 工程数据 projectList: [], statusList: [ - { id: '', name: '请选择' }, { id: '0', name: '待审核' }, { id: '1', name: '审核通过' }, { id: '2', name: '审核驳回' }, diff --git a/sgzb-ui/src/views/repairTest/repair/tree.vue b/sgzb-ui/src/views/repairTest/repair/tree.vue index 1d40b846..2824ea06 100644 --- a/sgzb-ui/src/views/repairTest/repair/tree.vue +++ b/sgzb-ui/src/views/repairTest/repair/tree.vue @@ -19,6 +19,7 @@ highlight-current @node-click="handleNodeClick" :props="defaultProps" + :filter-node-method="filterNode" > @@ -63,11 +64,14 @@ export default { }, mounted() { }, - // watch: { - // name: function () { - // this.inputValue = this.name - // } - // }, + watch: { + // name: function () { + // this.inputValue = this.name + // } + inputValue(val) { + this.$refs.tree.filter(val); + } + }, methods: { inputFocus() { if (this.ishowTree == true) { @@ -85,6 +89,10 @@ export default { this.inputValue = e.label this.$emit('changeId', e.id) this.ishowTree = false + }, + filterNode(value, data) { + if (!value) return true; + return data.label.indexOf(value) !== -1; } } diff --git a/sgzb-ui/src/views/store/tools/accessory.vue b/sgzb-ui/src/views/store/tools/accessory.vue index 502a8437..2de062d4 100644 --- a/sgzb-ui/src/views/store/tools/accessory.vue +++ b/sgzb-ui/src/views/store/tools/accessory.vue @@ -61,7 +61,7 @@ - diff --git a/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue index 10a525f8..d7aff3e8 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue @@ -156,6 +156,7 @@ v-model="form.currentId" :options="deptOptions" :disabled="isEdit" + filterable :props="{ expandTrigger: 'hover', label: 'label', From 036c1eb2a5f2dab290a890f55e4cf710b95be030 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 18 Jun 2024 09:14:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20=20=E5=B7=A5=E6=9C=BA?= =?UTF-8?q?=E5=85=B7=E7=AE=A1=E7=90=86-=E7=BC=96=E7=A0=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86-=E4=B8=8B=E6=8B=89=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=85=88=E5=90=8E=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue index f0574787..7fefc582 100644 --- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue +++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue @@ -44,6 +44,7 @@ clearable filterable style="width: 240px" + :disabled="!queryParams.itemId" @change="selectDevice" > { this.typeList = response.data }) @@ -645,6 +649,7 @@ export default { //选择设备类型 selectDevice(id) { console.log(id) + this.queryParams.typeId = '' getListByMaType({ typeId: id }).then((response) => { this.modelList = response.data }) From 9803534ef50c989a31ad502a2b2ddc7b450b7d9e Mon Sep 17 00:00:00 2001 From: 15856 <15856818120@163.com> Date: Tue, 18 Jun 2024 10:11:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 51531ec2..90b19c57 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -483,7 +483,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName, bpl.lot_id as proId,bpl.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime, + lai.lease_person as leasePerson, lai.phone as leasePhone, su.user_name as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime, case when d.id = '31' then lai.company_audit_remark when d.id = '32' then lai.dept_audit_remark when d.id = '33' then lai.direct_audit_remark @@ -496,7 +496,7 @@ tt.create_time as createTimes, tt.update_time as updateTimes FROM tm_task tt - LEFT JOIN sys_user su ON tt.create_by = su.user_name + LEFT JOIN sys_user su ON tt.create_by = su.user_id LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id