Browse Source

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

master_hella_20240701
gaojs 7 months ago
parent
commit
55ffe17b39
  1. 9
      src/components/Detail/src/Detail.vue
  2. 1
      src/views/qms/basicDataManage/dynamicRule/index.vue
  3. 1
      src/views/qms/basicDataManage/inspectionTemplate/index.vue
  4. 7
      src/views/qms/basicDataManage/selectedSet/index.vue
  5. 4
      src/views/qms/inspection/inspectionJob/index.vue
  6. 4
      src/views/qms/inspection/inspectionRecord/index.vue
  7. 3
      src/views/qms/inspectionMethod/index.vue
  8. 1
      src/views/qms/qualityNotice/components/notaicType.vue
  9. 4
      src/views/qms/qualityNotice/components/qualityBatch.vue
  10. 1
      src/views/qms/qualityNotice/components/qualityNotice.vue
  11. 2
      src/views/qms/qualityNotice/index.vue
  12. 14
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  13. 96
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  14. 224
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
  15. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  16. 16
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  17. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
  18. 27
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  19. 22
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  20. 4
      src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

9
src/components/Detail/src/Detail.vue

@ -54,6 +54,7 @@
:pagination="{ total: tableObjectRef.total }" :pagination="{ total: tableObjectRef.total }"
v-model:pageSize="tableObjectRef.pageSize" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage" v-model:currentPage="tableObjectRef.currentPage"
v-model:sort="tableObjectRef.sort"
> >
<!-- <template #action="{ row }"> <!-- <template #action="{ row }">
<ButtonBase <ButtonBase
@ -70,6 +71,7 @@
:pagination="{ total: tableObjectRef.total }" :pagination="{ total: tableObjectRef.total }"
v-model:pageSize="tableObjectRef.pageSize" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage" v-model:currentPage="tableObjectRef.currentPage"
v-model:sort="tableObjectRef.sort"
> >
<template #photos="{ row }"> <template #photos="{ row }">
<div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div> </template> <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div> </template>
@ -118,6 +120,7 @@
:pagination="{ total: annexItem.subDetailTableData.tableList.length }" :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
v-model:pageSize="tableObjectRef.pageSize" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage" v-model:currentPage="tableObjectRef.currentPage"
v-model:sort="tableObjectRef.sort"
/> />
</ContentWrap> </ContentWrap>
@ -548,18 +551,18 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
titleNameRef.value = titleName titleNameRef.value = titleName
titleValueRef.value = titleValue titleValueRef.value = titleValue
remarksData.data = { remarksData.data = {
tableId: row.id, tableId: row.masterId||row.id,
tableName: tableName tableName: tableName
} }
count.value++ count.value++
// //
if (!props.isBasic) { if (!props.isBasic) {
// id // id
masterParmas.value.masterId = row.id masterParmas.value.masterId = row.masterId||row.id
masterParmas.value.number = row.number masterParmas.value.number = row.number
masterParmas.value.status = row.status masterParmas.value.status = row.status
tableObjectRef.value.params = { tableObjectRef.value.params = {
masterId: row.id masterId: row.masterId||row.id
} }
await getList() await getList()
} }

1
src/views/qms/basicDataManage/dynamicRule/index.vue

@ -306,7 +306,6 @@ const submitForm = async (formType, data) => {
return return
} }
data.inspectionStageDOList = tableData.value// data.inspectionStageDOList = tableData.value//
console.log(data.subList)
try { try {
if (formType === 'create') { if (formType === 'create') {
await DynamicRuleApi.createDynamicRule(data) await DynamicRuleApi.createDynamicRule(data)

1
src/views/qms/basicDataManage/inspectionTemplate/index.vue

@ -148,7 +148,6 @@ const openForm = (type: string, row?: any) => {
// form // form
const submitForm = async (formType,data) => { const submitForm = async (formType,data) => {
console.log(data.value)
if (formType === 'create') { if (formType === 'create') {
await InspectionProcessPageApi.inspectionTemplateCreat(data.value) await InspectionProcessPageApi.inspectionTemplateCreat(data.value)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))

7
src/views/qms/basicDataManage/selectedSet/index.vue

@ -110,9 +110,6 @@ const optionsList = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(SelectedSet.allSchemas.tableColumns) const tableColumns = ref(SelectedSet.allSchemas.tableColumns)
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => { nextTick(() => {
@ -324,7 +321,6 @@ const submitForm = async (formType, data) => {
dictionaryLabel dictionaryLabel
}; };
}); });
console.log(data.subList)
try { try {
if (formType === 'create') { if (formType === 'create') {
await SelectedSetApi.createSelectedSet(data) await SelectedSetApi.createSelectedSet(data)
@ -414,8 +410,6 @@ const detailOpenForm = (type, row, masterParmas) => {
const detailBasiFormOnChange = (field,val,detailFormRef) => { const detailBasiFormOnChange = (field,val,detailFormRef) => {
console.log(field)
console.log(33,detailFormRef)
if(field == 'dictionaryTypeAndCode'){ if(field == 'dictionaryTypeAndCode'){
// '-%%%-'' dictionaryCode // '-%%%-'' dictionaryCode
const [dictionaryCode, dictionaryValue] = val.split('-%%%-'); const [dictionaryCode, dictionaryValue] = val.split('-%%%-');
@ -432,7 +426,6 @@ const detailBasiFormOnChange = (field,val,detailFormRef) => {
} }
const formSelectChange = (a,b,c,d) => { const formSelectChange = (a,b,c,d) => {
console.log(111)
} }
const getDicDetails = ()=>{ const getDicDetails = ()=>{

4
src/views/qms/inspection/inspectionJob/index.vue

@ -66,7 +66,6 @@
import TableHead from '@/components/TableHead/src/TableHead.vue' import TableHead from '@/components/TableHead/src/TableHead.vue'
import AddForm from './addForm.vue' import AddForm from './addForm.vue'
import Detail from './detail.vue' import Detail from './detail.vue'
console.log(InspectionJobMain)
// //
defineOptions({ name: 'InspectionJobMain' }) defineOptions({ name: 'InspectionJobMain' })
@ -177,12 +176,10 @@ const listTableRef = ref()
const list = await InspectionJobMainApi.getInspectionJobPackageList(row.id) const list = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list) listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
}else if (val == 'mainJobAba') { // }else if (val == 'mainJobAba') { //
console.log('列表-操作按钮事件-放弃')
handleAbandon(row.id) handleAbandon(row.id)
} else if (val == 'mainJobClo') { // } else if (val == 'mainJobClo') { //
handleClose(row.id) handleClose(row.id)
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') { //
console.log('列表-操作按钮事件-承接')
handleAccept(row.id) handleAccept(row.id)
} }
} }
@ -270,7 +267,6 @@ const listTableRef = ref()
// //
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
console.log(data)
// return // return
try { try {
if (formType === 'create') { if (formType === 'create') {

4
src/views/qms/inspection/inspectionRecord/index.vue

@ -133,10 +133,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
const listTableRef = ref() const listTableRef = ref()
const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION) const useDecisionList = getStrDictOptions(DICT_TYPE.USAGE_DECISION)
console.log(11,useDecisionList)
// console.log(55,InspectionRecordMain.allSchemas.formSchema)
// const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision") // const useDecisionList = InspectionRecordMain.allSchemas.formSchema.filter(item=>item.field == "useDecision")
// console.log(11,useDecisionList)
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'applyDecision') { // if (val == 'applyDecision') { //
@ -145,7 +142,6 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{ InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) =>{
if(itemColumn.field == "useDecision"){ if(itemColumn.field == "useDecision"){
itemColumn.componentProps.options=useDecisionList?.filter(item=>item.value==1) itemColumn.componentProps.options=useDecisionList?.filter(item=>item.value==1)
console.log(88, useDecisionList)
} }
}) })
}else if(row.estimateCode == 2){ }else if(row.estimateCode == 2){

3
src/views/qms/inspectionMethod/index.vue

@ -43,7 +43,6 @@
ref="basicFormRef" ref="basicFormRef"
@success="formsSuccess" @success="formsSuccess"
:sumFormDataByForm ="(formRef,formModel)=>{ :sumFormDataByForm ="(formRef,formModel)=>{
console.log(formModel)
const {videoAddress} = formModel const {videoAddress} = formModel
formRef.value.setValues({ formRef.value.setValues({
installPackageUrl:videoAddress installPackageUrl:videoAddress
@ -156,8 +155,6 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = (type: string, row?: any) => { const openForm = (type: string, row?: any) => {
// debugger
console.log(row)
if(row && row.videoAddress.trim()){ if(row && row.videoAddress.trim()){
row.filePathList = row.videoAddress.split(',') row.filePathList = row.videoAddress.split(',')
} }

1
src/views/qms/qualityNotice/components/notaicType.vue

@ -176,7 +176,6 @@ nextTick(()=>{
q1.value = props.data?.q1 ? props.data?.q1 :{} q1.value = props.data?.q1 ? props.data?.q1 :{}
q2.value = props.data?.q2 ? props.data?.q2 :{} q2.value = props.data?.q2 ? props.data?.q2 :{}
q3.value = props.data?.q3 ? props.data?.q3 :{}, q3.value = props.data?.q3 ? props.data?.q3 :{},
console.log(998,props.data)
}) })
// //

4
src/views/qms/qualityNotice/components/qualityBatch.vue

@ -548,7 +548,6 @@ const buttonBaseClick1 = (val) => {
} }
dialogVisible.value = false dialogVisible.value = false
} else { } else {
console.log('error submit!')
return false return false
} }
}) })
@ -572,7 +571,6 @@ const buttonBaseClick1 = (val) => {
} }
dialogVisible.value = false dialogVisible.value = false
} else { } else {
console.log('error submit!')
return false return false
} }
}) })
@ -592,7 +590,6 @@ const buttonBaseClick1 = (val) => {
} }
dialogVisible.value = false dialogVisible.value = false
} else { } else {
console.log('error submit!')
return false return false
} }
}) })
@ -626,7 +623,6 @@ const buttonBaseClick1 = (val) => {
editableTabsValue.value = newTabName editableTabsValue.value = newTabName
dialogVisible.value = false dialogVisible.value = false
} else { } else {
console.log('error submit!')
return false return false
} }
}) })

1
src/views/qms/qualityNotice/components/qualityNotice.vue

@ -171,7 +171,6 @@ nextTick(()=>{
// //
const changeHalt= (e)=>{ const changeHalt= (e)=>{
console.log(rules.value.machineHaltStartTime[0])
if(e){ if(e){
rules.value.machineHaltStartTime[0].required = true rules.value.machineHaltStartTime[0].required = true
rules.value.machineHaltEndTime[0].required = true rules.value.machineHaltEndTime[0].required = true

2
src/views/qms/qualityNotice/index.vue

@ -183,8 +183,6 @@
// //
const submitForm = async (formType, data) => { const submitForm = async (formType, data) => {
console.log(data)
// return
try { try {
if (formType === 'create') { if (formType === 'create') {
await qualityNoticeApi.qualityNoticeCreat(data) await qualityNoticeApi.qualityNoticeCreat(data)

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

@ -68,6 +68,7 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue' import Detail from '@/components/Detail/src/Detail.vue'
import { formatTime } from '@/utils/index' import { formatTime } from '@/utils/index'
import { getAccessToken } from '@/utils/auth' import { getAccessToken } from '@/utils/auth'
import * as PackageApi from '@/api/wms/package'
defineOptions({ name: 'Callmaterials' }) defineOptions({ name: 'Callmaterials' })
@ -233,7 +234,7 @@ const handleExport = async () => {
} finally { } finally {
exportLoading.value = false exportLoading.value = false
} }
} }
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
@ -243,12 +244,19 @@ const handlePoint = async (row) => {
window.open(src.value+'&relateNumber='+row.id) window.open(src.value+'&relateNumber='+row.id)
} }
// //
const handleSelectionPoint = ()=>{ const handleSelectionPoint = async ()=>{
let rows:any = [] let rows:any = []
selectionRows.value.forEach(item=>{ selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)] rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
}) })
console.log('批量打印',rows) console.log('批量打印',rows.join(','))
await PackageApi.batchPrintingLable(rows.join(',')).then(res => {
console.log(res)
message.success('创建标签成功')
}).catch(err => {
console.log(err)
message.error('创建标签失败')
})
} }
/** 导入 */ /** 导入 */
const importFormRef = ref() const importFormRef = ref()

96
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -56,6 +56,7 @@
@searchTableSuccess="searchTableSuccess" @searchTableSuccess="searchTableSuccess"
@submitForm="submitForm" @submitForm="submitForm"
@formFormDateChange="formFormDateChange" @formFormDateChange="formFormDateChange"
@onEnter="onEnter"
/> />
<!-- 详情 --> <!-- 详情 -->
@ -115,6 +116,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { formatDate } from '@/utils/formatTime' import { formatDate } from '@/utils/formatTime'
import * as SupplieritemApi from '@/api/wms/supplieritem' import * as SupplieritemApi from '@/api/wms/supplieritem'
import { getAccessToken } from '@/utils/auth' import { getAccessToken } from '@/utils/auth'
import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
// //
defineOptions({ name: 'PurchasereceiptRequestMain' }) defineOptions({ name: 'PurchasereceiptRequestMain' })
@ -147,17 +150,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} else if(formField == 'poNumber') { } else if(formField == 'poNumber') {
row['poNumber'] = val[0]['number'] row['poNumber'] = val[0]['number']
} else if(formField == 'poLine'){ } else if(formField == 'poLine'){
row['poLine'] = val[0]['lineNumber'] //--
row['itemCode'] = val[0]['itemCode'] val.forEach(item=>{
row['uom'] = val[0]['uom'] if(tableData.value.find(item1=>item1['id'] == item['id'])) return
let supplierCode = formRef.formModel.supplierCode; const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
let itemCode = val[0]['itemCode'] newRow['poLine'] = item['lineNumber']
let queryData = { newRow['itemCode'] = item['itemCode']
supplierCode:supplierCode, newRow['uom'] = item['uom']
itemCode:itemCode newRow['poNumber'] = item['number']
} let supplierCode = formRef.formModel.supplierCode;
SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{ let queryData = {
row['defaultToLocationCode'] = res supplierCode:supplierCode,
itemCode: item['itemCode']
}
SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
newRow['defaultToLocationCode'] = res
tableData.value.push(newRow)
})
}) })
}else if (formField == 'packQty'){ }else if (formField == 'packQty'){
row['packQty'] = val[0]['packQty'] row['packQty'] = val[0]['packQty']
@ -165,12 +174,59 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
} else { } else {
const setV = {} const setV = {}
if(formField == 'supplierCode'){
setV['supplierCode'] = val[0]['code']
}else if(formField == 'ppNumber') {
//----
setV['supplierCode'] = val[0]['supplierCode']
setV['poNumber'] = val[0]['number']
const newRow = val[0]
newRow['poNumber'] = val[0]['number']
//
getSearchTableData(val[0]['number'])
// tableData.value = [newRow]
// formRef.handleAddTable()
}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['supplierCode'] = val[0]['code']
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
} }
const onEnter = async (field,value)=>{
console.log(field,value)
getSearchTableData(value,true)
}
const getSearchTableData = async (number,isEnter=false)=>{
const {tableObject ,tableMethods} = useTable({
defaultParams:{number},
getListApi: PurchaseDetailApi.getPurchaseDetailPage //
})
//
const { getList:getList1 } = tableMethods
await getList1()
const tableColumns = PurchaseDetail.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width || 150
})
tableData.value = []
tableObject.tableList.forEach(row=>{
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row}))
newRow['poLine'] = row['lineNumber']
newRow['itemCode'] = row['itemCode']
newRow['uom'] = row['uom']
newRow['poNumber'] =row['number']
newRow['defaultToLocationCode'] =row['defaultLocation']
tableData.value.push(newRow)
if(isEnter){
//--
const setV = {}
setV['poNumber'] = number
setV['supplierCode'] = row.supplierCode
formRef.value.formRef.setValues(setV)
}
})
}
// //
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => { nextTick(() => {
@ -275,25 +331,25 @@ const butttondata = (row) => {
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // if (val == 'mainClose') { //
handleClose(row.id) handleClose(row.masterId)
} else if (val == 'mainReAdd') { // } else if (val == 'mainReAdd') { //
handleReAdd(row.id) handleReAdd(row.masterId)
} else if (val == 'mainSubmit') { // } else if (val == 'mainSubmit') { //
handleSubmit(row.id) handleSubmit(row.masterId)
} else if (val == 'mainTurnDown') { // } else if (val == 'mainTurnDown') { //
handleRefused(row.id) handleRefused(row.masterId)
} else if (val == 'mainApprove') { // } else if (val == 'mainApprove') { //
handleAgree(row.id) handleAgree(row.masterId)
} else if (val == 'mainHandle') { // } else if (val == 'mainHandle') { //
handleHandle(row.id) handleHandle(row.masterId)
} else if (val == 'edit') { // } else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if(val == 'ssbq'){ // } else if(val == 'ssbq'){ //
// //
detatableData.params = { detatableData.params = {
masterId:row.id masterId:row.masterId
} }
genLabelId.value = row.id genLabelId.value = row.masterId
await getDetailList() await getDetailList()
formLabelRef.value.open('create', row, null,'createLabel')// createLabel formLabelRef.value.open('create', row, null,'createLabel')// createLabel
}else if (val == 'point') { }else if (val == 'point') {

224
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@ -51,24 +51,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isSearch: true, isSearch: true,
}, },
{ {
label: '供应商代码', label: '采购订单',
field: 'supplierCode', field: 'ppNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 180
}, },
isSearch: true,
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 searchListPlaceholder: '请选择采购订单', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'number', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题 searchTitle: '采购订单信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 searchPage: PurchaseMainApi.getPurchaseMainPage, // 查询弹窗所需分页方法
} }
} },
isForm: true,
}, },
{ {
label: '发货单号', label: '发货单号',
@ -80,42 +81,62 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isForm: true, isForm: true,
}, },
{ {
label: '要货计划单号', label: '供应商代码',
field: 'ppNumber', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
}, },
isSearch: true,
form: { form: {
// labelMessage: '信息提示说明!!!', // labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本 searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
searchTitle: '要货计划信息', // 查询弹窗标题 searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类 searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法 searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
searchCondition: [
{
key: 'supplierCode',
value: 'supplierCode',
message: '请填写供应商代码!',
isMainValue: true
},
{
key: 'status',
value: 4,
isMainValue: false
},
{
key: 'available',
value: "TRUE",
isMainValue: false
}]
} }
}, }
isForm: true,
}, },
// {
// label: '要货计划单号',
// field: 'ppNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// form: {
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// isSearchList: true, // 开启查询弹窗
// searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
// searchField: 'number', // 查询弹窗赋值字段
// searchTitle: '要货计划信息', // 查询弹窗标题
// searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
// searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
// searchCondition: [
// {
// key: 'supplierCode',
// value: 'supplierCode',
// message: '请填写供应商代码!',
// isMainValue: true
// },
// {
// key: 'status',
// value: 4,
// isMainValue: false
// },
// {
// key: 'available',
// value: "TRUE",
// isMainValue: false
// }]
// }
// },
// isForm: true,
// },
{ {
label: '承运商', label: '承运商',
field: 'carrierCode', field: 'carrierCode',
@ -142,22 +163,22 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
}, },
{ // {
label: '数据来源', // label: '数据来源',
field: 'sourceType', // field: 'sourceType',
dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, // dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
form: { // form: {
value: 'spare_PartsReceipt', // value: 'spare_PartsReceipt',
componentProps: { // componentProps: {
disabled: true // disabled: true
} // }
}, // },
isSearch: false, // isSearch: false,
}, // },
{ {
label: '从仓库代码', label: '从仓库代码',
field: 'fromWarehouseCode', field: 'fromWarehouseCode',
@ -304,50 +325,50 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
}, },
isForm: false, isForm: false,
}, },
{ // {
label: '截止时间', // label: '截止时间',
field: 'dueTime', // field: 'dueTime',
formatter: dateFormatter, // formatter: dateFormatter,
detail: { // detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' // dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, // },
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 180 // width: 180
}, // },
form: { // form: {
component: 'DatePicker', // component: 'DatePicker',
componentProps: { // componentProps: {
style: {width:'100%'}, // style: {width:'100%'},
type: 'datetime', // type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss', // dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', // valueFormat: 'x',
} // }
}, // },
}, // },
{ // {
label: '部门', // label: '部门',
field: 'departmentCode', // field: 'departmentCode',
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name // return userDeptArray.find((account) => account.id == cellValue)?.name
}, // },
form: { // form: {
value: userDept.id, // value: userDept.id,
component: 'Select', // component: 'Select',
api: () => userDeptArray, // api: () => userDeptArray,
componentProps: { // componentProps: {
disabled: true, // disabled: true,
optionsAlias: { // optionsAlias: {
labelField: 'name', // labelField: 'name',
valueField: 'id' // valueField: 'id'
} // }
} // }
} // }
}, // },
{ {
label: '状态', label: '状态',
field: 'status', field: 'status',
@ -477,6 +498,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
//表单校验 //表单校验
export const PurchasereceiptRequestMainRules = reactive({ export const PurchasereceiptRequestMainRules = reactive({
ppNumber: [
{ required: true, message: '请输入采购订单', trigger: 'blur' }
],
supplierCode: [ supplierCode: [
{ required: true, message: '请输入供应商代码', trigger: 'blur' } { required: true, message: '请输入供应商代码', trigger: 'blur' }
], ],
@ -486,9 +510,9 @@ export const PurchasereceiptRequestMainRules = reactive({
toAreaTypes: [ toAreaTypes: [
{ required: true, message: '请输入到库区类型范围', trigger: 'blur' } { required: true, message: '请输入到库区类型范围', trigger: 'blur' }
], ],
departmentCode: [ // departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' } // { required: true, message: '请输入部门', trigger: 'blur' }
], // ],
autoCommit: [ autoCommit: [
{ required: true, message: '请选择是否自动提交', trigger: 'change' } { required: true, message: '请选择是否自动提交', trigger: 'change' }
], ],

2
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -218,7 +218,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)
} }
} }

16
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -289,23 +289,23 @@ const getSearchTableData = async (number,formField,searchField)=>{
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPurPlanOpe') { // if (val == 'mainPurPlanOpe') { //
handleOpen(row.id) handleOpen(row.masterId)
} else if (val == 'mainPurPlanClo') {// } else if (val == 'mainPurPlanClo') {//
handleClose(row.id) handleClose(row.masterId)
} else if (val == 'mainPurPlanPub') { // } else if (val == 'mainPurPlanPub') { //
handlePublish(row.id) handlePublish(row.masterId)
} else if (val == 'mainPurPlanAcc') { // } else if (val == 'mainPurPlanAcc') { //
handleAcc(row.id) handleAcc(row.masterId)
} else if (val == 'mainPurPlanRej') { // } else if (val == 'mainPurPlanRej') { //
handleRej(row.id) handleRej(row.masterId)
} else if (val == 'mainPurPlanWit') { // } else if (val == 'mainPurPlanWit') { //
handleWit(row.id) handleWit(row.masterId)
} else if(val == 'mainPurPlanMod'){ // } else if(val == 'mainPurPlanMod'){ //
handleReOpen(row.id) handleReOpen(row.masterId)
}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)
} }
} }

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@ -157,7 +157,7 @@ const buttonTableClick = async (val, row) => {
handlerCreatePurchasereceiptRequest(row.number) handlerCreatePurchasereceiptRequest(row.number)
}else if (val == 'documentPrint') { }else if (val == 'documentPrint') {
// //
handleDocumentPrint(row.id) handleDocumentPrint(row.masterId)
} }
} }

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

@ -444,42 +444,42 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPurPlanOpe') { if (val == 'mainPurPlanOpe') {
// //
handleOpe(row.id) handleOpe(row.masterId)
} else if (val == 'mainPurPlanClo') { } else if (val == 'mainPurPlanClo') {
// //
handleClo(row.id) handleClo(row.masterId)
} else if (val == 'mainPlanUploadQualityReport') { } else if (val == 'mainPlanUploadQualityReport') {
// //
handleUploadQualityReport(row) handleUploadQualityReport(row)
} else if (val == 'mainPlanSub') { } else if (val == 'mainPlanSub') {
// //
handleSub(row.id) handleSub(row.masterId)
} else if (val == 'mainPlanApp') { } else if (val == 'mainPlanApp') {
// //
handleApp(row.id) handleApp(row.masterId)
} else if (val == 'mainPlanTur') { } else if (val == 'mainPlanTur') {
// //
handleTur(row.id) handleTur(row.masterId)
} else if (val == 'genRecords') { } else if (val == 'genRecords') {
// //
genRecords(row.id) genRecords(row.masterId)
} 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)
} else if (val == 'ssbq') { } else if (val == 'ssbq') {
await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => { await SupplierdeliverRequestMainApi.selfCheckReport(row.masterId).then(async (res) => {
if(!res){ if(!res){
message.warning("请先上传自检报告!") message.warning("请先上传自检报告!")
return return
}else{ }else{
// //
detatableData.params = { detatableData.params = {
masterId:row.id masterId:row.masterId
} }
genLabelId.value = row.id genLabelId.value = row.masterId
await getDetailList() await getDetailList()
formLabelRef.value.open('create', row, null,'createLabel')// createLabel formLabelRef.value.open('create', row, null,'createLabel')// createLabel
} }
@ -491,7 +491,7 @@ const buttonTableClick = async (val, row) => {
labelPrint(row) labelPrint(row)
} else if (val == 'documentPrint') { } else if (val == 'documentPrint') {
// //
handleDocumentPrint(row.id) handleDocumentPrint(row.masterId)
} }
} }
@ -598,9 +598,9 @@ const handleUploadQualityReport = async (row) => {
console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas) console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile') const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
if(uploadFile){ if(uploadFile){
uploadFile['componentProps']['upData']['tableId'] = row.id uploadFile['componentProps']['upData']['tableId'] = row.masterId
} }
ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')// createLabel ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质量报告')// createLabel
const tableFormKeys = {} const tableFormKeys = {}
SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => { SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
tableFormKeys[item.field] = item.default ? item.default : '' tableFormKeys[item.field] = item.default ? item.default : ''
@ -736,6 +736,7 @@ const submitFormLabel = async (formType, data) => {
await SupplierdeliverRequestMainApi.genLabel(data) await SupplierdeliverRequestMainApi.genLabel(data)
isCreateLabel.value = true isCreateLabel.value = true
message.success('创建标签成功') message.success('创建标签成功')
getList()
} finally { } finally {
formLabelRef.value.formLoading = false formLabelRef.value.formLoading = false
formLabelRef.value.dialogVisible = false formLabelRef.value.dialogVisible = false

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

@ -329,27 +329,27 @@ const handleImport = () => {
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainPurPlanOpe') { // if (val == 'mainPurPlanOpe') { //
handleOpe(row.id) handleOpe(row.masterId)
} else if (val == 'mainPurPlanClo') {// } else if (val == 'mainPurPlanClo') {//
handleClo(row.id) handleClo(row.masterId)
} else if (val == 'mainPlanSub') { // } else if (val == 'mainPlanSub') { //
handleSub(row.id) handleSub(row.masterId)
} else if (val == 'purchase_mainPlanSub') { // } else if (val == 'purchase_mainPlanSub') { //
handleApp(row.id) handleApp(row.masterId)
} else if (val == 'purchase_mainPlanTur') { // } else if (val == 'purchase_mainPlanTur') { //
handleTur(row.id) handleTur(row.masterId)
} else if (val == 'invoice_sent_out') { // } else if (val == 'invoice_sent_out') { //
handleInvoiceSentOut(row.id) handleInvoiceSentOut(row.masterId)
} else if(val == 'finance_mainPlanSub'){ // } else if(val == 'finance_mainPlanSub'){ //
handleFinanceApp(row.id) handleFinanceApp(row.masterId)
} else if(val == 'finance_mainPlanTur'){ // } else if(val == 'finance_mainPlanTur'){ //
handleFinaceTur(row.id) handleFinaceTur(row.masterId)
} else if (val == 'genRecords') { // } else if (val == 'genRecords') { //
genRecords(row.id) genRecords(row.masterId)
} 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)
} }
} }
@ -368,7 +368,7 @@ const handleImport = () => {
const openDetail = (row : any, titleName : any, titleValue : any) => { const openDetail = (row : any, titleName : any, titleValue : any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
clicKRowId.value = row.id clicKRowId.value = row.masterId
detailRef.value.openDetail(row, titleName, titleValue) detailRef.value.openDetail(row, titleName, titleValue)
} }

4
src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

@ -171,9 +171,9 @@ const buttonTableClick = async (val, row) => {
if (val == 'edit') { // if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.masterId)
} else if(val == 'agree'){ } else if(val == 'agree'){
handleAgree(row.id) handleAgree(row.masterId)
} }
} }

Loading…
Cancel
Save