bonus
/
nw-cqdevicemgt-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
hongchao 2025-05-15 12:24:51 +08:00
parent ab0c96fdc8
commit 63e6f6340b
14 changed files with 75 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/base/project/index.vue
View File

@ -97,6 +97,11 @@
prop="deptName" prop="deptName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="费用指标(元)" align="center" show-overflow-tooltip>
<template slot-scope="{ row }">
{{ formatCurrency(row.costIndicators || '') }}
</template>
</el-table-column>
<el-table-column <el-table-column
label="联系人" label="联系人"
align="center" align="center"
@ -201,6 +206,9 @@
placeholder="请选择所属上级" placeholder="请选择所属上级"
@select="select" @select="select"
/> />
</el-form-item>
<el-form-item label="费用指标(元)" prop="costIndicators">
<el-input v-model="form.costIndicators" placeholder="请输入费用指标" />
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="linkMan"> <el-form-item label="联系人" prop="linkMan">
<el-input <el-input
@ -313,6 +321,12 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
costIndicators: [
{
pattern: /^(?:[1-9][0-9]{0,7}|100000000)$/,
message: '请输入大于0且不能以0开头并小于一亿的正整数',
},
],
}, },
} }
}, },
@ -322,6 +336,10 @@ export default {
this.getList() this.getList()
}, },
methods: { methods: {
formatCurrency(amount) {
// 将数字转为字符串，并使用正则表达式添加逗号
return amount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
},
//获取工程类型 //获取工程类型
getType() { getType() {
unitTypeList({ id: '5' }).then((response) => { unitTypeList({ id: '5' }).then((response) => {
@ -369,6 +387,7 @@ export default {
dictType: undefined, dictType: undefined,
status: '0', status: '0',
remark: undefined, remark: undefined,
costIndicators: '',
} }
this.resetForm('form') this.resetForm('form')
}, },

32
src/views/base/section/index.vue
View File

@ -47,11 +47,11 @@
/> />
<el-table-column label="标段工程名称" align="center" prop="lotName" show-overflow-tooltip /> <el-table-column label="标段工程名称" align="center" prop="lotName" show-overflow-tooltip />
<el-table-column label="工程类型" align="center" prop="typeName" show-overflow-tooltip /> <el-table-column label="工程类型" align="center" prop="typeName" show-overflow-tooltip />
<el-table-column label="费用指标(元)" align="center" show-overflow-tooltip> <!-- <el-table-column label="费用指标(元)" align="center" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ formatCurrency(row.costIndicators || '') }} {{ formatCurrency(row.costIndicators || '') }}
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column label="所属工程" align="center" prop="proName" show-overflow-tooltip /> --> <!-- <el-table-column label="所属工程" align="center" prop="proName" show-overflow-tooltip /> -->
<el-table-column label="所属上级" align="center" prop="deptName" show-overflow-tooltip /> <el-table-column label="所属上级" align="center" prop="deptName" show-overflow-tooltip />
<el-table-column label="联系人" align="center" prop="linkMan" show-overflow-tooltip /> <el-table-column label="联系人" align="center" prop="linkMan" show-overflow-tooltip />
@ -144,9 +144,9 @@
@select="select" @select="select"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用指标(元)" prop="costIndicators"> <!-- <el-form-item label="费用指标(元)" prop="costIndicators">
<el-input v-model="form.costIndicators" placeholder="请输入费用指标" /> <el-input v-model="form.costIndicators" placeholder="请输入费用指标" />
</el-form-item> </el-form-item> -->
<el-form-item label="联系人" prop="linkMan"> <el-form-item label="联系人" prop="linkMan">
<el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" /> <el-input v-model="form.linkMan" placeholder="请输入联系人" maxlength="20" />
</el-form-item> </el-form-item>
@ -292,17 +292,17 @@ export default {
trigger: 'blur', trigger: 'blur',
}, },
], ],
costIndicators: [ // costIndicators: [
// { // // {
// required: true, // // required: true,
// message: '费用指标不能为空', // // message: '费用指标不能为空',
// trigger: 'blur', // // trigger: 'blur',
// }, // // },
{ // {
pattern: /^(?:[1-9][0-9]{0,7}|100000000)$/, // pattern: /^(?:[1-9][0-9]{0,7}|100000000)$/,
message: '请输入大于0且不能以0开头并小于一亿的正整数', // message: '请输入大于0且不能以0开头并小于一亿的正整数',
}, // },
], // ],
// proId: [ // proId: [
// { required: true, message: "所属工程项目", trigger: "blur" } // { required: true, message: "所属工程项目", trigger: "blur" }
// ] // ]
@ -412,7 +412,7 @@ export default {
dictType: undefined, dictType: undefined,
status: '0', status: '0',
remark: undefined, remark: undefined,
costIndicators: '', // costIndicators: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
address: '', address: '',

15
src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -142,7 +142,7 @@
align="center" align="center"
label="序号" label="序号"
type="index" type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
/> />
<el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
@ -642,6 +642,7 @@ export default {
return date.getTime() > today.getTime(); // 禁止选择今天之后的日期 return date.getTime() > today.getTime(); // 禁止选择今天之后的日期
}, },
}, },
timeTemp: '', // 存储时间
showSelect: true, showSelect: true,
rowTemp: {}, // 临时存储行数据 rowTemp: {}, // 临时存储行数据
queryRules: { queryRules: {
@ -772,6 +773,7 @@ export default {
this.dialogQuery.id = row.id this.dialogQuery.id = row.id
this.leaseType = row.leaseType this.leaseType = row.leaseType
this.resetDialogQuery() this.resetDialogQuery()
this.timeTemp = row.createTimes
// this.getDialogList() // this.getDialogList()
}, },
@ -781,6 +783,11 @@ export default {
this.openCode = true this.openCode = true
this.resetForm('codeOutForm') this.resetForm('codeOutForm')
this.resetForm('outQuery') this.resetForm('outQuery')
// 将 this.timeTemp 转换为 Date 对象
const date = new Date(this.timeTemp);
// 提取年、月、日并格式化为 YYYY-MM-DD 格式
const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
this.codeOutForm.createTime = formattedDate;
this.outNum = row.outNum this.outNum = row.outNum
this.outQuery.typeId = row.typeId this.outQuery.typeId = row.typeId
this.outObj = row this.outObj = row
@ -793,6 +800,12 @@ export default {
this.openNum = true this.openNum = true
this.resetForm('codeOutForm') this.resetForm('codeOutForm')
this.resetForm('numOutForm') this.resetForm('numOutForm')
console.log("xxxxxxxxxx",this.timeTemp)
// 将 this.timeTemp 转换为 Date 对象
const date = new Date(this.timeTemp);
// 提取年、月、日并格式化为 YYYY-MM-DD 格式
const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
this.numOutForm.createTime = formattedDate
// console.log(row) // console.log(row)
let obj = {} let obj = {}
this.$set(obj, 'taskId', row.taskId) this.$set(obj, 'taskId', row.taskId)

4
src/views/claimAndreturn/return/receive/component/addReturn1.vue
View File

@ -1136,7 +1136,7 @@ export default {
// preNum: 1, // preNum: 1,
// num: deviceTypeList[0].data.num, // num: deviceTypeList[0].data.num,
// useNum: deviceTypeList[0].data.num, // useNum: deviceTypeList[0].data.num,
typeName: deviceTypeList[0].data.typeName, typeName: deviceTypeList[0].parent.data.typeName,
} }
// if (val.length > 0) { // if (val.length > 0) {
// const items = val.map((e) => { // const items = val.map((e) => {
@ -1185,6 +1185,7 @@ export default {
console.log("yyyyyyyyyyy",val) console.log("yyyyyyyyyyy",val)
const res = await getFourMaTypeListTwo({ id: val, agreementId: this.queryParams.agreementId }) const res = await getFourMaTypeListTwo({ id: val, agreementId: this.queryParams.agreementId })
const selectType = res.data const selectType = res.data
console.log("vvvvvvvvvvvv",selectType,this.selectParams)
this.selectParams.typeId = selectType.id this.selectParams.typeId = selectType.id
this.selectParams.typeCode = selectType.name this.selectParams.typeCode = selectType.name
this.selectParams.unitNames = selectType.unit this.selectParams.unitNames = selectType.unit
@ -1196,6 +1197,7 @@ export default {
this.selectParams.standardIds = [] this.selectParams.standardIds = []
this.selectParams.passMaCodeDtoList = [] this.selectParams.passMaCodeDtoList = []
this.selectParams.manageType = selectType.manageType this.selectParams.manageType = selectType.manageType
this.selectParams.maintenanceNum = 0
console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams) console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams)
// 判断是否重复 // 判断是否重复
const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id) const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id)

1
src/views/cost/csotSettlement/component/finishAndDetails.vue
View File

@ -93,6 +93,7 @@
size="mini" size="mini"
type="primary" type="primary"
@click="submitComSett" @click="submitComSett"
v-hasPermi="['cost:settlement:update']"
v-if="currRowInfo[0].isSlt == 0 || currRowInfo[0].isSlt == 2" v-if="currRowInfo[0].isSlt == 0 || currRowInfo[0].isSlt == 2"
>确认完工结算</el-button >确认完工结算</el-button
> >

2
src/views/cost/csotSettlement/component/finishTable.vue
View File

@ -39,6 +39,7 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
v-hasPermi="['cost:settlement:update']"
v-if=" v-if="
isSettle == 0 && isSettle == 0 &&
(isCostBear || (isRepair && currRowInfo.isSlt == 0)) && (isCostBear || (isRepair && currRowInfo.isSlt == 0)) &&
@ -50,6 +51,7 @@
<el-button <el-button
size="mini" size="mini"
type="success" type="success"
v-hasPermi="['cost:settlement:update']"
v-if="!isEdit && isCostBear && isSettle == 0" v-if="!isEdit && isCostBear && isSettle == 0"
@click="submitSell" @click="submitSell"
>确认结算</el-button >确认结算</el-button

2
src/views/stquery/backRecord.vue
View File

@ -125,7 +125,7 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

2
src/views/stquery/deviceFixQuery.vue
View File

@ -86,7 +86,7 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

2
src/views/stquery/deviceInStoreQuery.vue
View File

@ -84,7 +84,7 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

2
src/views/stquery/deviceScrapQuery.vue
View File

@ -128,7 +128,7 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

2
src/views/stquery/deviceStatusRecord.vue
View File

@ -113,7 +113,7 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> --> <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

2
src/views/stquery/leaseRecord.vue
View File

@ -115,7 +115,7 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"

1
src/views/stquery/outboundPreview/components/outbound-table.vue
View File

@ -22,6 +22,7 @@
prop="lotName" prop="lotName"
label="工程名称" label="工程名称"
show-overflow-tooltip show-overflow-tooltip
width="200"
/> />
<el-table-column <el-table-column
align="center" align="center"

16
src/views/stquery/projUsingRecord.vue
View File

@ -111,6 +111,14 @@
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -126,7 +134,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> --> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
<el-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList" border>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column <!-- <el-table-column
label="序号" label="序号"
@ -153,6 +161,7 @@
align="center" align="center"
prop="agreementCode" prop="agreementCode"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="200"
/> />
<el-table-column <el-table-column
label="往来单位" label="往来单位"
@ -165,6 +174,7 @@
align="center" align="center"
prop="proName" prop="proName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="230"
/> />
<el-table-column <el-table-column
label="机具名称" label="机具名称"
@ -347,11 +357,11 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
'material/backRecord/export', 'material/projUsingRecord/export',
{ {
...this.queryParams, ...this.queryParams,
}, },
`综合查询_退料记录_${new Date().getTime()}.xlsx`, `综合查询_工程机具使用查询记录_${new Date().getTime()}.xlsx`,
) )
}, },