Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

master_hella_20240701
gaojs 6 months ago
parent
commit
c2a162d5a6
  1. 66
      src/views/home/components/material.vue
  2. 4
      src/views/home/components/produce.vue
  3. 10
      src/views/home/components/product.vue
  4. 4
      src/views/home/components/supplierIndex.vue
  5. 9
      src/views/home/index.vue
  6. 24
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
  7. 11
      src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
  8. 2
      src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue
  9. 1
      src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
  10. 3
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  11. 20
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  12. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  13. 3
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
  14. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  15. 2
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  16. 27
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  17. 3
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
  18. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

66
src/views/home/components/material.vue

@ -33,6 +33,7 @@
</div>
<div class="two-row mt-14px">
<div class="data1 w-[47.3%]" >
<!-- 呆滞库存预警 -->
<div class="title">{{ t('home.slack_stock_warning')}}</div>
<el-table
:data="materialData?.stagnantBalanceList"
@ -87,8 +88,19 @@
</template>
</el-table-column>
</el-table>
<!-- <el-pagination style="margin-top:10px"
v-model:current-page="currentPage_stagnantBalance"
v-model:page-size="pageSize_stagnantBalance"
:page-sizes="[10, 20, 30, 50, 100]"
:small="true"
:background="false"
layout="total, sizes, prev, pager, next, jumper"
:total="total_stagnantBalance"
@current-change="handleCurrentChange_stagnantBalance"
/> -->
</div>
<div class="data1 w-[47.3%]">
<!-- 超期库存预警 -->
<div class="title">{{ t('home.overstock_warning') }}</div>
<el-table
:data="materialData?.overdueBalanceList"
@ -143,10 +155,21 @@
</template>
</el-table-column>
</el-table>
<!-- <el-pagination style="margin-top:10px"
v-model:current-page="currentPage_overdueBalance"
v-model:page-size="pageSize_overdueBalance"
:page-sizes="[10, 20, 30, 50, 100]"
:small="true"
:background="false"
layout="total, sizes, prev, pager, next, jumper"
:total="total_overdueBalance"
@current-change="handleCurrentChange_overdueBalance"
/> -->
</div>
</div>
<div class="two-row mt-14px">
<div class="data1 w-[47.3%]">
<!-- 高低储预警 -->
<div class="title">{{ t('home.high_and_low_storage_warning') }}</div>
<el-table
:data="materialData?.warningBalanceList"
@ -201,8 +224,19 @@
</template>
</el-table-column>
</el-table>
<!-- <el-pagination style="margin-top:10px"
v-model:current-page="currentPage_warningBalance"
v-model:page-size="pageSize_warningBalance"
:page-sizes="[10, 20, 30, 50, 100]"
:small="true"
:background="false"
layout="total, sizes, prev, pager, next, jumper"
:total="total_warningBalance"
@current-change="handleCurrentChange_warningBalance"
/> -->
</div>
<div class="data1 w-[47.3%]">
<!-- 待处理任务 -->
<div class="title">{{ t('home.waiting_tasks') }}</div>
<Echart :options="barOptions" :height="280" :key="lineIndex" />
</div>
@ -222,8 +256,8 @@ const lineIndex = ref(0)
const materialData = ref()
//
const getMaterialData = async () => {
await IndexApi.getMaterialData().then((res) => {
const getMaterialData = () => {
IndexApi.getMaterialData().then((res) => {
materialData.value = res
getJobCharts()
})
@ -250,9 +284,33 @@ const getJobCharts = async () => {
])
lineIndex.value++
}
onMounted(async () => {
// await getMaterialData()
onMounted(() => {
// getMaterialData()
})
//
const currentPage_stagnantBalance = ref(1)
const pageSize_stagnantBalance = ref(10)
const total_stagnantBalance= ref(100)
const handleCurrentChange_stagnantBalance = (val)=>{
console.log('呆滞库存预警',val)
}
//
const currentPage_overdueBalance = ref(1)
const pageSize_overdueBalance = ref(10)
const total_overdueBalance= ref(100)
const handleCurrentChange_overdueBalance = (val)=>{
console.log('超期库存预警',val)
}
//
const currentPage_warningBalance = ref(1)
const pageSize_warningBalance = ref(10)
const total_warningBalance= ref(100)
const handleCurrentChange_warningBalance = (val)=>{
console.log('高低储预警',val)
}
</script>
<style scoped lang="scss">
.title {

4
src/views/home/components/produce.vue

@ -201,8 +201,8 @@ const getJobCharts = async () => {
])
lineIndex.value++
}
onMounted(async () => {
// await getProduceData()
onMounted( () => {
// getProduceData()
})
</script>
<style scoped lang="scss">

10
src/views/home/components/product.vue

@ -11,7 +11,8 @@
</div>
</div>
<div class="two-row mt-14px">
<div class="data1 w-[47.3%]">
<div class="data1 w-[47.3%]" style="border:1px solid red">
<!-- 呆滞库存预警 -->
<div class="title">{{ t('home.slack_stock_warning') }}</div>
<el-table
:data="productData?.stagnantBalanceList"
@ -68,6 +69,7 @@
</el-table>
</div>
<div class="data1 w-[47.3%]">
<!-- 超期库存预警 -->
<div class="title">{{ t('home.overstock_warning') }}</div>
<el-table
:data="productData?.overdueBalanceList"
@ -126,6 +128,7 @@
</div>
<div class="two-row mt-14px">
<div class="data1 w-[47.3%]">
<!-- 高低储预警 -->
<div class="title">{{ t('home.high_and_low_storage_warning') }}</div>
<el-table
:data="productData?.warningBalanceList"
@ -182,6 +185,7 @@
</el-table>
</div>
<div class="data1 w-[47.3%]">
<!-- 待处理任务 -->
<div class="title">{{ t('home.waiting_tasks') }}</div>
<Echart :options="barOptions" :height="280" :key="lineIndex" />
</div>
@ -228,8 +232,8 @@ const getJobCharts = async () => {
])
lineIndex.value++
}
onMounted(async () => {
// await getProductData()
onMounted( () => {
// getProductData()
})
</script>
<style scoped lang="scss">

4
src/views/home/components/supplierIndex.vue

@ -354,8 +354,8 @@ const formatter = (type,dict) => {
let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
return str
}
onMounted(async () => {
// await getSupplierData()
onMounted( () => {
// getSupplierData()
getList()
})
</script>

9
src/views/home/index.vue

@ -1,9 +1,14 @@
<template>
<div>
<supplierIndex v-hasRole="['super_admin','supplier']"/>
<!-- <supplierIndex v-hasRole="['super_admin','supplier']"/>
<material v-hasRole="['super_admin']"/>
<product v-hasRole="['super_admin']"/>
<produce v-hasRole="['super_admin']"/>
<produce v-hasRole="['super_admin']"/> -->
<supplierIndex />
<material/>
<!-- material 中四个table重复了先去掉了 -->
<!-- <product/> -->
<produce/>
</div>
</template>
<script lang="ts" setup>

24
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@ -137,11 +137,13 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
key: 'businessType',
value: businessType,
isMainValue: false
},{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
}
// ,{
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }
,{
message: '请选择从仓库代码!',
key: 'warehouseCode',
value: 'fromWarehouseCode',
@ -153,11 +155,13 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
key: 'businessType',
value: businessType,
isMainValue: false
},{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
},
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// },
{
message: '请选择从仓库代码!',
key: 'warehouseCode',
value: 'fromWarehouseCode',

11
src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@ -324,11 +324,12 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalanceByBusinessTypeByItemType, // 查询弹窗所需分页方法
searchCondition:[
{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
// {
// key: 'available',
// value: 'TRUE',
// isMainValue: false
// }
,{
message: '请选择从仓库代码!',
key: 'fromWarehouseCode',
value: 'fromWarehouseCode',

2
src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@ -74,7 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
//
defineOptions({ name: 'SupplierUser' })
const message = useMessage() //

1
src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@ -87,6 +87,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
dialogWidth:'1025px',//搜索出来弹窗的宽度
isSearchList: true,
searchListPlaceholder: '请选用户信息',
searchField: 'id',

3
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -868,6 +868,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm:false,
isForm:false,
},
{
@ -878,6 +879,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm:false,
isForm:false,
},
{
@ -887,6 +889,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTableForm:false,
isForm:false,
},
{

20
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -558,10 +558,24 @@ const importSuccess = () => {
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
tableObject.params.isSearch = true
let filters = [...searchData.filters]
if(!filters.find(item=>item.column=='business_type')){
if ( routeName.value == 'DeliverRequestMain') {
filters = [...filters,{
action:'==',
column:'business_type',
value:'Deliver',
}]
} else if ( routeName.value == 'ZZBJDeliverRequestMain') {
filters = [...filters,{
action:'==',
column:'business_type',
value:'ZZBJDeliver',
}]
}
}
tableObject.params.filters = filters
getList() //
}

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -109,10 +109,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if (type == 'tableForm') {
//
row[formField] = val[0][searchField]
row['uom'] = val[0]['uom']
} else {
const setV = {}
setV[formField] = val[0][searchField]
//setV['ppNumber'] = val[0]['ppNumber']
//setV['supplierCode'] = val[0]['supplierCode']
formRef.setValues(setV)
}

3
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@ -501,7 +501,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150
},
tableForm: {
type: 'Select'
type: 'Select',
disabled: true
}
},
{

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -114,7 +114,7 @@
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'scrap'"/>
<!-- 标签打印 -->
<SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
</template>

2
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -678,7 +678,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
},
sortTableDefault: 1013,
hiddenInMain: true,
isSearch: true
isSearch: false
},
{
label: '原因',

27
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -810,15 +810,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
},
hiddenInMain:true,
isForm: false,
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}
// form: {
// component: 'DatePicker',
// componentProps: {
// style: {width:'100%'},
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// }
},
{
label: '最后更新时间',
@ -834,6 +834,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150
},
isForm: false,
form: {
component: 'DatePicker',
componentProps: {
style: {width:'100%'},
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
}
},
{
label: '备注',

3
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@ -257,8 +257,9 @@ const getSearchTableData = async (number,formField,searchField)=>{
}).then((res)=>{
res.list.forEach((item,index)=>{
const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
if(findItem){
findItem['expireTime'] = findItem['expireTime']
}
})
})
}

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -298,7 +298,7 @@
return []
}
return [
defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), //
defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), //
defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), //
{
label: t('ts.采购通过'),

Loading…
Cancel
Save