修改

jinlin

2026-02-27 884d1457cebbda20ad2539550062c408a58709be

修改

 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){

 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();
}

 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();
    }
}

 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>

 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
      }
    },


 web/src/components/repairer-selector/src/repairer-selector.vue

@@ -22,7 +22,7 @@
      clearable: {
        type: Boolean,
        default: false
      },
      }
    },
    data() {
      return {

 web/src/components/zt-boat-tree/index.js

File was deleted

 web/src/components/zt-boat-tree/src/zt-boat-tree.vue

File was deleted

 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'

 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>

 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>

 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
        }