Browse Source

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

intex_online20250327
songguoqiang 1 month ago
parent
commit
70e75537be
  1. 6
      src/views/login/components/LoginForm.vue
  2. 2
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  3. 133
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  4. 24
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  5. 1774
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  6. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

6
src/views/login/components/LoginForm.vue

@ -71,7 +71,7 @@
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item>
<XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
<XButton :disabled="needCode&&!capctchaCheck" :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
@click="handleLogin()" />
</el-form-item>
@ -224,16 +224,19 @@ import { getSwitchByCode } from '@/api/wms/switch'
name: 'ForgetPassword',
})
};
const capctchaCheck = ref(false)
//
const capctchaCheckSuccess = async ({captchaVerification})=>{
console.log('capctchaCheckSuccess',captchaVerification)
if(captchaVerification){
capctchaCheck.value = true
loginData.loginForm.code = captchaVerification
await handleLogin()
}
}
//
const capctchaCheckError = ()=>{
capctchaCheck.value = false
console.log('capctchaCheckError')
}
@ -339,6 +342,7 @@ import { getSwitchByCode } from '@/api/wms/switch'
wsCache.set('ShowPackingNumber', res == 'TRUE' ? true : false)
})
}catch (e){
capctchaCheck.value = false
if(e.code === 1002000008){
setTimeout(function (){
router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}})

2
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@ -206,7 +206,7 @@ const butttondata = (row,$index) => {
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:countadjust-request-main:close'}), //
// defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:countadjust-request-main:reAdd'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:countadjust-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:countadjust-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:countadjust-request-main:agree'}), //

133
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -92,6 +92,9 @@
<Detail
ref="detailRef"
:isBasic="false"
:detailButtonIsShowAdd="false"
:detailButtonIsShowEdit="false"
:detailButtonIsShowDelete="false"
:allSchemas="UnplannedreceiptRequestMain.allSchemas"
:detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
:detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
@ -281,7 +284,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
tfk['itemCode'] = item['code']
tfk['uom'] = item['uom']
tfk['validityDays'] = item['validityDays']
tfk['isEnableBuy'] = val[0]['enableBuy']
tfk['isEnableBuy'] = val[0]['enableBuy']
tableData.value.push(tfk)
})
} else if (formField === 'costcentreCode') {
@ -554,7 +557,7 @@ const buttonTableClick = async (val, row) => {
//
tableObject.loading = true
try {
let isCreateLabel = false
let isCreateLabel = false
await PackageApi.getPackagePage({
requestNumber: row.number
}).then((res) => {
@ -564,7 +567,7 @@ const buttonTableClick = async (val, row) => {
})
if (isCreateLabel) {
message.warning('已创建过标签!!!')
tableObject.loading = false
tableObject.loading = false
return
}
console.log('列表-操作按钮事件-创建标签')
@ -579,7 +582,7 @@ const buttonTableClick = async (val, row) => {
}
//
// dialogVisible.value = true
tableObject.loading = false
tableObject.loading = false
formLabelRef.value.open('create', row)
console.log(detailListTableColumns.tableFormColumns)
detatableData.tableList.map((item) => {
@ -631,11 +634,10 @@ const buttonTableClick = async (val, row) => {
}
})
})
}finally {
} finally {
tableObject.loading = false
}
}
}
/** 关闭按钮操作 */
@ -866,7 +868,7 @@ const submitForm = async (formType, submitData) => {
try {
let newVal = data.subList.some((item) => item.isEnableBuy == 'TRUE')
let newVal1 = data.subList.some((item) => item.isEnableBuy == 'FALSE')
console.log(newVal,newVal1)
console.log(newVal, newVal1)
if (newVal && newVal1) {
message.warning('不能同时选择可制造和可采购的物料')
return
@ -955,25 +957,29 @@ const submitFormLabel = async (formType, data) => {
try {
formLabelRef.value.formLoading = true
detatableData.tableList.forEach(async (item) => {
const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode);
let convertRate = 1//
let purchaseUom = item.uom//
let purchaseStdQty//
if(unitConversion!=null){
if(unitConversion.convertRate!=null&&unitConversion.convertRate!='' && unitConversion.convertRate!=0){
convertRate = unitConversion.convertRate;
const unitConversion = await UnitConversionApi.getUnitConversionByCode(item.itemCode)
let convertRate = 1 //
let purchaseUom = item.uom //
let purchaseStdQty //
if (unitConversion != null) {
if (
unitConversion.convertRate != null &&
unitConversion.convertRate != '' &&
unitConversion.convertRate != 0
) {
convertRate = unitConversion.convertRate
}
if(unitConversion.purchaseUom!=null&&unitConversion.purchaseUom!='' ){
purchaseUom = unitConversion.purchaseUom;
if (unitConversion.purchaseUom != null && unitConversion.purchaseUom != '') {
purchaseUom = unitConversion.purchaseUom
}
}
let purchaseQty = (item.qty / convertRate).toFixed(5);//
purchaseStdQty = (item.packQty / convertRate).toFixed(5);//
item.purchaseQty = purchaseQty;//
item.convertRate = convertRate;//
item.purchaseStdQty = purchaseStdQty;//
item.purchaseUom = purchaseUom;//
console.log('item======================',item)
let purchaseQty = (item.qty / convertRate).toFixed(5) //
purchaseStdQty = (item.packQty / convertRate).toFixed(5) //
item.purchaseQty = purchaseQty //
item.convertRate = convertRate //
item.purchaseStdQty = purchaseStdQty //
item.purchaseUom = purchaseUom //
console.log('item======================', item)
await PackageApi.createPackageLabel(item)
.then((res) => {
isCreateLabel.value = true
@ -1067,49 +1073,68 @@ const labelPrint = async (row) => {
try {
await PackageApi.getPackagePage({
requestNumber: row.number
}).then((res) => {
if (res.list.length > 0) {
isCreateLabel.value = true
} else {
isCreateLabel.value = false
}
}).catch((err) => {
isCreateLabel.value = false
console.log(err)
})
.then((res) => {
if (res.list.length > 0) {
isCreateLabel.value = true
} else {
isCreateLabel.value = false
}
})
.catch((err) => {
isCreateLabel.value = false
console.log(err)
})
//
if (isCreateLabel.value) {
// labelPrint(row)
await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then(async (res) => {
if (res.length > 0) {
const itemType = res.some((item) => item.itemType == '可采购' && item.itemBasicType =='TOOL')//
const itemType2 = res.some((item) => item.itemType == '可采购' && item.itemBasicType !='TOOL')
const itemType = res.some(
(item) => item.itemType == '可采购' && item.itemBasicType == 'TOOL'
) //
const itemType2 = res.some(
(item) => item.itemType == '可采购' && item.itemBasicType != 'TOOL'
)
const itemType1 = res.some((item) => item.itemType == '可制造')
if (itemType) {
window.open( BASE_URL + '/jmreport/view/1028102732077142016?token=' + getAccessToken() + '&request_number=' + row.number )
window.open(
BASE_URL +
'/jmreport/view/1028102732077142016?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
}
if (itemType2) {
window.open( BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken() + '&request_number=' + row.number )
window.open(
BASE_URL +
'/jmreport/view/1016234988731322368?token=' +
getAccessToken() +
'&request_number=' +
row.number
)
}
if (itemType1) {
// window.open(src.value + '&request_number=' + row.number)
await PackageApi.batchPrintingLableForYT(row.number)
.then((res) => {
console.log(res)
const src = ref(
BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
)
window.open(src.value + '&asn_number=' + res)
})
.catch((err) => {
console.log(err)
message.error('创建标签失败')
})
}
if (itemType1) {
// window.open(src.value + '&request_number=' + row.number)
await PackageApi.batchPrintingLableForYT(row.number).then((res) => {
console.log(res)
const src = ref(
BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()
)
window.open(src.value + '&asn_number=' + res)
})
.catch((err) => {
console.log(err)
message.error('创建标签失败')
})
}
}
})
} else {
message.warning('请先创建标签')
}
})
} else {
message.warning('请先创建标签')
}
} finally {
tableObject.loading = false
}

24
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@ -1423,18 +1423,18 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
isTableForm: false,
isForm: false
},
{
label: '操作',
field: 'action',
isDetail: false,
hiddenInMain:true,
isForm: false ,
table: {
width: 150,
fixed: 'right'
},
isTableForm:false,
}
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// hiddenInMain:true,
// isForm: false ,
// table: {
// width: 150,
// fixed: 'right'
// },
// isTableForm:false,
// }
]))
function validateQty(rule, value, callback) {
if (value>0) {

1774
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

File diff suppressed because it is too large

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

@ -212,7 +212,7 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), //
defaultButtons.mainLisSelectiontPointBtn(null), //
// defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //

Loading…
Cancel
Save