-
+
次
-
+
小时
-
+
+ 次冻结24小时
+
+
+
+
+
天
-
+
天
@@ -98,8 +109,10 @@ const reset = () => {
ruleLevel: "简单",
ruleDesc: "",
tryCount: 3,
- lockMinutes: 1,
- updatePeriod: 1,
+ lockHours: 1,
+ updatePeriod: 30,
+ dayTryCount: 3,
+ updateRemind: 7,
}
}
const passwordConfig = ref({
@@ -107,8 +120,10 @@ const passwordConfig = ref({
ruleLevel: "简单",
ruleDesc: "",
tryCount: 3,
- lockMinutes: 1,
- updatePeriod: 1,
+ lockHours: 1,
+ updatePeriod: 30,
+ dayTryCount: 3,
+ updateRemind: 7,
})
/** 查询配置 */
const getConfig = async () => {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index b2c49ad62..a574f6429 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -215,9 +215,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['customerDockCode'] = val[0]['customerDockCode']
// 获取子表数据
- DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['masterId']})
- .then(res => {
-
+ DeliverRecordDetailApi.getDeliverRecordDetailPage({pageSize:999,masterId:val[0]['masterId']}).then(res => {
+
res.list.forEach(obj => {
let value = null
value = obj.fromLocationCode
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index cf3a42bfa..81e824a23 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -844,7 +844,8 @@ const onChangeForm = async (field, cur, formRef)=>{
console.log('subList',subList)
if(subList&&subList.length>0){
- tableData.value = subList.map(item=>({
+ tableData.value = subList.map((item,index)=>({
+ 'id':index,
'batch':item['batch'],
'inventoryStatus':item['inventoryStatus'],
'inventoryBalance':item['qty'],
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 9b57b0159..14d3475d7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -540,7 +540,7 @@ const butttondata = (row, $index) => {
{
label: t('ts.上传履历表'),
name: 'mainPlanCurriculumVitae',
- hide: row.status!=5,
+ hide: row.status==5,
type: 'primary',
icon: '',
color: '',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index a5c137240..6eb1f7bde 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -484,7 +484,10 @@ const detailBasicFormOnChange = (field, cur) => {
const handleDetailSubmitForm = async (formType, data) => {
if (formType === 'update') {
console.log('handleDetailSubmitForm',data)
- if(data.maxInvoicableQuantity>0){
+ if(data.invoicableQuantity==0){
+ message.error(t('ts.可开票数量不能为0'))
+ return
+ }else if(data.maxInvoicableQuantity>0){
if(data.invoicableQuantity<0||data.invoicableQuantity>data.maxInvoicableQuantity){
message.error(t('ts.可开票数量范围是')+`:0~${data.maxInvoicableQuantity}`)
return
@@ -1375,7 +1378,10 @@ const submitForm = async (formType, submitData) => {
tableData.value.forEach(item => {
// 负数:默认默认开票数~0
// 正数:0~默认开票数
- if(item.maxInvoicableQuantity){
+ if(item.invoicableQuantity==0){
+ flagInvoicableQuantity = true
+ message.error(`${item.itemCode}`+t('ts.可开票数量不能为0'))
+ }else if(item.maxInvoicableQuantity){
if(item.maxInvoicableQuantity>0){
if(item.invoicableQuantity<0||item.invoicableQuantity>item.maxInvoicableQuantity){
flagInvoicableQuantity = true
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 2e02b6143..4356beea3 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1806,12 +1806,14 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive