Browse Source

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

master_hella_20240701
zhaoxuebing 7 months ago
parent
commit
1a3b5bd200
  1. 2
      src/api/qms/inspectionTemplate/index.ts
  2. 2
      src/views/mes/orderDay/components/orderDetail.vue
  3. 3
      src/views/mes/workScheduling/components/Detail.vue
  4. 39
      src/views/qms/basicDataManage/inspectionScheme/addForm.vue
  5. 20
      src/views/qms/inspection/inspectionJob/addForm.vue
  6. 28
      src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
  7. 20
      src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
  8. 15
      src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
  9. 29
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  10. 21
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  11. 15
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
  12. 29
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  13. 1
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
  14. 63
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

2
src/api/qms/inspectionTemplate/index.ts

@ -2,7 +2,7 @@ import request from '@/config/axios'
// 查询采样过程列表 // 列表
export const getListByTempleteCode = async (code) => { export const getListByTempleteCode = async (code) => {
return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code}) return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
} }

2
src/views/mes/orderDay/components/orderDetail.vue

@ -199,7 +199,7 @@ const emit = defineEmits([
]) ])
// //
watch() //watch()
</script> </script>
<style lang="scss"> <style lang="scss">
.el-drawer__body { .el-drawer__body {

3
src/views/mes/workScheduling/components/Detail.vue

@ -409,7 +409,6 @@ const remarkHeight = computed(() => {
const tab = unref(tabRef) const tab = unref(tabRef)
const tabTop = tab?.$el.getBoundingClientRect().top const tabTop = tab?.$el.getBoundingClientRect().top
const tabHeight = tab?.$el.getBoundingClientRect().height const tabHeight = tab?.$el.getBoundingClientRect().height
console.log('tabTop',tabTop)
const height = window.innerHeight - (tabTop) - (tabHeight) - 60 const height = window.innerHeight - (tabTop) - (tabHeight) - 60
return height return height
}) })
@ -444,7 +443,6 @@ const getFileList = async () => {
} }
// //
const getAnnexFileList = async (row:id) => { const getAnnexFileList = async (row:id) => {
console.log('getAnnexFileList')
props.annexTable?.forEach(async (item) => { props.annexTable?.forEach(async (item) => {
let requstData = {...remarksData.data,tableName: item?.tableName} let requstData = {...remarksData.data,tableName: item?.tableName}
const annexList = await FileApi.getFileList(requstData) const annexList = await FileApi.getFileList(requstData)
@ -472,7 +470,6 @@ const getAnnexFileList = async (row:id) => {
await getSubList() await getSubList()
item.subDetailTableData.tableList = subTableObject.tableList item.subDetailTableData.tableList = subTableObject.tableList
annexItem.subDetailTableData.tableList annexItem.subDetailTableData.tableList
console.log('subTableObject',annexTableData.value)
} }
} }
}) })

39
src/views/qms/basicDataManage/inspectionScheme/addForm.vue

@ -163,7 +163,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" v-if="isShowField !=0">
<el-form-item label="aql" prop="aql"> <el-form-item label="aql" prop="aql">
<el-select v-model="data.aql" placeholder="请选择aql"> <el-select v-model="data.aql" placeholder="请选择aql">
<el-option <el-option
@ -175,7 +175,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" v-if="isShowField!=0">
<el-form-item label="检验水平" prop="inspectionLevel"> <el-form-item label="检验水平" prop="inspectionLevel">
<el-select v-model="data.inspectionLevel" placeholder="请选择检验水平"> <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
<el-option <el-option
@ -761,6 +761,7 @@ const rules = ref({
{ required: true, message: '请输入选定集', trigger: 'blur' } { required: true, message: '请输入选定集', trigger: 'blur' }
] ]
}) })
const isShowField = ref(0)//aql 0 0
/** 打开弹窗 */ /** 打开弹窗 */
let tabIndex = 1 let tabIndex = 1
const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => { const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@ -771,6 +772,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
} }
formType.value = type formType.value = type
isShowField.value=0//isShowField == 0aql
if (row) { if (row) {
data.value = JSON.parse(JSON.stringify(row)) data.value = JSON.parse(JSON.stringify(row))
let list = [] let list = []
@ -779,7 +781,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
} else { } else {
list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode) list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
} }
rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
@ -797,7 +798,18 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) { if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
} }
if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
isShowField.value+=1//isShowField > 0aql
}
}) })
// aql
if( isShowField.value>0){
rules.value.aql[0].required = true
rules.value.aql[0].required = true
}else{
rules.value.aql[0].required = false
rules.value.aql[0].required = false
}
data.value.process = list data.value.process = list
} else { } else {
data.value = { data.value = {
@ -1085,14 +1097,10 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
} else if (formField == 'inspectionType') { } else if (formField == 'inspectionType') {
data.value.testTypeName = val[0].description data.value.testTypeName = val[0].description
} else if (formField == 'programmeTemplateCode') { } else if (formField == 'programmeTemplateCode') {
isShowField.value=0//isShowField == 0aql
data.value.programmeTemplateName = val[0].description data.value.programmeTemplateName = val[0].description
data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
data.value.dynamicUpdateName = val[0].dynamicUpdateName data.value.dynamicUpdateName = val[0].dynamicUpdateName
console.log(val[0])
}
if (formField == 'programmeTemplateCode') {
let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code) let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
@ -1111,11 +1119,20 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) { if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
} }
if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
isShowField.value+=1//isShowField > 0aql
}
}) })
// aql
if( isShowField.value>0){
rules.value.aql[0].required = true
rules.value.aql[0].required = true
}else{
rules.value.aql[0].required = false
rules.value.aql[0].required = false
}
data.value.process = list data.value.process = list
} }else if (formField == 'dynamicUpdateCode') {
if (formField == 'dynamicUpdateCode') {
data.value[formField] = val[0].code data.value[formField] = val[0].code
data.value.dynamicUpdateName = val[0].description data.value.dynamicUpdateName = val[0].description
} }

20
src/views/qms/inspection/inspectionJob/addForm.vue

@ -529,15 +529,15 @@ const submitForm = async () => {
if(data.value.packageList?.length>0){ if(data.value.packageList?.length>0){
const validateForm1 = await tableFormRef.value.validateForm() const validateForm1 = await tableFormRef.value.validateForm()
if (!validateForm1) return if (!validateForm1) return
let number = 0 // let number = 0
data.value.packageList.forEach(cur=>{ // data.value.packageList.forEach(cur=>{
number += parseFloat(cur.sampleAmount) // number += parseFloat(cur.sampleAmount)
}) // })
number = number.toFixed('2') // number = number.toFixed('2')
if(number != data.value.sampleTotalAmount){ // if(number != data.value.sampleTotalAmount){
message.error(`采样数量之和必须等于采样总数量`) // message.error(``)
return // return
} // }
} }
const bol2 = await validateForm(formFeaturesRef.value) const bol2 = await validateForm(formFeaturesRef.value)
@ -783,7 +783,7 @@ const resultEntryMethodChange = (e, item) => {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
if (e == 0) { if (e == 0) {
// rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
for (let i = 0; i < data.value.sampleTotalAmount; i++) { for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) {
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
inspectionValue: '', // inspectionValue: '', //
qualitativeCode: '', // qualitativeCode: '', //

28
src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{ // {
label: '采样总数量', // label: '采样总数量',
field: 'sampleTotalAmount', // field: 'sampleTotalAmount',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
form: { // form: {
componentProps:{ // componentProps:{
disabled:true // disabled:true
} // }
}, // },
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '检验类型', label: '检验类型',
field: 'inspectionType', field: 'inspectionType',

20
src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{ // {
label: '采样总数量', // label: '采样总数量',
field: 'sampleTotalAmount', // field: 'sampleTotalAmount',
sort: 'custom', // sort: 'custom',
isSearch: false, // isSearch: false,
isForm:false, // isForm:false,
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '检验类型', label: '检验类型',
field: 'inspectionType', field: 'inspectionType',

15
src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CustomersettleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CustomersettleRecordMain.allSchemas.searchSchema,...CustomersettleRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CustomersettleRecordMain.allSchemas" :allSchemas="CustomersettleRecordMain.allSchemas"
:detailAllSchemas="CustomersettleRecordDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -76,7 +77,7 @@ 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(CustomersettleRecordMain.allSchemas.tableColumns) const tableColumns = ref([...CustomersettleRecordMain.allSchemas.tableColumns,...CustomersettleRecordDetail.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
} }
// - // -
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [] return []
} }

29
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="CustomersettleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...CustomersettleRequestMain.allSchemas.searchSchema,...CustomersettleRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="CustomersettleRequestMain.allSchemas" :allSchemas="CustomersettleRequestMain.allSchemas"
:detailAllSchemas="CustomersettleRequestDetail.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -96,7 +97,7 @@ 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(CustomersettleRequestMain.allSchemas.tableColumns) const tableColumns = ref([...CustomersettleRequestMain.allSchemas.tableColumns,...CustomersettleRequestDetail.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -205,7 +206,11 @@ const isShowMainButton = (row,val) => {
} }
// - // -
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //
@ -224,7 +229,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?') await message.confirm('确认要关闭吗?')
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.close(row.id).then(() => { CustomersettleRequestMainApi.close(row.masterId).then(() => {
tableObject.loading = false tableObject.loading = false
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -234,7 +239,7 @@ const buttonTableClick = async (val, row) => {
}) } else if (val == 'mainReAdd') { // }) } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?') await message.confirm('确认要重新添加吗?')
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.reAdd(row.id).then(() => { CustomersettleRequestMainApi.reAdd(row.masterId).then(() => {
tableObject.loading = false tableObject.loading = false
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -245,7 +250,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // } else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?') await message.confirm('确认要提交审批吗?')
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.submit(row.id).then(() => { CustomersettleRequestMainApi.submit(row.masterId).then(() => {
tableObject.loading = false tableObject.loading = false
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -256,7 +261,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // } else if (val == 'mainTurnDown') { //
await message.confirm('确认要重新添加吗?') await message.confirm('确认要重新添加吗?')
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.refused(row.id).then(() => { CustomersettleRequestMainApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
}).catch(err => { }).catch(err => {
@ -264,7 +269,7 @@ const buttonTableClick = async (val, row) => {
}) })
} else if (val == 'mainApprove') { // } else if (val == 'mainApprove') { //
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.agree(row.id).then(() => { CustomersettleRequestMainApi.agree(row.masterId).then(() => {
tableObject.loading = false tableObject.loading = false
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
}) })
} else if (val == 'mainHandle') { // } else if (val == 'mainHandle') { //
tableObject.loading = true tableObject.loading = true
CustomersettleRequestMainApi.handle(row.id).then(() => { CustomersettleRequestMainApi.handle(row.masterId).then(() => {
tableObject.loading = false tableObject.loading = false
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -285,7 +290,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // } else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

21
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...StockupMainJob.allSchemas.searchSchema,...StockupDetailJob.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="StockupMainJob.allSchemas" :allSchemas="StockupMainJob.allSchemas"
:detailAllSchemas="StockupDetailJob.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -82,7 +83,7 @@ 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(StockupMainJob.allSchemas.tableColumns) const tableColumns = ref([...StockupMainJob.allSchemas.tableColumns,...StockupDetailJob.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -179,7 +180,11 @@ const isShowMainButton = (row,val) => {
} }
// - // -
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
@ -193,11 +198,11 @@ const buttonTableClick = async (val, row) => {
 if (val == 'mainJobExe') { //  if (val == 'mainJobExe') { //
handleHandle handleHandle
} else if (val == 'mainJobAba') { // } else if (val == 'mainJobAba') { //
StockupJobMainApi.abandonStockupMainJob(row.id) StockupJobMainApi.abandonStockupMainJob(row.masterId)
} else if (val == 'mainJobClo') { // } else if (val == 'mainJobClo') { //
StockupJobMainApi.closeStockupMainJob(row.id) StockupJobMainApi.closeStockupMainJob(row.masterId)
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') { //
StockupJobMainApi.acceptStockupMainJob(row.id) StockupJobMainApi.acceptStockupMainJob(row.masterId)
} }
} }
// //

15
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...StockupMainRecord.allSchemas.searchSchema,...StockupDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="StockupMainRecord.allSchemas" :allSchemas="StockupMainRecord.allSchemas"
:detailAllSchemas="StockupDetailRecord.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -32,8 +33,8 @@
<span>{{ row.number }}</span> <span>{{ row.number }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -77,7 +78,7 @@ 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(StockupMainRecord.allSchemas.tableColumns) const tableColumns = ref([...StockupMainRecord.allSchemas.tableColumns,...StockupDetailRecord.allSchemas.tableMainColumns])
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -126,7 +127,11 @@ const buttonBaseClick = (val, item) => {
} }
// - // -
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [] return []
} }

29
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@ -1,7 +1,7 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" /> <Search :schema="[...StockupMainRequest.allSchemas.searchSchema,...StockupDetailRequest.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap> </ContentWrap>
<!-- 列表头部 --> <!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns" @updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick" @searchFormClick="searchFormClick"
:allSchemas="StockupMainRequest.allSchemas" :allSchemas="StockupMainRequest.allSchemas"
:detailAllSchemas="StockupDetailRequest.allSchemas"
/> />
<!-- 列表 --> <!-- 列表 -->
@ -33,8 +34,8 @@
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" /> <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template> </template>
</Table> </Table>
</ContentWrap> </ContentWrap>
@ -100,7 +101,7 @@ 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(StockupMainRequest.allSchemas.tableColumns) const tableColumns = ref([...StockupMainRequest.allSchemas.tableColumns,...StockupDetailRequest.allSchemas.tableMainColumns])
const isShowButton = ref(true) const isShowButton = ref(true)
@ -228,7 +229,11 @@ const isShowMainButton = (row,val) => {
} }
// - // -
const butttondata = (row) => { const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //
@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // if (val == 'mainClose') { //
await message.confirm('确认要关闭吗?') await message.confirm('确认要关闭吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.close(row.id).then(() => { StockupMainRequestApi.close(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainReAdd') { // } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?') await message.confirm('确认要重新添加吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.reAdd(row.id).then(() => { StockupMainRequestApi.reAdd(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainSubmit') { // } else if (val == 'mainSubmit') { //
await message.confirm('确认要提交审批吗?') await message.confirm('确认要提交审批吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.submit(row.id).then(() => { StockupMainRequestApi.submit(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainTurnDown') { // } else if (val == 'mainTurnDown') { //
await message.confirm('确认要驳回吗?') await message.confirm('确认要驳回吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.refused(row.id).then(() => { StockupMainRequestApi.refused(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainApprove') { // } else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?') await message.confirm('确认要审批通过吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.agree(row.id).then(() => { StockupMainRequestApi.agree(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainHandle') { // } else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?') await message.confirm('确认要处理吗?')
tableObject.loading = true tableObject.loading = true
StockupMainRequestApi.handle(row.id).then(() => { StockupMainRequestApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
tableObject.loading = false tableObject.loading = false
getList() getList()
@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'edit') { // } else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.masterId)
} }
} }

1
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@ -283,7 +283,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isForm: false,
}, },
{ {
label: '备注', label: '备注',

63
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -776,40 +776,41 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
// //
const searchTableRef = ref() const searchTableRef = ref()
const labelPrint = async (row) => { const labelPrint = async (row) => {
// tableObject.loading = true console.log("------------",row);
// const subTableDFata = await PackageApi.getLabel(row.masterId) tableObject.loading = true
// tableObject.loading = false const subTableDFata = await PackageApi.getLabel(row.masterId)
// const tableObject1 = { tableObject.loading = false
// // const tableObject1 = {
// currentPage: 1, //
// // currentPage: 1,
// exportLoading: false, //
// // exportLoading: false,
// loading: false, //
// // loading: false,
// pageSize: subTableDFata.length, //
// params:null, pageSize: subTableDFata.length,
// // params:null,
// sort: { //
// order: '', // sort: {
// prop: '' // order: '', //
// }, prop: '' //
// // },
// total: subTableDFata.length, //
// // total: subTableDFata.length,
// tableList: subTableDFata, //
// currentRow:null tableList: subTableDFata,
// } currentRow:null
// console.log("",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas) }
console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
// const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
// tableColumns.forEach((item) => { tableColumns.forEach((item) => {
// item.width = item.table?.width || 150 item.width = item.table?.width || 150
// }) })
// searchTableRef.value.openData("",tableObject1,{tableColumns},true) searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
window.open(src.value + '&asn_number=' + row.asnNumber) // window.open(src.value + '&asn_number=' + row.asnNumber)
} }
// //
const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {

Loading…
Cancel
Save