diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 39f28f658..9c821055b 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -4,7 +4,14 @@
-->
-
+
+
+
+

+
欢迎使用供应商系统!
+
+
+
@@ -12,8 +19,55 @@
+
diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
index 37f4b2b33..a381d0664 100644
--- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts
@@ -5,7 +5,10 @@ import {
} from '../moldAllocation/customerStatement/customerStatementMain.data'
import * as CustomerStatementMainApi from '@/api/wms/customerStatementMain'
import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
const { t } = useI18n() // 国际化
+const invoiceType = [{label:'全部',value:''},...getDictOptions(DICT_TYPE.INVOICE_TYPE)]
+console.log(888, invoiceType)
let custormList = []
try {
@@ -255,31 +258,22 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([
{
label: '开票种类',
field: 'invoiceType',
- dictType: DICT_TYPE.INVOICE_TYPE,
+ // dictType: DICT_TYPE.INVOICE_TYPE,
dictClass: 'string',
table: {
width: 150
},
- // form: {
- // component: 'Select',
- // value:[''],
- // componentProps: {
- // showAll: true,// 备用做全选
- // multiple: true,
- // // emptyValues:[null, undefined],
- // valueOnClear: null,
- // options: [{
- // label: '全部',
- // value: ''
- // }, {
- // label: '号口品',
- // value: '号口品'
- // }, {
- // label: '补给品',
- // value: '补给品'
- // }]
- // }
- // },
+ form: {
+ component: 'Select',
+ value:[''],
+ componentProps: {
+ // showAll: true,// 备用做全选
+ multiple: true,
+ // emptyValues:[null, undefined],
+ valueOnClear: null,
+ options: invoiceType
+ }
+ },
},
{
label: '创建时间',
@@ -455,7 +449,8 @@ form:{
width: 150
},
tableForm: {
- disabled:true
+ disabled: true,
+ type:'Select',
}
},
{
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index d46c67595..5c081e94b 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
@@ -461,7 +461,7 @@ const submitForm = async (formType, submitData) => {
return
}
- let findInventoryStatus = tableData.value.find(item=>item.fromBatch&&item.toBatch)
+ let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen&&item.fromBatch==item.toBatch)
if(findInventoryStatus){
message.warning('您未修改数据')
return