Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhaoyiran 6 months ago
parent
commit
ce93d68ee3
  1. 2
      src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
  2. 7
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  3. 7
      src/views/wms/basicDataManage/labelManage/locationLabel/index.vue
  4. 6
      src/views/wms/inventoryManage/balance/index.vue
  5. 7
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  6. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

2
src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@ -36,6 +36,8 @@ export const CallmaterialsRules = reactive({
warehouseCode: [required],
workshopCode: [required],
workStationCode: [required],
uom: [required],
callmaterialQty: [required]
})
export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([

7
src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Callmaterials.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="Callmaterials.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap>
<!-- 列表头部 -->
@ -291,7 +291,10 @@ const searchFormClick = (searchData) => {
}
getList() //
}
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {

7
src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="Package.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap>
<!-- 列表头部 -->
@ -209,7 +209,10 @@ const searchFormClick = (searchData) => {
}
getList() //
}
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {

6
src/views/wms/inventoryManage/balance/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="Balance.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="Balance.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
</ContentWrap>
<!-- 列表头部 -->
@ -135,6 +135,10 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {

7
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
</ContentWrap>
<!-- 列表头部 -->
@ -198,7 +198,10 @@ const buttonBaseClick = (val, item) => {
console.log('其他按钮', item)
}
}
const searchList = (model)=>{
selectionRows.value = []
setSearchParams(model)
}
watch(
() => tableObject.tableList,
() => {

4
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@ -155,7 +155,9 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
setV['contactName']=val[0]['contacts']
setV['contactPhone']=val[0]['phone']
setV['contactEmail']=val[0]['email']
setV['taxRate']=val[0]['taxRate']
if(formRef.formModel.taxRate==0){
setV['taxRate']=val[0]['taxRate']
}
formRef.setValues(setV)
//
val.forEach(item=>{

Loading…
Cancel
Save