Browse Source

基础数据

master
zhangli 1 year ago
parent
commit
ffff480dce
  1. 35
      src/api/wms/detail/index.ts
  2. 119
      src/components/Detail/src/Detail.vue
  3. 41
      src/components/Remarks/src/Remarks.vue
  4. 8
      src/views/wms/itembasic/index.vue

35
src/api/wms/detail/index.ts

@ -0,0 +1,35 @@
import request from '@/config/axios'
// 查询备注列表
export const getRemarkPage = async (params) => {
return await request.get({ url: `/infra/remark/list`, params })
}
// // 查询库区详情
// export const getArea = async (id: number) => {
// return await request.get({ url: `/wms/areabasic/get?id=` + id })
// }
// 新增备注
export const createRemark= async (data) => {
return await request.post({ url: `/infra/remark/create`, data })
}
// 查询变更记录列表
export const getChangeRecordPage = async (params) => {
return await request.get({ url: `/infra/trends/list`, params })
}
// // 修改库区
// export const updateArea = async (data: AreaVO) => {
// return await request.put({ url: `/wms/areabasic/update`, data })
// }
// // 删除库区
// export const deleteArea = async (id: number) => {
// return await request.delete({ url: `/wms/areabasic/delete?id=` + id })
// }
// // 导出库区 Excel
// export const exportArea = async (params) => {
// return await request.download({ url: `/wms/areabasic/export-excel`, params })
// }

119
src/components/Detail/src/Detail.vue

@ -6,7 +6,8 @@
</div>
</template>
<ContentWrap v-if="!isBasic">
<Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px"/>
<Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical"
:column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
</ContentWrap>
<Tabs :tabsList="tabsList" :current="current" @change="change" />
<div class="flex" v-if="current == 0">
@ -18,20 +19,16 @@
<!-- 附件组件 -->
<Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" />
<!-- 备注组件 -->
<Remarks :data="remarksData" class="mt-20px" @submitSucss="remarksSubmitSucss" />
<Remarks :remarksData="remarksData" class="mt-20px"
@remarksSubmitScuess="remarksSubmitScuess" />
<!-- 变更记录组件 -->
<ChangeRecord :data="changeRecordData" class="mt-20px" />
</ContentWrap>
</div>
<ContentWrap v-else>
<Table
:columns="allSchemas.tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{total: tableObject.total}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
/>
<Table :columns="allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading"
:pagination="{ total: tableObject.total }" v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage" />
</ContentWrap>
</el-drawer>
</template>
@ -41,7 +38,8 @@ import Annex from '@/components/Annex/src/Annex.vue'
import Remarks from '@/components/Remarks/src/Remarks.vue'
import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
import Tabs from '@/components/Tabs/src/Tabs.vue'
import * as ItembasicApi from '@/api/wms/itembasic'
import * as DetailApi from '@/api/wms/detail'
defineOptions({ name: 'Detail' })
@ -64,26 +62,12 @@ const props = defineProps({
required: true,
default: null
},
// //
// accept: {
// type: String,
// required: false,
// default:'.xlsx,.xls'
// },
// // .1
// mode: {
// type: Number,
// required: false,
// default: 1
// },
// url:{
// type: String,
// required: false,
// }
})
const isShowDrawer = ref(false)
const detailLoading = ref(false)
const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
if (tabsList.value && tabsList.value.length > 0) {
@ -112,17 +96,11 @@ const annexData = reactive({
time: '2022年12月12日 17:16:00',
}]
})
//
//
const remarksData = reactive({
remarksList: [{
name: '诸葛亮',
text: '转朱阁,低绮户,照无眠。不应有恨,何事长向别时圆?人有悲欢离合,月有阴晴圆缺,此事古难全。但愿人长久,千里共婵娟。',
time: '2023年5月6日 17:16:00',
}, {
name: '刘备',
text: '转朱阁,低绮户,照无眠。不应有恨,何事长向别时圆?人有悲欢离合,月有阴晴圆缺,此事古难全。但愿人长久,千里共婵娟。',
time: '2022年12月12日 17:16:00',
}]
remarksList: [],
data:{}
})
//
@ -151,13 +129,10 @@ const changeRecordData = reactive({
const detailData = ref("")//
//
const importSuccess = () => {
const importSuccess = () => {}
}
/** 搜索按钮操作 */
const handleQuery = () => {
importFormRef.value.open()
}
@ -176,64 +151,68 @@ const handleImport = () => {
const deleteAnnexSuccess = async () => {
console.log('删除成功');
}
//
const remarksSubmitSucss = () => {
console.log('提交成功');
}
//
// const supplierItems = reactive({
// supplierItemsList: [{
// code: '646456',
// name: '978978'
// }],
// total: 20,
// pageSize: 1,
// currentPage: 2
// })
// Tabs
const current = ref(0)
const detailLoading = ref(false)
//
const { tableObject, tableMethods } = useTable({
getListApi: ItembasicApi.getItembasicPage //
})
const change = (item, index) => {
current.value = index
}
//
const { getList } = tableMethods
getList()
/** 打开弹窗 */
const titleNameRef = ref()
const titleValueRef = ref()
const openDetail = async (row: any, titleName: any, titleValue: any) => {
const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
titleNameRef.value = titleName
titleValueRef.value = titleValue
remarksData.data = {
tableId: row.id,
tableName: tableName,
}
isShowDrawer.value = true
console.log(216, row)
if (row) {
detailLoading.value = true
try {
// detailData.value = await ItembasicApi.getItembasic(id)
detailData.value = row
console.log(detailData.value);
getRemarkList()
getChangeRecordList()
} finally {
detailLoading.value = false
}
}
}
defineExpose({ openDetail }) // open
//
const getRemarkList = async () => {
detailLoading.value = true
try {
remarksData.remarksList = await DetailApi.getRemarkPage(remarksData.data)
} finally {
detailLoading.value = false
}
}
//
const remarksSubmitScuess = async (remark) => {
detailLoading.value = false
getRemarkList()
getChangeRecordList()
}
//
const getChangeRecordList = async () => {
remarksData.remarksList = await DetailApi.getChangeRecordPage(remarksData.data)
}
</script>
<style lang="scss">
.el-drawer__body {
background: #f5f5f5 !important;
}
::v-deep(.label-class-name) {
color: #dedede;
}
</style>
<style scoped lang="scss">
</style>
<style scoped lang="scss"></style>

41
src/components/Remarks/src/Remarks.vue

@ -5,22 +5,23 @@
<div class="title-txt">备注</div>
</div>
<div class="list">
<div class="item flex items-start" v-for="(item, index) in data.remarksList" :key="index">
<div class="item flex items-start" v-for="(item, index) in remarksData.remarksList" :key="index">
<div class="user-icon mt-4px">
<Icon icon="fa-solid:user" color="#fff" size="16" />
<img :src="item.avatar" v-if="item.avatar" alt="" class="w-[100%] h-[100%]"/>
<Icon icon="fa-solid:user" color="#fff" v-else size="16"/>
</div>
<div class="item-center">
<div class="item-title">
<div class="item-title-txt">{{ item.name }}</div>
<div class="time">{{ item.time }}</div>
<div class="item-title-txt">{{ item.nickname }}</div>
<div class="time">{{formatDate(item.createTime)}}</div>
</div>
<div class="mt-8px color-#303133 font-size-14px">{{ item.text }}</div>
<div class="mt-8px color-#303133 font-size-14px">{{ item.remark }}</div>
</div>
</div>
</div>
<div class="add-remarks flex items-center mt-20px">
<el-input v-model="remark" placeholder="请输入备注" />
<el-button class="ml-16px" type="primary" @click="handleSubmit" >
<el-input v-model="data.remark" placeholder="请输入备注" />
<el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
确定
</el-button>
</div>
@ -28,30 +29,39 @@
</template>
<script lang="ts" setup>
import { getCurrentInstance } from 'vue'
const message = useMessage() //
const { proxy } = getCurrentInstance()
import * as DetailApi from '@/api/wms/detail'
import { formatDate } from '@/utils/formatTime'
defineComponent({
name: 'Annex'
})
const remark = ref('')
//
const props = defineProps({
data: {
remarksData: {
type: Object,
required: true
}
})
const data = ref(props.remarksData.data)
// emit
const emit = defineEmits(['remarksSubmitSucss'])
const emit = defineEmits(['remarksSubmitScuess'])
//
const handleSubmit = ()=>{
if(!remark.value){
const handleSubmitrRemarks =async ()=>{
if(!data.value.remark){
message.error('请填写备注')
return;
}
try {
await DetailApi.createRemark(data.value)
message.success('提交成功')
} finally {
emit('remarksSubmitScuess') //
data.value.remark = ''
}
emit('remarksSubmitSucss') //
}
</script>
@ -82,6 +92,7 @@ const handleSubmit = ()=>{
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
}
.item-center {

8
src/views/wms/itembasic/index.vue

@ -14,7 +14,7 @@
total: tableObject.total
}" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage">
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<el-button type="primary" link @click="openDetail(row, '代码', row.code,route.name)">
<span>{{ row.code }}</span>
</el-button>
</template>
@ -55,6 +55,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { ItemBasicTabsList } from '@/utils/disposition/tabsList'
defineOptions({ name: 'Itembasic' })
const route = useRoute(); //
const { tableObject, tableMethods } = useTable({
getListApi: ItembasicApi.getItembasicPage //
@ -142,8 +144,8 @@ const openForm = (type: string, id?: number) => {
basicFormRef.value.open(type, id)
}
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue)
const openDetail = (row: any, titleName: any, titleValue: any, tableNameRef: any) => {
detailRef.value.openDetail(row, titleName, titleValue, tableNameRef)
}
/** 删除按钮操作 */

Loading…
Cancel
Save