Browse Source

BUG修改

master
叶佳兴 1 year ago
parent
commit
2bc0998768
  1. 677
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  2. 33
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

677
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -4,29 +4,17 @@
<Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
<TableHead <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
:HeadButttondata="HeadButttondata" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
@button-base-click="buttonBaseClick" :allSchemas="PurchasePlanMain.allSchemas" />
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasePlanMain.allSchemas"
/>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<Table <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total total: tableObject.total
}" }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
v-model:pageSize="tableObject.pageSize" v-model:sort="tableObject.sort">
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #number="{row}"> <template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '单据号', row.number)"> <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
@ -39,339 +27,398 @@
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<BasicForm <BasicForm ref="formRef" @success="getList" :rules="PurchasePlanMainRules"
ref="formRef" :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas"
@success="getList" :tableFormRules="PurchasePlanDetailRules" :tableData="tableData"
:rules="PurchasePlanMainRules" :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
:formAllSchemas="PurchasePlanMain.allSchemas" :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
:tableAllSchemas="PurchasePlanDetail.allSchemas" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
:tableFormRules="PurchasePlanDetailRules"
:tableData="tableData"
:apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain"
:apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
:isBusiness="true"
@handleAddTable="handleAddTable"
@handleDeleteTable="handleDeleteTable"
@searchTableSuccess="searchTableSuccess"
@submitForm="submitForm"
/>
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchasePlanMain.allSchemas"
ref="detailRef" :detailAllSchemas="PurchasePlanDetail.allSchemas" :detailAllSchemasRules="PurchasePlanDetailRules"
:isBasic="false"
:allSchemas="PurchasePlanMain.allSchemas"
:detailAllSchemas="PurchasePlanDetail.allSchemas"
:detailAllSchemasRules="PurchasePlanDetailRules"
:apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail" :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
:apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail" :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
:apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage" :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
:apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail" :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
@searchTableSuccessDetail="searchTableSuccessDetail" :detailValidate="detailValidate" />
:detailValidate="detailValidate"
/>
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" /> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { PurchasePlanMain,PurchasePlanMainRules,PurchasePlanDetail,PurchasePlanDetailRules } from './purchasePlanMain.data' import { PurchasePlanMain, PurchasePlanMainRules, PurchasePlanDetail, PurchasePlanDetailRules } from './purchasePlanMain.data'
import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain' import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail' import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
// //
defineOptions({ name: 'PurchasePlanMain' }) defineOptions({ name: 'PurchasePlanMain' })
const message = useMessage() // const message = useMessage() //
const { t } = useI18n() // const { t } = useI18n() //
const route = useRoute() // const route = useRoute() //
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns) const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
} }
// //
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
nextTick(async() => { nextTick(async () => {
if (type == 'tableForm') { if (type == 'tableForm') {
// //
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
row['itemCode'] = val[0]['code'] row['itemCode'] = val[0]['code']
row['poNumber'] = val[0]['number'] row['poNumber'] = val[0]['number']
row['poLine'] = val[0]['lineNumber'] row['poLine'] = val[0]['lineNumber']
await PurchaseDetailApi.getPurchaseDetailPage({ await PurchaseDetailApi.getPurchaseDetailPage({
number: row['poNumber'], number: row['poNumber'],
lineNumber: row['poLine'], lineNumber: row['poLine'],
}).then(res => { }).then(res => {
if(res.list.length == 1) { if (res.list.length == 1) {
row['itemCode'] = res.list[0].itemCode row['itemCode'] = res.list[0].itemCode
} }
}) })
} else { } else {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
})
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
nextTick(async () => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV) setV['poNumber'] = val[0]['number']
} setV['poLine'] = val[0]['lineNumber']
}) await PurchaseDetailApi.getPurchaseDetailPage({
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(async() => {
const setV = {}
setV[formField] = val[0][searchField]
setV['poNumber'] = val[0]['number']
setV['poLine'] = val[0]['lineNumber']
await PurchaseDetailApi.getPurchaseDetailPage({
number: setV['poNumber'], number: setV['poNumber'],
lineNumber: setV['poLine'], lineNumber: setV['poLine'],
}).then(res => { }).then(res => {
if(res.list.length == 1) { if (res.list.length == 1) {
setV['itemCode'] = res.list[0].itemCode setV['itemCode'] = res.list[0].itemCode
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
})
}
const { tableObject, tableMethods } = useTable({
getListApi: PurchasePlanMainApi.getPurchasePlanMainPage //
}) })
}
//
const { tableObject, tableMethods } = useTable({ const { getList, setSearchParams } = tableMethods
getListApi: PurchasePlanMainApi.getPurchasePlanMainPage //
}) //
const HeadButttondata = [
// defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), //
const { getList, setSearchParams } = tableMethods defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), //
// defaultButtons.defaultFreshBtn(null), //
const HeadButttondata = [ defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultAddBtn({hasPermi:'wms:purchase-plan-main:create'}), // defaultButtons.defaultSetBtn(null), //
defaultButtons.defaultImportBtn({hasPermi:'wms:purchase-plan-main:import'}), // // {
defaultButtons.defaultExportBtn({hasPermi:'wms:purchase-plan-main:export'}), // // label: '',
defaultButtons.defaultFreshBtn(null), // // name: 'zdy',
defaultButtons.defaultFilterBtn(null), // // hide: false,
defaultButtons.defaultSetBtn(null), // // type: 'primary',
// { // icon: 'Select',
// label: '', // color: ''
// name: 'zdy', // },
// hide: false, ]
// type: 'primary',
// icon: 'Select', //
// color: '' const buttonBaseClick = (val, item) => {
// }, if (val == 'add') { //
] openForm('create')
} else if (val == 'import') { //
// handleImport()
const buttonBaseClick = (val, item) => { } else if (val == 'export') { //
if (val == 'add') { // handleExport()
openForm('create') } else if (val == 'refresh') { //
} else if (val == 'import') { // getList()
handleImport() } else if (val == 'filtrate') { //
} else if (val == 'export') { // } else { //
handleExport() console.log('其他按钮', item)
} else if (val == 'refresh') { // }
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
} }
}
//
// const isShowMainButton = (row, val) => {
const isShowMainButton = (row,val) => { if (val.indexOf(row.status) > -1) {
if (val.indexOf(row.status) > -1) { return false
return false } else {
} else { return true
return true }
} }
}
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListPurchasePlanModBtn({hide:isShowMainButton(row,['5'])}), // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), //
defaultButtons.mainListPurchasePlanWitBtn({hide:isShowMainButton(row,['3'])}), // defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListPurchasePlanRejBtn({hide:isShowMainButton(row,['3'])}), // defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListPurchasePlanAccBtn({hide:isShowMainButton(row,['3'])}), // defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['6']) }), //
defaultButtons.mainListPurchasePlanPubBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['6']) }), //
defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['6']) }), //
defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:update'}), // // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), //
// defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), //
] ]
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainPurPlanOpe') { //
console.log('列表-操作按钮事件-打开')
} else if (val == 'mainPurPlanClo') { //
console.log('列表-操作按钮事件-关闭')
} else if (val == 'mainPurPlanPub') { //
console.log('列表-操作按钮事件-发布')
} else if (val == 'mainPurPlanAcc') { //
console.log('列表-操作按钮事件-接受')
} else if (val == 'mainPurPlanRej') { //
console.log('列表-操作按钮事件-不接受')
} else if (val == 'mainPurPlanWit') { //
console.log('列表-操作按钮事件-下架')
} else if (val == 'mainPurPlanMod') { //
console.log('列表-操作按钮事件-修改')
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} }
}
// -
/** 添加/修改操作 */ const buttonTableClick = async (val, row) => {
const formRef = ref() if (val == 'mainPurPlanOpe') { //
const openForm =async (type: string, row?: number) => { handleOpen(row.id)
tableData.value = [] // } else if (val == 'mainPurPlanClo') {//
formRef.value.open(type, row) handleClose(row.id)
} } else if (val == 'mainPurPlanPub') { //
handlePublish(row.id)
/** 详情操作 */ } else if (val == 'mainPurPlanAcc') { //
const detailRef = ref() handleAcc(row.id)
const openDetail = (row: any, titleName: any, titleValue: any) => { } else if (val == 'mainPurPlanRej') { //
detailRef.value.openDetail(row, titleName, titleValue) handleRej(row.id)
} } else if (val == 'mainPurPlanWit') { //
handleWit(row.id)
/** 删除按钮操作 */ } else if (val == 'edit') { //
const handleDelete = async (id: number) => { openForm('update', row)
try { } else if (val == 'delete') { //
// handleDelete(row.id)
await message.delConfirm() }
//
await PurchasePlanMainApi.deletePurchasePlanMain(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
download.excel(data, '要货计划主.xls')
} catch {
} finally {
exportLoading.value = false
} }
}
/** 添加/修改操作 */
/** const formRef = ref()
* tableForm方法 const openForm = async (type : string, row ?: number) => {
*/ tableData.value = [] //
const tableFormKeys = {} formRef.value.open(type, row)
PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item => { }
tableFormKeys[item.field] = item.default ? item.default : ''
}) /** 详情操作 */
const tableData = ref([]) const detailRef = ref()
const openDetail = (row : any, titleName : any, titleValue : any) => {
// detailRef.value.openDetail(row, titleName, titleValue)
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
//
const submitForm = async (formType, data) => {
data.subList = []
for(let item of tableData.value) {
await PurchaseDetailApi.getPurchaseDetailPage({
number: item.poNumber,
lineNumber: item.poLine,
}).then(res => {
data.subList.push(item) //
// if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){
// message.error('-')
// } else {
// data.subList.push(item) //
// }
})
} }
if(data.subList.length == tableData.value.length){
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try { try {
if (formType === 'create') { //
await PurchasePlanMainApi.createPurchasePlanMain(data) await message.delConfirm()
message.success(t('common.createSuccess')) //
} else { await PurchasePlanMainApi.deletePurchasePlanMain(id)
await PurchasePlanMainApi.updatePurchasePlanMain(data) message.success(t('common.delSuccess'))
message.success(t('common.updateSuccess')) //
await getList()
} catch { }
}
/** 关闭按钮操作 */
const handleClose = async (id : number) => {
try {
//
await message.confirm('是否关闭所选中数据?')
//
await PurchasePlanMainApi.closePurchasePlanMain(id)
message.success(t('关闭成功!'))
//
await getList()
} catch { }
}
/** 打开按钮操作 */
const handleOpen = async (id : number) => {
try {
//
await message.confirm('是否打开所选中数据?')
//
await PurchasePlanMainApi.openPurchasePlanMain(id)
message.success(t('打开成功!'))
//
await getList()
} catch { }
}
/** 发布按钮操作 */
const handlePublish = async (id : number) => {
try {
//
await message.confirm('是否发布所选中数据?')
//
await PurchasePlanMainApi.publishPurchasePlanMain(id)
message.success(t('发布成功!'))
//
await getList()
} catch { }
}
/** 下架按钮操作 */
const handleWit = async (id : number) => {
try {
//
await message.confirm('是否下架所选中数据?')
//
await PurchasePlanMainApi.witPurchasePlanMain(id)
message.success(t('下架成功!'))
//
await getList()
} catch { }
}
/** 接受按钮操作 */
const handleAcc = async (id : number) => {
try {
//
await message.confirm('是否接受所选中数据?')
//
await PurchasePlanMainApi.accPurchasePlanMain(id)
message.success(t('接受成功!'))
//
await getList()
} catch { }
}
/** 驳回按钮操作 */
const handleRej = async (id : number) => {
try {
//
await message.confirm('是否驳回所选中数据?')
//
await PurchasePlanMainApi.rejPurchasePlanMain(id)
message.success(t('驳回成功!'))
//
await getList()
} catch { }
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
download.excel(data, '要货计划主.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/**
* tableForm方法
*/
const tableFormKeys = {}
PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item => {
tableFormKeys[item.field] = item.default ? item.default : ''
})
const tableData = ref([])
//
const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
//
const handleDeleteTable = (item, index) => {
tableData.value.splice(index, 1)
}
//
const submitForm = async (formType, data) => {
data.subList = []
for (let item of tableData.value) {
await PurchaseDetailApi.getPurchaseDetailPage({
number: item.poNumber,
lineNumber: item.poLine,
}).then(res => {
data.subList.push(item) //
// if(item.planQty > res.list[0].orderQty-res.list[0].plannedQty){
// message.error('-')
// } else {
// data.subList.push(item) //
// }
})
}
if (data.subList.length == tableData.value.length) {
try {
if (formType === 'create') {
await PurchasePlanMainApi.createPurchasePlanMain(data)
message.success(t('common.createSuccess'))
} else {
await PurchasePlanMainApi.updatePurchasePlanMain(data)
message.success(t('common.updateSuccess'))
}
formRef.value.dialogVisible = false
//
getList()
} finally {
formRef.value.formLoading = false
}
} }
formRef.value.dialogVisible = false
//
getList()
} finally {
formRef.value.formLoading = false formRef.value.formLoading = false
} }
}
formRef.value.formLoading = false // /
} const detailValidate = async (data) => {
let tag = false
// / await PurchaseDetailApi.getPurchaseDetailPage({
const detailValidate = async (data) => { number: data.poNumber,
let tag = false lineNumber: data.poLine
await PurchaseDetailApi.getPurchaseDetailPage({ }).then(res => {
number: data.poNumber, if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
lineNumber: data.poLine
}).then(res => {
if(data.planQty > res.list[0].orderQty-res.list[0].plannedQty){
message.error('要货计划数量不得大于订单数量-已计划数量') message.error('要货计划数量不得大于订单数量-已计划数量')
tag = false tag = false
} else { } else {
tag = true tag = true
} }
})
return tag
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '要货计划主导入模版.xls'
}) })
return tag
} //
const importSuccess = () => {
/** 导入 */ getList()
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '要货计划主导入模版.xls'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
} }
getList() //
} //
const searchFormClick = (searchData) => {
/** 初始化 **/ tableObject.params = {
onMounted(async () => { isSearch: true,
getList() filters: searchData.filters
importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate() }
}) getList() //
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
})
</script> </script>

33
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -110,49 +110,22 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '开始时间', label: '开始时间',
field: 'beginTime', field: 'beginTime',
isTable: true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}, },
isForm: false, isForm: false,
}, },
{ {
label: '结束时间', label: '结束时间',
field: 'endTime', field: 'endTime',
isTable: true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}, },
isForm: false, isForm: false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

Loading…
Cancel
Save