Browse Source

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

master_hella_20240701
陈薪名 5 months ago
parent
commit
c3b1abff33
  1. 4
      src/api/wms/purchasereceiptJobMain/index.ts
  2. 3
      src/locales/en-US.ts
  3. 1
      src/locales/zh-CN.ts
  4. 6
      src/utils/disposition/tabsList.ts
  5. 12
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  6. 2
      src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
  7. 35
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  8. 6
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

4
src/api/wms/purchasereceiptJobMain/index.ts

@ -136,6 +136,6 @@ export const acceptPurchasereceiptJobMain = (id: number) => {
}
// 拒收采购收货任务主
export const refusalPurchasereceiptJobMain = (id: number) => {
return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id })
export const refusalPurchasereceiptJobMain = (data) => {
return request.post({ url: '/wms/purchasereceipt-job-main/refusal',data})
}

3
src/locales/en-US.ts

@ -1137,7 +1137,8 @@ export default {
'驳回原因不能为空,且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words',
:'Batch release',
'重新生成标签会删除上次生成的标签,是否确认继续?':'Regenerating labels will delete the last generated label. Are you sure you want to continue?',
'确 认':'Confirm'
'确 认':'Confirm',
:'Please enter the reason for rejection'
},

1
src/locales/zh-CN.ts

@ -1138,6 +1138,7 @@ export default {
:'批量发布',
'重新生成标签会删除上次生成的标签,是否确认继续?':'重新生成标签会删除上次生成的标签,是否确认继续?',
'确 认':'确 认',
:'请输入拒收原因'
},
}

6
src/utils/disposition/tabsList.ts

@ -38,3 +38,9 @@ export const PurchasereceiptRequestTabsList = [{
}
]
export const PurchasereceiptRefuseRequestTabsList = [{
label: "拒收明细",
prop: 'receiptDetail',
}
]

12
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@ -73,6 +73,8 @@ import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import {getAccessToken} from "@/utils/auth";
import { getJmreportBaseUrl } from '@/utils/systemParam'
//
defineOptions({ name: 'ProductputawayJobMain' })
@ -156,6 +158,7 @@ const butttondata = (row,$index) => {
return []
}
return [
defaultButtons.mainListDocumentPrintBtn(null), //
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
@ -244,6 +247,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainJobAcc') { //
await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
getList()
} else if (val == 'documentPrint') {
//
handleDocumentPrint(row)
}
}
//
@ -256,6 +262,12 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue,'jobProductputawayMain')
}
const BASE_URL = getJmreportBaseUrl()
const src = ref(BASE_URL + '/jmreport/view/965858364788637696?token=' + getAccessToken())
const handleDocumentPrint = async (row) => {
window.open(src.value+'&id='+row.masterId)
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {

2
src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts

@ -575,7 +575,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
isDetail: false,
isForm: false,
table: {
width: 150,
width: 300,
fixed: 'right'
},
}

35
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -220,7 +220,7 @@ const butttondata = (row,$index) => {
{
label: '拒收',
name: 'mainJobRefusal',
hide: isShowMainButton(row, ['1']),
hide: isShowMainButton(row, ['2']),
type: 'primary',
icon: '',
color: '',
@ -249,8 +249,8 @@ const buttonTableClick = async (val, row) => {
//
checkQualityReport(row)
} else if(val == 'mainJobRefusal'){
handleRefusal(row.masterId)
getList()
// handleRefusal(row.masterId)
resonSubmit(row)
}
}
//
@ -270,12 +270,33 @@ const handleClose = async (id: number) => {
await getList()
} catch {}
}
const resonSubmit = async (row)=>{
ElMessageBox.prompt(t('ts.请输入拒收原因'), t('ts.提示'), {
confirmButtonText: t('common.ok'),
cancelButtonText: t('common.cancel'),
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, //
inputErrorMessage: t(`ts.${'驳回原因不能为空,且不超过256字'}`),
inputType:'textarea',
inputValidator:(value)=>{
if(value.length>60||value.length==0){
return false
}else{
return true
}
}
}).then(({ value }) => {
// 
handleRefusal(row.masterId,value)
})
.catch(() => {
})
}
/** 拒收按钮操作 */
const handleRefusal = async (id: number) => {
const handleRefusal = async (id: number,refuseReason:string) => {
// refuseReason
try {
await message.confirm(t('common.confirmRefusal'))
await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain(id)
await PurchasereceiptJobMainApi.refusalPurchasereceiptJobMain({id,refuseReason})
message.success(t('common.refusalSuccess'))
await getList()
} catch {}

6
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/index.vue

@ -58,7 +58,7 @@
:detailAllSchemas="detailAllSchemas"
:detailAllSchemasRules="PurchasereceiptRecordDetailRules"
:apiPage="apiPage"
:tabs="PurchasereceiptRequestTabsList"
:tabs="PurchasereceiptRefuseRequestTabsList"
@changeTabs="changeTabs"
:buttondataTable="buttondataTable"
@tableFormButton="tableFormButton"
@ -112,7 +112,7 @@ import { PurchasereceiptRecordMain,
import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
import { PurchasereceiptRefuseRequestTabsList } from '@/utils/disposition/tabsList'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { getReportUrl } from '@/utils/systemParam'
//
@ -314,7 +314,7 @@ const searchFormClick = (searchData) => {
const changeTabs = (data) =>{
if(data.prop == 'receiptDetail'){
console.log(data)
apiPage.value = routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
apiPage.value = routeName.value.includes('SCP')?PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSCP:PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailRefusePage
detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
tabeKey.value = 'receiptDetail'
}else if(data.prop == 'scarceGoodsDetail'){

Loading…
Cancel
Save