From 884d1457cebbda20ad2539550062c408a58709be Mon Sep 17 00:00:00 2001
From: jinlin <721705285@qq.com>
Date: 星期五, 27 二月 2026 16:19:35 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/dao/FtCategoryDao.java | 1
/dev/null | 143 -----------------------------------
web/src/components/repairer-selector/src/repairer-selector.vue | 2
web/src/main.js | 6 -
web/src/views/modules/ftDetail/ftDetail-Add.vue | 2
web/src/views/modules/accountBlance/accountBalance.vue | 22 ++--
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/service/FtCategoryService.java | 3
web/src/components/major-selector/src/major-selector.vue | 12 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/controller/FtCategoryController.java | 6 +
web/src/views/modules/ftCategory/ftCategorySelect.vue | 7 -
modules/mainPart/src/main/resources/mapper/ftCategory/FtCategoryDao.xml | 14 +++
11 files changed, 46 insertions(+), 172 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/controller/FtCategoryController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/controller/FtCategoryController.java
index eaa6800..7805c4c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/controller/FtCategoryController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/controller/FtCategoryController.java
@@ -52,6 +52,12 @@
return PageResult.ok(ftCategoryService.page(queryFilter));
}
+ @GetMapping("getList")
+ public Result<List<FtCategory>> getList(){
+ List<FtCategory> data = ftCategoryService.getList();
+ return Result.ok(data);
+ }
+
@GetMapping("{id}")
@ApiOperation("淇℃伅")
public Result<FtCategory> get(@PathVariable("id") Long id){
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/dao/FtCategoryDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/dao/FtCategoryDao.java
index f255475..335dff8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/dao/FtCategoryDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/dao/FtCategoryDao.java
@@ -20,4 +20,5 @@
List<FtCategory> getList(Map<String, Object> params);
+ List<FtCategory> getList2();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/service/FtCategoryService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/service/FtCategoryService.java
index 84da872..c8ea24f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/service/FtCategoryService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/ftCategory/service/FtCategoryService.java
@@ -39,4 +39,7 @@
super.deleteLogic(ids);
}
+ public List<FtCategory> getList() {
+ return baseDao.getList2();
+ }
}
diff --git a/modules/mainPart/src/main/resources/mapper/ftCategory/FtCategoryDao.xml b/modules/mainPart/src/main/resources/mapper/ftCategory/FtCategoryDao.xml
index a58c4c9..3272402 100644
--- a/modules/mainPart/src/main/resources/mapper/ftCategory/FtCategoryDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/ftCategory/FtCategoryDao.xml
@@ -17,4 +17,18 @@
</if>
</select>
+ <select id="getList2" resultType="com.zt.life.modules.mainPart.ftCategory.model.FtCategory">
+ select a.*
+ from ft_category a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
</mapper>
diff --git a/web/src/components/major-selector/src/major-selector.vue b/web/src/components/major-selector/src/major-selector.vue
index 56313ff..17f49bb 100644
--- a/web/src/components/major-selector/src/major-selector.vue
+++ b/web/src/components/major-selector/src/major-selector.vue
@@ -11,15 +11,15 @@
value: [String, Array],
modelId: {
type: String,
- default: ""
+ default: ''
},
shipId: {
type: String,
- default: ""
+ default: ''
},
projectId: {
type: String,
- default: ""
+ default: ''
},
multiple: {
type: Boolean,
@@ -37,12 +37,12 @@
},
data() {
return {
- url:'/sys/major/getList?modelId='+this.modelId+'&shipId='+this.shipId+'&projectId='+this.projectId,
+ url: '/sys/major/getList?modelId=' + this.modelId + '&shipId=' + this.shipId + '&projectId=' + this.projectId,
selectValue: this.value || ''
}
},
watch: {
- 'selectValue'(){
+ 'selectValue'() {
if (this.multiple) {
this.$emit('input', (this.selectValue || []).join(','))
} else {
@@ -53,7 +53,7 @@
this.selectValue = val
},
'projectId'() {
- this.url = '/sys/major/getList?modelId='+this.modelId+'&shipId='+this.shipId+'&projectId='+this.projectId
+ this.url = '/sys/major/getList?modelId=' + this.modelId + '&shipId=' + this.shipId + '&projectId=' + this.projectId
}
},
diff --git a/web/src/components/repairer-selector/src/repairer-selector.vue b/web/src/components/repairer-selector/src/repairer-selector.vue
index 7f20f44..cda0b86 100644
--- a/web/src/components/repairer-selector/src/repairer-selector.vue
+++ b/web/src/components/repairer-selector/src/repairer-selector.vue
@@ -22,7 +22,7 @@
clearable: {
type: Boolean,
default: false
- },
+ }
},
data() {
return {
diff --git a/web/src/components/zt-boat-tree/index.js b/web/src/components/zt-boat-tree/index.js
deleted file mode 100644
index f2b3341..0000000
--- a/web/src/components/zt-boat-tree/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import comp from './src/zt-boat-tree'
-
-comp.install = function (Vue) {
- Vue.component(comp.name, comp)
-}
-
-export default comp
diff --git a/web/src/components/zt-boat-tree/src/zt-boat-tree.vue b/web/src/components/zt-boat-tree/src/zt-boat-tree.vue
deleted file mode 100644
index 81717c4..0000000
--- a/web/src/components/zt-boat-tree/src/zt-boat-tree.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
- <div class="product-tree-container" v-if="showFlag" :style="'height:'+fullHeight+'px;'">
- <el-input
- placeholder="杈撳叆鍚嶇О杩涜杩囨护"
- style="width: 80%"
- v-model="filterText"
- size="small"
- clearable
- ></el-input>
- <el-divider></el-divider>
- <el-tree
- style="overflow: auto"
- v-if="productTree.length > 0"
- node-key="id"
- :props="defaultProps"
- :default-expanded-keys="expandedIds"
- :data="productTree"
- :load="loadNode"
- :render-content="renderContent"
- lazy
- :expand-on-click-node="false"
- :highlight-current="true"
- @node-click="handleNodeClick"
- :filter-node-method="filterNode"
- ref="tree"
- ></el-tree>
- </div>
-</template>
-<script>
- export default {
- name: 'ZtBoatTree',
- props: {
- expandLevel: {// 灞曠ず灞傜骇
- type: String,
- default: 'model'// 榛樿鍙睍寮�涓�灞�
- }
- },
- data() {
- return {
- isHasData:false,
- fullHeight: '',
- menuId: this.$store.state.sidebarMenuActiveName,
- filterText: '',
- productTree: [],
- expandedIds: [],
- showLevel: '', // 闇�瑕佸睍绀虹殑level
- busiLevels: [], // 鍏宠仈涓氬姟鐨�
- showFlag: true,
- defaultProps: {
- children: 'children',
- label: 'name',
- isLeaf: 'leaf'
- }
- }
- },
- watch: {
- filterText(val) {
- this.$refs.tree.filter(val)
- }
- },
- mounted() {
- this.getInfo()
- this.fullHeight = (document.documentElement.clientHeight - 180)
- window.onresize = () => {
- return (() => {
- this.fullHeight = (document.documentElement.clientHeight - 180)
- })()
- }
- },
- methods: {
- async getInfo() {
- // console.log(this.menuId, 'product-tree this.menuId')
- // console.log(this.$store.state.sidebarMenuActiveName, 'product-tree this.$store.state.sidebarMenuActiveName')
- // let arr = []
- // if (this.$store.state.product) {
- // arr = this.$store.state.product.menuConfigs.filter(config => config.menuId === this.menuId)
- // } else {
- // let res = await this.$http.get(`/sys/menuConfig/${this.menuId}`)
- // if (res.success && res.data.hasSystemTree) {
- // arr.push(res.data)
- // }
- // }
- this.showLevel = 'equipment' //menuConfig.showLevel
- this.getProductList()
- },
- async getProductList() {
- let that = this
- {
- let res = await that.$http.get('/ztProduct/getTreeNodes')
- if (res.success) {
- console.log(res.data,'res.data')
- that.productTree = res.data
- }
- }
- console.log(that.productTree, 'that.productTre')
- },
- renderContent(h, { node, data, store }) {
- // console.log(data,'data wenTe')
- if (data.hasNotData == 1) {
- return <span style="color:#d0c8c4">{node.label}</span>;
- } else {
- return <span>{node.label}</span>;
- }
- },
- async loadNode(node, resolve) {
- console.log(node.data,'node.data')
- let that = this
- if (node.level === 0) {
- return resolve(that.productTree)
- } else if (node.data) {
- if(node.data.leaf === false){
- let res = await that.$http.get(`/ztProduct/getTreeNodes?pid=${node.data.id}`)
- if(res.success){
- if(res.data.length>=0){
- return resolve((res.data || []))
- }
- }
- }
- } else {
- return resolve([])
- }
- },
- filterNode(value, data) {
- if (!value) return true
- return data.name.indexOf(value) !== -1
- },
- handleNodeClick(data) {
- // if (this.busiLevels.includes(data.level))
- {
- this.$emit('on-selected', data)
- }
- }
- }
- }
-</script>
-<style>
- /*.product-tree-container {*/
- /*max-height: 650px;*/
- /*}*/
- .hasData .el-tree-node__label{
- color:red;
- }
-</style>
diff --git a/web/src/main.js b/web/src/main.js
index 7c4bc16..ef0e73c 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -33,7 +33,6 @@
import MenuTreeSelector from './components/menu-tree-selector'
import SelectTree from './components/select-tree'
import MajorSelector from './components/major-selector'
-import ZtBoatTree from './components/zt-boat-tree'
import ColumnSelect from './components/column-select'
import ZtEquipmentConfig from './components/zt-equipment-config'
import ZtEquipmentSelect from './components/zt-equipment-select'
@@ -68,7 +67,6 @@
Vue.use(MenuTreeSelector)
Vue.use(SelectTree)
Vue.use(MajorSelector)
-Vue.use(ZtBoatTree)
Vue.use(ColumnSelect)
Vue.use(ZtEquipmentConfig)
Vue.use(ZtEquipmentSelect)
@@ -96,7 +94,7 @@
let minutes = ' '
let seconds = ' '
if (data != null) {
- const dateObject = new Date(data);
+ const dateObject = new Date(data)
year = dateObject.getFullYear()
months = (dateObject.getMonth() + 1).toString().padStart(2, '0')
days = dateObject.getDate()
@@ -104,7 +102,7 @@
minutes = (dateObject.getMinutes() + 1).toString().padStart(2, '0')
seconds = (dateObject.getSeconds() + 1).toString().padStart(2, '0')
}
- return format.replace('YYYY', year).replace('MM', months).replace('DD', days).replace('hh', hours).replace('mm', minutes).replace('ss', seconds);
+ return format.replace('YYYY', year).replace('MM', months).replace('DD', days).replace('hh', hours).replace('mm', minutes).replace('ss', seconds)
})
// 榛樿涓婚 娴呯増light 娣辩増hight
store.state.theme = Cookies.get('systemTheme') || 'light'
diff --git a/web/src/views/modules/accountBlance/accountBalance.vue b/web/src/views/modules/accountBlance/accountBalance.vue
index 633bec1..fa861cc 100644
--- a/web/src/views/modules/accountBlance/accountBalance.vue
+++ b/web/src/views/modules/accountBlance/accountBalance.vue
@@ -36,19 +36,19 @@
</template>
<script>
-import AccountBalanceAddOrUpdate from './accountBalance-AddOrUpdate.vue'
+ import AccountBalanceAddOrUpdate from './accountBalance-AddOrUpdate.vue'
-export default {
- data() {
- return {
- dataForm: {
- year: '',
- accountCode: '',
+ export default {
+ data() {
+ return {
+ dataForm: {
+ year: '',
+ accountCode: ''
+ }
}
+ },
+ components: {
+ AddOrUpdate: AccountBalanceAddOrUpdate
}
- },
- components: {
- AddOrUpdate: AccountBalanceAddOrUpdate
}
-}
</script>
diff --git a/web/src/views/modules/ftCategory/ftCategorySelect.vue b/web/src/views/modules/ftCategory/ftCategorySelect.vue
index f8906e3..f0a67de 100644
--- a/web/src/views/modules/ftCategory/ftCategorySelect.vue
+++ b/web/src/views/modules/ftCategory/ftCategorySelect.vue
@@ -1,13 +1,8 @@
<template>
- <zt-table-wraper query-url="/ftCategory/FtCategory/page" delete-url="/ftCategory/FtCategory" v-slot="{ table }">
+ <zt-table-wraper query-url="/ftCategory/FtCategory/getList" v-bind:paging='false' delete-url="/ftCategory/FtCategory" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ垎鎽婂悕鐩�" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <el-input v-model="dataForm.year" placeholder="璇疯緭鍏ュ勾浠�" clearable></el-input>
- </el-form-item>
- <el-form-item>
<zt-button type="query" @click="table.query()"/>
</el-form-item>
</el-form>
diff --git a/web/src/views/modules/ftDetail/ftDetail-Add.vue b/web/src/views/modules/ftDetail/ftDetail-Add.vue
index c620650..b5c3afc 100644
--- a/web/src/views/modules/ftDetail/ftDetail-Add.vue
+++ b/web/src/views/modules/ftDetail/ftDetail-Add.vue
@@ -71,8 +71,8 @@
return
}
if (numVal > balance) {
+ this.$message.error('鍒嗘憡璐圭敤涓嶈兘瓒呰繃绉戠洰浣欓')
row.ftExpense = balance
- this.$message.warning('鍒嗘憡璐圭敤涓嶈兘瓒呰繃绉戠洰浣欓')
} else {
row.ftExpense = numVal
}
--
Gitblit v1.9.1