修复bug

master
sunzehua 8 months ago
parent f4060967a6
commit 5e604efdbe

@ -1,8 +1,8 @@
NODE_ENV=development NODE_ENV=development
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'customer'
# VUE_APP_TYPE = 'hechuan' VUE_APP_TYPE = 'hechuan'
VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_TYPE = 'gangjie' # VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
@ -11,8 +11,8 @@ VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试 # 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100 VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100 VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试 # 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -26,8 +26,8 @@ VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/ # VUE_APP_SOCKET_BASE_URL=http://192.168.0.80:7373/
# 港捷 # 港捷
VUE_APP_API_BASE_URL=http://118.190.144.189:5001 # VUE_APP_API_BASE_URL=http://118.190.144.189:5001
VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 # VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# 运营端正式 # 运营端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6002 # VUE_APP_API_BASE_URL=http://118.190.144.189:6002

@ -7,9 +7,9 @@ import { axios } from '@/utils/request'
*/ */
export function DJYTenantParamGet(parameter) { export function DJYTenantParamGet(parameter) {
return axios({ return axios({
url: '/DJYTenantParam/list', url: '/DJYTenantParam/page',
method: 'get', method: 'post',
params: parameter data: parameter
}) })
} }
@ -58,9 +58,9 @@ export function DJYTenantParamDelete(parameter) {
*/ */
export function DJYTenantParamGetParamValue(parameter) { export function DJYTenantParamGetParamValue(parameter) {
return axios({ return axios({
url: '/DJYTenantParam/getParamValue', url: '/DJYTenantParam/PageParamValue',
method: 'get', method: 'post',
params: parameter data: parameter
}) })
} }

@ -185,14 +185,10 @@ export default {
this.setdpTreeList() this.setdpTreeList()
this.setStatusDict() this.setStatusDict()
this.setProjectDict() this.setProjectDict()
if (!localStorage.getItem('booking_form_copy')) { this.setCopySet()
this.setCopySet()
}
if (process.env.VUE_APP_TYPE === 'gangjie') { if (process.env.VUE_APP_TYPE === 'gangjie') {
if (!localStorage.getItem('booking_form_yard')) {
this.setYardSet() this.setYardSet()
} }
}
} }
} }
} }

@ -191,7 +191,8 @@ import {
CheckCtnCover, CheckCtnCover,
GetCtnListRefsh, GetCtnListRefsh,
SaveServiceStatus, SaveServiceStatus,
CancelServiceStatus CancelServiceStatus,
GetBookingVGMResult
} from '@/api/modular/main/BookingLedger' } from '@/api/modular/main/BookingLedger'
import { mapActions, mapGetters } from 'vuex' import { mapActions, mapGetters } from 'vuex'
import rules from '../../BookingLedger/detail/rulesTest' import rules from '../../BookingLedger/detail/rulesTest'
@ -1266,6 +1267,28 @@ export default {
handleIframeunLoad() { handleIframeunLoad() {
console.log(22222) console.log(22222)
}, },
getVGM() {
GetBookingVGMResult({ id: this.$route.query.id }).then(res => {
if (res.data && res.data.length > 0) {
if (this.bookingDetails.ctnInputs && this.bookingDetails.ctnInputs.length > 0) {
this.bookingDetails.ctnInputs.forEach(item => {
item.vgm = false
res.data.forEach(ite => {
if (ite.cntrNo === item.cntrno) {
item.vgm = true
item.vgmWeight = ite.vgmWeight
item.isMissing = ite.isMissing
item.submissionDeadLine = ite.submissionDeadLine
item.vgmWeightUnit = ite.vgmWeightUnit
item.vgmWeightMethod = ite.vgmWeightMethod
}
})
})
this.$refs.goodsTable.init()
}
}
})
},
setDeatilsFun(res, overSet = false, refshFlag = false) { setDeatilsFun(res, overSet = false, refshFlag = false) {
if (!res.data.bookingEDIExt) { if (!res.data.bookingEDIExt) {
res.data.bookingEDIExt = bookingEDIExt res.data.bookingEDIExt = bookingEDIExt
@ -1339,6 +1362,7 @@ export default {
} }
const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt } const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } }) this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } })
this.getVGM()
this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails)) this.oldBookingDetails = JSON.parse(JSON.stringify(this.bookingDetails))
this.sendMessageFY() this.sendMessageFY()
if (this.$route.query.isCopy && this.$route.query.copyId) { if (this.$route.query.isCopy && this.$route.query.copyId) {

@ -4,24 +4,24 @@
<a-card :bordered="false" :bodyStyle="{ padding: '10px 20px' }"> <a-card :bordered="false" :bodyStyle="{ padding: '10px 20px' }">
<div class="from-line"> <div class="from-line">
<div class="left" v-if="!isLockBooking"> <div class="left" v-if="!isLockBooking">
<a-button class="btn btn-add" type="primary" @click="addboxLine"></a-button> <a-button class="btn btn-add" type="primary" @click="addboxLine"> <span style="margin-right: 5px;" class="iconfont icon-zhizhishu"></span>添加</a-button>
<a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '20px' }">删除</a-button> <a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '20px' }"><span style="margin-right: 5px;" class="iconfont icon-shanchu1"></span>删除</a-button>
<a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0"> <a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0">
<a-icon type="appstore" />多品名 <a-icon type="appstore" />多品名
</a-button> </a-button>
<a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading"> <a-button class="btn btn-import-station" type="primary" @click="importYarn" :loading="YarnLoading">
<a-icon type="import" />场站数据 <a-icon type="import" />场站数据
</a-button> </a-button>
<a-button class="btn btn-import-station" type="primary" @click="importsealno" :loading="sealnoLoading"> <a-button class="btn btn-import-station" type="primary" @click="importsealno" :loading="sealnoLoading">
<a-icon type="import" />入场站箱封号 <a-icon type="import" />箱封号
</a-button> </a-button>
<a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading"> <a-button class="btn btn-weight" type="primary" @click="importWeight" :loading="WeightLoading">
<a-icon type="import" />箱皮重 <a-icon type="import" />箱皮重
</a-button> </a-button>
<a-button class="btn btn-weight" type="primary" @click="arrowsWeight"> <a-button class="btn btn-weight" type="primary" @click="arrowsWeight">
<a-icon type="arrows-alt" />展开箱量 <a-icon type="arrows-alt" />展开箱量
</a-button> </a-button>
<a-button class="btn btn-add" type="primary" @click="handleRefsh"></a-button> <a-button class="btn btn-add" type="primary" @click="handleRefsh"><span style="margin-right: 5px;" class="iconfont icon-shuaxin"></span>刷新</a-button>
</div> </div>
<div <div
v-if="details.autoYardImport && !details.autoYardImport.isRead" v-if="details.autoYardImport && !details.autoYardImport.isRead"
@ -623,6 +623,23 @@ export default {
</span> </span>
) )
} }
},
{
field: 'vgm',
key: 'vgm',
title: 'VGM',
align: 'center',
width: 50,
edit: false,
renderBodyCell: ({ row, column, rowIndex }, h) => {
return (
<div>
<span title={'回执成功 ' + row.vgmWeight + ' ' + row.vgmWeightUnit + ' ' + row.vgmWeightMethod} v-show={row.vgm && !row.isMissing} style="color:green;cursor:pointer;font-weight:bold"><a-icon type="check" /></span>
<span title={'回执未成功' + row.submissionDeadLine } v-show={row.vgm && row.isMissing} style="color:red;cursor:pointer;font-weight:bold"><a-icon type="exclamation" /></span>
<span v-show={!row.vgm}>-</span>
</div>
)
}
} }
], ],
modelColumns: [ modelColumns: [
@ -1923,7 +1940,7 @@ export default {
if (ite.code !== 'KINDPKGS') { if (ite.code !== 'KINDPKGS') {
_data[ite.intoName] = item[ite.code] _data[ite.intoName] = item[ite.code]
} else { } else {
_data.kindpkgs = kindpkgsOld _data.kindpkgs = kindpkgsOld || item.KINDPKGS
} }
}) })
addTable.push(_data) addTable.push(_data)

@ -159,7 +159,7 @@
<a-button type="primary">导入</a-button> <a-button type="primary">导入</a-button>
</a-upload> </a-upload>
<a-button type="danger">作废</a-button> <a-button type="danger">作废</a-button>
<a-button type="primary" @click="handleSendAll"></a-button> <!-- <a-button type="primary" @click="handleSendAll"></a-button> -->
</div> </div>
<div> <div>
<a-button type="primary" @click="FnGetData"></a-button> <a-button type="primary" @click="FnGetData"></a-button>

@ -141,9 +141,9 @@ export default {
methods: { methods: {
FnDJYTenantParamGet() { FnDJYTenantParamGet() {
DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
this.TypeData = res.data this.TypeData = res.data.items
let data = [] let data = []
res.data.forEach(item => { res.data.items.forEach(item => {
if (data.length) { if (data.length) {
let type2 = false let type2 = false
data.forEach((item2, index2) => { data.forEach((item2, index2) => {

@ -31,15 +31,6 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="租户参数类别" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-form-item label="租户参数类别" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-select
placeholder="请选择租户参数类别"
v-decorator="['paraCode', { rules: [{ required: true, message: '请选择租户参数类别!' }] }]"
@change="FnChangeTypeCode"
>
<a-select-option v-for="item in TypeData" :key="item.id" :value="item.paraCode">
{{ item.paraName }}
</a-select-option>
</a-select> -->
<a-select <a-select
placeholder="请选择租户参数类别" placeholder="请选择租户参数类别"
v-decorator="['paraCode', { rules: [{ required: true, message: '请选择租户参数类别!' }] }]" v-decorator="['paraCode', { rules: [{ required: true, message: '请选择租户参数类别!' }] }]"
@ -59,22 +50,24 @@
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<a-form-item label="租户参数名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback disabled> <a-form-item label="租户参数名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback disabled>
<a-input <a-spin :spinning="ItemCodeLoad">
placeholder="请输入租户参数名称" <a-input
v-decorator="['itemCode', { rules: [{ required: true, message: '请输入租户参数名称!' }] }]" placeholder="请输入租户参数名称"
:disabled="ItemCodeDisabled" v-decorator="['itemCode', { rules: [{ required: true, message: '请输入租户参数名称!' }] }]"
v-if="ItemData.length == 0" :disabled="ItemCodeDisabled"
/> v-if="ItemData.length == 0"
<a-select />
placeholder="请选择租户参数名称" <a-select
v-decorator="['itemCode', { rules: [{ required: true, message: '请选择租户参数名称!' }] }]" placeholder="请选择租户参数名称"
:disabled="ItemCodeDisabled" v-decorator="['itemCode', { rules: [{ required: true, message: '请选择租户参数名称!' }] }]"
v-else :disabled="ItemCodeDisabled"
> v-else
<a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode"> >
{{ item.itemName }} <a-select-option v-for="item in ItemData" :key="item.id" :value="item.itemCode">
</a-select-option> {{ item.itemName }}
</a-select> </a-select-option>
</a-select>
</a-spin>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -123,6 +116,7 @@ export default {
}, },
typeData: [], typeData: [],
visible: false, visible: false,
ItemCodeLoad:false,
confirmLoading: false, confirmLoading: false,
form: this.$form.createForm(this), form: this.$form.createForm(this),
data: {}, data: {},
@ -134,6 +128,7 @@ export default {
}, },
mounted() { mounted() {
this.YWData = this.$options.filters['dictData']('tenant_param_group') this.YWData = this.$options.filters['dictData']('tenant_param_group')
this.FnDJYTenantParamGet()
SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => { SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
this.TenantData = res.data.rows this.TenantData = res.data.rows
}) })
@ -141,9 +136,9 @@ export default {
methods: { methods: {
FnDJYTenantParamGet() { FnDJYTenantParamGet() {
DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
this.TypeData = res.data this.TypeData = res.data.items
let data = [] const data = []
res.data.forEach(item => { res.data.items.forEach(item => {
if (data.length) { if (data.length) {
let type2 = false let type2 = false
data.forEach((item2, index2) => { data.forEach((item2, index2) => {
@ -177,8 +172,10 @@ export default {
}) })
if (e) { if (e) {
this.ItemCodeDisabled = false this.ItemCodeDisabled = false
this.ItemCodeLoad = true
DJYTenantParamGetParamItem({ paraCode: e }).then(res => { DJYTenantParamGetParamItem({ paraCode: e }).then(res => {
this.ItemData = res.data this.ItemData = res.data
this.ItemCodeLoad = false
}) })
} }
}, },
@ -191,7 +188,6 @@ export default {
}, },
// //
edit(record) { edit(record) {
this.FnDJYTenantParamGet()
console.log(record) console.log(record)
this.FnChangeTypeCode(record.paraCode) this.FnChangeTypeCode(record.paraCode)
this.data = record this.data = record

@ -10,14 +10,9 @@
<a-row :gutter="48"> <a-row :gutter="48">
<a-col :md="18"> <a-col :md="18">
<a-row :gutter="48"> <a-row :gutter="48">
<!-- <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
<a-form-item :label="item.title">
<a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
</a-form-item>
</a-col> -->
<a-col :md="8" :sm="24"> <a-col :md="8" :sm="24">
<a-form-item label="名称"> <a-form-item label="名称">
<a-input v-model="queryParam.ParaName" allow-clear placeholder="请输入名称" /> <a-input v-model="queryParam.paraName" allow-clear placeholder="请输入名称" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="8" :sm="24"> <a-col :md="8" :sm="24">
@ -35,10 +30,6 @@
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" @click="FnGetData"></a-button> <a-button type="primary" @click="FnGetData"></a-button>
<a-button style="margin-left: 8px" @click="init"></a-button> <a-button style="margin-left: 8px" @click="init"></a-button>
<!-- <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '收起' : '展开' }}
<a-icon :type="advanced ? 'up' : 'down'" />
</a> -->
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@ -92,15 +83,15 @@
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<!-- <vxe-pager <vxe-pager
:loading="loading" :loading="loading"
:current-page="queryParam.currentPage" :current-page="queryParam.pageNo"
:page-size="queryParam.pageSize" :page-size="queryParam.pageSize"
:total="queryParam.totalResult" :total="queryParam.totalResult"
:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']" :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
@page-change="handlePageChange" @page-change="handlePageChange"
> >
</vxe-pager> --> </vxe-pager>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
<editItemForm ref="editItemForm" @ok="handleOk" /> <editItemForm ref="editItemForm" @ok="handleOk" />
@ -129,9 +120,8 @@ export default {
setVisible: false, setVisible: false,
setVisible1: false, setVisible1: false,
queryParam: { queryParam: {
currentPage: 1, pageNo: 1,
pageSize: 10, pageSize: 10
totalResult: 1
}, },
ColumnsQuery: [], ColumnsQuery: [],
columns: [ columns: [
@ -167,12 +157,17 @@ export default {
}, },
created() {}, created() {},
watch: { watch: {
$route() { '$route.query': {
this.init() immediate: true,
handler(nval, oval) {
if (this.$route.name === 'tenant_param') {
this.init()
}
}
} }
}, },
mounted() { mounted() {
this.init() // this.init()
}, },
methods: { methods: {
FnTurnD(data) { FnTurnD(data) {
@ -201,11 +196,11 @@ export default {
FnGetData() { FnGetData() {
this.loading = true this.loading = true
DJYTenantParamGet(this.queryParam).then(res => { DJYTenantParamGet(this.queryParam).then(res => {
this.loadData = res.data this.loadData = res.data.items
this.loading = false this.loading = false
this.queryParam.currentPage = res.data.pageNo this.queryParam.currentPage = res.data.pageIndex
this.queryParam.pageSize = res.data.pageSize this.queryParam.pageSize = res.data.pageSize
this.queryParam.totalResult = res.data.totalRows this.queryParam.totalResult = res.data.totalCount
}) })
}, },
/** /**

@ -18,12 +18,6 @@
v-show="item.dataIndex != 'itemCode' && item.dataIndex != 'remark'" v-show="item.dataIndex != 'itemCode' && item.dataIndex != 'remark'"
> >
<a-form-item :label="item.title"> <a-form-item :label="item.title">
<!-- <a-input
v-model="queryParam[item.dataIndex]"
allow-clear
:placeholder="`请输入${item.title}`"
v-if="item.title == '租户'"
/> -->
<a-select <a-select
show-search show-search
placeholder="请选择租户" placeholder="请选择租户"
@ -33,7 +27,7 @@
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null"
@search="tenantIdSearch" @search="tenantIdSearch"
v-model="queryParam[item.dataIndex]" v-model="queryParam.tenantId"
allow-clear allow-clear
v-if="item.title == '租户'" v-if="item.title == '租户'"
:style="{ width: '100%' }" :style="{ width: '100%' }"
@ -44,14 +38,13 @@
</a-select> </a-select>
<a-select <a-select
placeholder="请选择租户参数类别" placeholder="请选择租户参数类别"
v-model="queryParam[item.dataIndex]" v-model="queryParam.paraCode"
v-else-if="item.title == '租户参数类别'" v-else-if="item.title == '租户参数类别'"
allow-clear allow-clear
> >
<a-select-opt-group <a-select-opt-group
v-for="(item, index) in WTypeData" v-for="(item, index) in WTypeData"
:key="`W${index}`" :key="`W${index}`"
:label="FnTypeD(item[0].type)"
> >
<a-select-option v-for="item2 in item" :key="item2.id" :value="item2.paraCode"> <a-select-option v-for="item2 in item" :key="item2.id" :value="item2.paraCode">
{{ item2.paraName }} {{ item2.paraName }}
@ -72,10 +65,6 @@
<span class="table-page-search-submitButtons"> <span class="table-page-search-submitButtons">
<a-button type="primary" @click="FnGetData"></a-button> <a-button type="primary" @click="FnGetData"></a-button>
<a-button style="margin-left: 8px" @click="init"></a-button> <a-button style="margin-left: 8px" @click="init"></a-button>
<!-- <a @click="toggleAdvanced" style="margin-left: 8px">
{{ advanced ? '收起' : '展开' }}
<a-icon :type="advanced ? 'up' : 'down'" />
</a> -->
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
@ -99,13 +88,7 @@
:min-width="item.width" :min-width="item.width"
:title="item.title" :title="item.title"
:align="item.align" :align="item.align"
v-if="item.title != '租户'"
> >
<template #default="{ row }">
<span v-if="item.title == '租户参数类别'">{{ FnTurnD(row.paraCode) }}</span>
<span v-if="item.title == '租户参数名称'">{{ FnRTypeCode(row) }}</span>
<span v-else>{{ row[item.dataIndex] }}</span>
</template>
</vxe-column> </vxe-column>
<vxe-column title="操作" fixed="right" width="200" align="center"> <vxe-column title="操作" fixed="right" width="200" align="center">
<template #default="{ row }"> <template #default="{ row }">
@ -123,20 +106,19 @@
" "
> >
<a-icon type="delete" :style="{ color: '#13c2c2' }" /> <a-icon type="delete" :style="{ color: '#13c2c2' }" />
<!-- <vxe-button type="text">删除</vxe-button> -->
</a-popconfirm> </a-popconfirm>
</template> </template>
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
<!-- <vxe-pager <vxe-pager
:loading="loading" :loading="loading"
:current-page="queryParam.currentPage" :current-page="queryParam.pageNo"
:page-size="queryParam.pageSize" :page-size="queryParam.pageSize"
:total="queryParam.totalResult" :total="queryParam.totalResult"
:layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']" :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
@page-change="handlePageChange" @page-change="handlePageChange"
> >
</vxe-pager> --> </vxe-pager>
<add-form ref="addForm" @ok="handleOk" /> <add-form ref="addForm" @ok="handleOk" />
<edit-form ref="editForm" @ok="handleOk" /> <edit-form ref="editForm" @ok="handleOk" />
</a-card> </a-card>
@ -169,9 +151,8 @@ export default {
setVisible: false, setVisible: false,
setVisible1: false, setVisible1: false,
queryParam: { queryParam: {
currentPage: 1, pageNo: 1,
pageSize: 10, pageSize: 10
totalResult: 1
}, },
ColumnsQuery: [], ColumnsQuery: [],
columns: [ columns: [
@ -179,13 +160,13 @@ export default {
title: '租户', title: '租户',
align: 'center', align: 'center',
width: '80', width: '80',
dataIndex: 'tenantId' dataIndex: 'tenantName'
}, },
{ {
title: '租户参数类别', title: '租户参数类别',
align: 'center', align: 'center',
width: '100', width: '100',
dataIndex: 'paraCode' dataIndex: 'paraName'
}, },
{ {
title: '租户参数名称', title: '租户参数名称',
@ -193,7 +174,6 @@ export default {
width: '80', width: '80',
dataIndex: 'itemCode' dataIndex: 'itemCode'
}, },
// itemCode
{ {
title: '备注', title: '备注',
align: 'center', align: 'center',
@ -209,32 +189,37 @@ export default {
} }
}, },
watch: { watch: {
$route() { '$route.query': {
this.init() immediate: true,
handler(nval, oval) {
if (this.$route.name === 'tenant_param_item') {
this.init()
}
}
} }
}, },
created() {}, created() {},
mounted() { mounted() {
this.init() // this.init()
}, },
methods: { methods: {
FnRTypeCode(e) { FnRTypeCode(e) {
let RData = '' // let RData = ''
this.TypeData.forEach(item => { // this.TypeData.forEach(item => {
if (item.paraCode == e.paraCode) { // if (item.paraCode == e.paraCode) {
if (item.itemCodeData.length) { // if (item.itemCodeData.length) {
item.itemCodeData.forEach(item2 => { // item.itemCodeData.forEach(item2 => {
if (item2.itemCode == e.itemCode) { // if (item2.itemCode == e.itemCode) {
console.log(item2, 'item2') // console.log(item2, 'item2')
RData = item2.itemName // RData = item2.itemName
} // }
}) // })
} else { // } else {
RData = e.itemCode // RData = e.itemCode
} // }
} // }
}) // })
return RData // return RData
}, },
tenantIdSearch(value) { tenantIdSearch(value) {
if (value) { if (value) {
@ -244,22 +229,22 @@ export default {
} }
}, },
FnTurnD(data) { FnTurnD(data) {
let Rdata = '' // let Rdata = ''
this.TypeData.forEach(item => { // this.TypeData.forEach(item => {
if (item.paraCode == data) { // if (item.paraCode == data) {
Rdata = item.paraName // Rdata = item.paraName
} // }
}) // })
return Rdata // return Rdata
}, },
FnTypeD(data) { FnTypeD(data) {
let Rdata = '' // let Rdata = ''
this.YWData.forEach(item => { // this.YWData.forEach(item => {
if (item.code == data) { // if (item.code == data) {
Rdata = item.name // Rdata = item.name
} // }
}) // })
return Rdata // return Rdata
}, },
toggleAdvanced() { toggleAdvanced() {
this.advanced = !this.advanced this.advanced = !this.advanced
@ -269,10 +254,13 @@ export default {
this.ColumnsQuery = this.columns this.ColumnsQuery = this.columns
this.FnGetData() this.FnGetData()
this.YWData = this.$options.filters['dictData']('tenant_param_group') this.YWData = this.$options.filters['dictData']('tenant_param_group')
SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
this.TenantData = res.data.rows
})
DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => { DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
this.TypeData = res.data this.TypeData = res.data.items
let data = [] let data = []
res.data.forEach(item => { res.data.items.forEach(item => {
if (data.length) { if (data.length) {
let type2 = false let type2 = false
data.forEach((item2, index2) => { data.forEach((item2, index2) => {
@ -289,14 +277,6 @@ export default {
} }
}) })
this.WTypeData = data this.WTypeData = data
this.TypeData.forEach(item => {
DJYTenantParamGetParamItem({ paraCode: item.paraCode }).then(res => {
item.itemCodeData = res.data
})
})
})
SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
this.TenantData = res.data.rows
}) })
}, },
handlePageChange({ currentPage, pageSize }) { handlePageChange({ currentPage, pageSize }) {
@ -307,15 +287,12 @@ export default {
FnGetData() { FnGetData() {
this.loading = true this.loading = true
let data = { ...this.queryParam } let data = { ...this.queryParam }
if (!data.tenantId) {
data.tenantId = 0
}
DJYTenantParamGetParamValue(data).then(res => { DJYTenantParamGetParamValue(data).then(res => {
this.loadData = res.data this.loadData = res.data.items
this.loading = false this.loading = false
this.queryParam.currentPage = res.data.pageNo this.queryParam.pageNo = res.data.pageIndex
this.queryParam.pageSize = res.data.pageSize this.queryParam.pageSize = res.data.pageSize
this.queryParam.totalResult = res.data.totalRows this.queryParam.totalResult = res.data.totalCount
}) })
}, },
/** /**

@ -160,7 +160,7 @@
@sort-change="tableSortChange" @sort-change="tableSortChange"
@resizable-change="resizableChange" @resizable-change="resizableChange"
@checkbox-change="checkboxChangeEvent" @checkbox-change="checkboxChangeEvent"
height="600px" height="650px"
empty-text="没有更多数据了!"> empty-text="没有更多数据了!">
<template #caozuo="{ row }"> <template #caozuo="{ row }">
<a-icon @click="handleEdit(row.id)" type="form" style="cursor: pointer;" :style="{ color: '#13c2c2' }" /> <a-icon @click="handleEdit(row.id)" type="form" style="cursor: pointer;" :style="{ color: '#13c2c2' }" />
@ -581,6 +581,17 @@ export default {
this.FnGetData() this.FnGetData()
}, 200); }, 200);
}, },
editPageSizeSave(pageSize) {
const data = {
pageSize: pageSize
}
DjyUserConfigAdd({
type: 'vesselinfo_page',
configJson: JSON.stringify(data)
}).then(res => {
console.log('页码设置成功')
})
},
handlePageChange({ currentPage, pageSize }) { handlePageChange({ currentPage, pageSize }) {
if (this.queryParam.pageSize !== pageSize) { if (this.queryParam.pageSize !== pageSize) {
this.editPageSizeSave(pageSize) this.editPageSizeSave(pageSize)
@ -799,7 +810,9 @@ export default {
/deep/ .ant-form-item { /deep/ .ant-form-item {
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
/deep/ .ant-card-body{
padding-bottom: 0px !important;
}
.table-operator { .table-operator {
margin-bottom: 18px; margin-bottom: 18px;
} }

Loading…
Cancel
Save