sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
zhaoxuebing 11 months ago
parent
cf95edd2e3 eb3bbda3b1
commit
ba7ce1d4f7
10 changed files with 224 additions and 224 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/components/Detail/src/Detail.vue
  2. 126
      src/views/Home/components/material.vue
  3. 67
      src/views/Home/components/produce.vue
  4. 123
      src/views/Home/components/product.vue
  5. 14
      src/views/Home/echarts-data.ts
  6. 1
      src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
  7. 1
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  8. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  9. 9
      src/views/wms/reportList/index.vue
  10. 100
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

6
src/components/Detail/src/Detail.vue
View File

@ -405,6 +405,12 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
defaultButtons.defaultFilterBtn(null) // 筛选 defaultButtons.defaultFilterBtn(null) // 筛选
] ]
} }
//盘点调整申请筛选
if (props.fromeWhere == 'countadjustRequest') {
HeadButttondata.value = [
defaultButtons.defaultFilterBtn(null) // 筛选
]
}
} }
// 动态显示操作列按钮 // 动态显示操作列按钮

126
src/views/Home/components/material.vue
View File

@ -148,19 +148,63 @@
<div class="two-row mt-14px"> <div class="two-row mt-14px">
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">高低储预警</div> <div class="title">高低储预警</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <el-table
<el-table-column prop="title" label="标题" /> :data="materialData?.warningBalanceList"
<el-table-column prop="name" label="发布人" /> style="width: 100%"
<el-table-column prop="date" label="发布日期" /> stripe
height="240px"
>
<el-table-column prop="itemCode" label="物料代码" width="180px" />
<el-table-column prop="batch" label="批次" width="180px" />
<el-table-column prop="packingNumber" label="包装号" width="180px" />
<el-table-column prop="containerNumber" label="器具代码" width="180px" />
<el-table-column prop="qty" label="数量" width="180px" />
<el-table-column prop="uom" label="计量单位" width="180px">
<template #default="scope">
{{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
</template>
</el-table-column>
<el-table-column prop="locationCode" label="库位代码" width="180px" />
<el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
<el-table-column prop="inventoryStatus" label="库存状态" width="180px">
<template #default="scope">
{{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
</template>
</el-table-column>
<el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
<el-table-column prop="areaCode" label="库区代码" width="180px" />
<el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
<el-table-column prop="altBatch" label="替代批次" width="180px" />
<el-table-column prop="arriveDate" label="到货日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="produceDate" label="生产日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="expireDate" label="失效日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="ownerCode" label="货主代码" width="180px" />
<el-table-column prop="lockedQty" label="锁定数量" width="180px" />
<el-table-column prop="usableQty" label="可用数量" width="180px" />
<el-table-column prop="singlePrice" label="单价" width="180px" />
<el-table-column prop="amount" label="金额" width="180px" />
<el-table-column prop="putInTime" label="入库时间" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -169,55 +213,41 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
const materialData = ref() const materialData = ref()
// 获取原料管理员数据 // 获取原料管理员数据
const getMaterialData = async () => { const getMaterialData = async () => {
IndexApi.getMaterialData().then((res) => { await IndexApi.getMaterialData().then((res) => {
materialData.value = res materialData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( materialData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( materialData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getMaterialData() await getMaterialData()
}) })

67
src/views/Home/components/produce.vue
View File

@ -156,11 +156,7 @@
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -169,55 +165,40 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
const produceData = ref() const produceData = ref()
// 获取生产管理员首页数据 // 获取生产管理员首页数据
const getProduceData = async () => { const getProduceData = async () => {
IndexApi.getProduceData().then((res) => { IndexApi.getProduceData().then((res) => {
produceData.value = res produceData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( produceData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( produceData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getProduceData() await getProduceData()
}) })

123
src/views/Home/components/product.vue
View File

@ -127,19 +127,63 @@
<div class="two-row mt-14px"> <div class="two-row mt-14px">
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">高低储预警</div> <div class="title">高低储预警</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <el-table
<el-table-column prop="title" label="标题" /> :data="productData?.warningBalanceList"
<el-table-column prop="name" label="发布人" /> style="width: 100%"
<el-table-column prop="date" label="发布日期" /> stripe
height="240px"
>
<el-table-column prop="itemCode" label="物料代码" width="180px" />
<el-table-column prop="batch" label="批次" width="180px" />
<el-table-column prop="packingNumber" label="包装号" width="180px" />
<el-table-column prop="containerNumber" label="器具代码" width="180px" />
<el-table-column prop="qty" label="数量" width="180px" />
<el-table-column prop="uom" label="计量单位" width="180px">
<template #default="scope">
{{ formatter(scope.row.uom, DICT_TYPE.UOM) }}
</template>
</el-table-column>
<el-table-column prop="locationCode" label="库位代码" width="180px" />
<el-table-column prop="warehouseCode" label="仓库代码" width="180px" />
<el-table-column prop="inventoryStatus" label="库存状态" width="180px">
<template #default="scope">
{{ formatter(scope.row.inventoryStatus, DICT_TYPE.INVENTORY_STATUS) }}
</template>
</el-table-column>
<el-table-column prop="locationGroupCode" label="库位组代码" width="180px" />
<el-table-column prop="areaCode" label="库区代码" width="180px" />
<el-table-column prop="erpLocationCode" label="ERP库位代码" width="180px" />
<el-table-column prop="altBatch" label="替代批次" width="180px" />
<el-table-column prop="arriveDate" label="到货日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="produceDate" label="生产日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="expireDate" label="失效日期" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
<el-table-column prop="ownerCode" label="货主代码" width="180px" />
<el-table-column prop="lockedQty" label="锁定数量" width="180px" />
<el-table-column prop="usableQty" label="可用数量" width="180px" />
<el-table-column prop="singlePrice" label="单价" width="180px" />
<el-table-column prop="amount" label="金额" width="180px" />
<el-table-column prop="putInTime" label="入库时间" width="180px">
<template #default="scope">
<span>{{ formatDate(scope.row.planDate) }}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div class="data1 w-[47.3%]"> <div class="data1 w-[47.3%]">
<div class="title">待处理任务</div> <div class="title">待处理任务</div>
<el-table :data="tableData" style="width: 100%" stripe height="240px"> <Echart :options="barOptions" :height="280" :key="lineIndex" />
<el-table-column prop="title" label="标题" />
<el-table-column prop="name" label="发布人" />
<el-table-column prop="date" label="发布日期" />
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -148,55 +192,40 @@
import * as IndexApi from '@/api/home' import * as IndexApi from '@/api/home'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const tableData = [ import { set } from 'lodash-es'
{ import { EChartsOption } from 'echarts'
date: '2016-05-03', import { barOptions } from '../echarts-data'
name: 'Tom', const lineIndex = ref(0)
title: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-02',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-04',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
},
{
date: '2016-05-01',
title: 'Tom',
name: 'Tom',
text: 'No. 189, Grove St, Los Angeles'
}
]
// 获取成品管理员首页首页数据 // 获取成品管理员首页首页数据
const productData = ref() const productData = ref()
const getProductData = async () => { const getProductData = async () => {
IndexApi.getProductData().then((res) => { IndexApi.getProductData().then((res) => {
productData.value = res productData.value = res
getJobCharts()
}) })
} }
const formatter = (type, dict) => { const formatter = (type, dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label let str = getStrDictOptions(dict).filter((item) => type == item.value)[0].label
return str return str
} }
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
const getJobCharts = async () => {
set(
barOptionsData,
'xAxis.data',
Object.keys( productData.value.jobCount)
)
set(barOptionsData, 'legend.data', ['待处理任务'])
set(barOptionsData, 'series', [
{
name:'待处理任务',
data: Object.values( productData.value.jobCount),
type: 'bar',
barMaxWidth:30
}
])
lineIndex.value++
}
onMounted(async () => { onMounted(async () => {
await getProductData() await getProductData()
}) })

14
src/views/Home/echarts-data.ts
View File

@ -96,7 +96,7 @@ export const pieOptions: EChartsOption = {
export const barOptions: EChartsOption = { export const barOptions: EChartsOption = {
title: { title: {
text: t('analysis.weeklyUserActivity'), text: '',
left: 'center' left: 'center'
}, },
tooltip: { tooltip: {
@ -112,15 +112,7 @@ export const barOptions: EChartsOption = {
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
data: [ data: [],
t('analysis.monday'),
t('analysis.tuesday'),
t('analysis.wednesday'),
t('analysis.thursday'),
t('analysis.friday'),
t('analysis.saturday'),
t('analysis.sunday')
],
axisTick: { axisTick: {
alignWithLabel: true alignWithLabel: true
} }
@ -131,7 +123,7 @@ export const barOptions: EChartsOption = {
series: [ series: [
{ {
name: t('analysis.activeQuantity'), name: t('analysis.activeQuantity'),
data: [13253, 34235, 26321, 12340, 24643, 1322, 1324], data: [],
type: 'bar' type: 'bar'
} }
] ]

1
src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
View File

@ -658,6 +658,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'action', field: 'action',
isDetail: false, isDetail: false,
isForm: false , isForm: false ,
isTable:false,
table: { table: {
width: 150, width: 150,
fixed: 'right' fixed: 'right'

1
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
View File

@ -67,6 +67,7 @@
:apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail" :apiUpdate="CountadjustRequestDetailApi.updateCountadjustRequestDetail"
:apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage" :apiPage="CountadjustRequestDetailApi.getCountadjustRequestDetailPage"
:apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail" :apiDelete="CountadjustRequestDetailApi.deleteCountadjustRequestDetail"
fromeWhere="countadjustRequest"
:Echo="Echo" :Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail" @searchTableSuccessDetail="searchTableSuccessDetail"
/> />

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
View File

@ -104,6 +104,7 @@
// 明细查询页赋值 // 明细查询页赋值
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
if (formField == 'poNumber') { if (formField == 'poNumber') {
row['poNumber'] = val[0]['poNumber']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['itemCode']
row['poLine'] = val[0]['poLine'] row['poLine'] = val[0]['poLine']
row['uom'] = val[0]['uom'] row['uom'] = val[0]['uom']

9
src/views/wms/reportList/index.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<ContentWrap>
<ContentWrap> <IFrame :src="url" style="width: 100%; height: calc(100vh - 180px)" />
<IFrame :src="url" style="width: 100%;height:calc(100vh - 180px);"/> <!-- <iframe :src="url" frameborder="0" style="width: 100%;height: 75vh;"></iframe> -->
<!-- <iframe :src="url" frameborder="0" style="width: 100%;height: 75vh;"></iframe> --> </ContentWrap>
</ContentWrap>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

100
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
View File

@ -1,5 +1,7 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const recordTypeList = [{ label:'收货单号', value:'1' },{ label:'退货单号', value:'2' },{ label:'索赔单号', value:'3' }] const recordTypeList = [{ label:'收货单号', value:'1' },{ label:'退货单号', value:'2' },{ label:'索赔单号', value:'3' }]
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
@ -23,15 +25,26 @@ const userDept = userStore.userSelfInfo.dept
* @returns {Array} 供应商发票申请主表 * @returns {Array} 供应商发票申请主表
*/ */
export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '供应商代码', label: '供应商代码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isSearch: true isSearch: true,
}, form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
}
}
},
{ {
label: '调增金额', label: '调增金额',
field: 'adjustAmount', field: 'adjustAmount',
@ -366,22 +379,11 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '货主代码', label: '货主代码',
field: 'ownerCode' field: 'ownerCode'
}, },
{
label: '包装号',
field: 'packingNumber'
},
{
label: '器具号',
field: 'containerNumber'
},
{ {
label: '批次', label: '批次',
field: 'batch' field: 'batch'
}, },
{
label: '替代批次',
field: 'altBatch'
},
{ {
label: '订单号', label: '订单号',
field: 'poNumber' field: 'poNumber'
@ -390,41 +392,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
label: '订单行', label: '订单行',
field: 'poLine' field: 'poLine'
}, },
{
label: '标包数量', {
field: 'stdPackQty', label: '物品代码',
form: { field: 'itemCode'
component: 'InputNumber', },
}
},
{
label: '标包单位',
field: 'stdPackUnit',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isTable: true
},
{
label: '供应商计量数量',
field: 'supplierPackQty',
form: {
component: 'InputNumber',
}
},
{
label: '供应商计量单位',
field: 'supplierPackUnit',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true
},
{
label: '转换率',
field: 'convertRate',
form: {
component: 'InputNumber',
}
},
{ {
label: '单价', label: '单价',
field: 'singlePrice', field: 'singlePrice',
@ -439,20 +412,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{
label: '单据号',
field: 'number',
isTableForm: false,
form: {
componentProps: {
disabled: true
}
}
},
{
label: '物品代码',
field: 'itemCode'
},
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

Write Preview
Loading…
Cancel
Save