-
-
+
{{ underlineToHump(appStore.getTitle) }}
@@ -19,18 +19,18 @@
enter-active-class="animate__animated animate__bounceInLeft"
tag="div"
>
- 
-
{{ underlineToHump(appStore.getTitle) }}
- {{ t('login.welcome') }}
+
+
{{ t('login.message') }}
+
@@ -38,7 +38,7 @@
@@ -94,11 +94,13 @@ $prefix-cls: #{$namespace}-login;
z-index: -1;
width: 100%;
height: 100%;
- background-image: url('@/assets/svgs/login-bg.svg');
+ // background-image: url('@/assets/svgs/login-bg.svg');
+ background-image: url('@/assets/imgs/login-bg.png');
background-position: center;
background-repeat: no-repeat;
content: '';
}
}
}
+
diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index eccbefcd7..0a8db8e45 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -706,7 +706,9 @@ const deleteEquipment=(row)=>{
/*删除选择的班组人员*/
const deleteUser=(row)=>{
+ console.log("workerData.value.709",workerData.value)
workerData.value.splice(workerData.value.indexOf(row),1)
+ console.log("workerData.value.711",workerData.value)
}
/*班组人员保存接口*/
const saveUser = async () =>{
diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue
index 915c52ea2..4e2bba17f 100644
--- a/src/views/mes/workScheduling/index.vue
+++ b/src/views/mes/workScheduling/index.vue
@@ -230,11 +230,14 @@ const finishReport=async(row)=>{
processCode:row.workingNode
}
//console.log("workscheduling-finishReport-213",row)
- let res=await WorkSchedulingApi.getNodePosition(params)
- if(res==='end'){
+ if(row.workingNode=='endNode'){
//reportFinishRef.value.openDetail(row,"完工")
WorkSchedulingApi.completeHandle(params)
}else{
+ // let res=await WorkSchedulingApi.getNodePosition(params)
+ // if(res){
+
+ // }
message.alert("当前工序不是完工工序，不能进行完工操作！")
}
}
diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue
index 60583b826..8e880a02a 100644
--- a/src/views/system/user/UserForm.vue
+++ b/src/views/system/user/UserForm.vue
@@ -129,6 +129,7 @@ const formData = ref({
const formRules = reactive({
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
+ deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
email: [
{
diff --git a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
index 03b579e46..d5dc1c983 100644
--- a/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
+++ b/src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
@@ -50,6 +50,22 @@ export const InterfaceInfo = useCrudSchemas(reactive([
},
isSearch: true,
},
+ {
+ label: '业务编号',
+ field: 'businessNumber',
+ sort: 'custom',
+ table: {
+ width: 180,
+ },
+ },
+ {
+ label: '业务ID',
+ field: 'businessId',
+ sort: 'custom',
+ table: {
+ width: 180,
+ },
+ },
{
label: '请求地址',
field: 'url',
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index 150705354..9edde7acb 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -503,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ hiddenInMain: true,
isTableForm: false,
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
@@ -751,28 +752,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([
isTableForm: false,
isForm: false,
},
- {
- label: '计划数量',
- field: 'planQty',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- form: {
- component: 'InputNumber',
- componentProps: {
- min: 0,
- precision: 6
- }
- },
- tableForm: {
- type: 'InputNumber',
- min: 0,
- precision: 6
- }
- },
-
{
label: '最后更新时间',
field: 'updateTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index d54304c6c..aa618a17e 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -857,6 +857,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive([
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ fixed: 'left',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '发货单号',
+ field: 'asnNumber',
+ sort: 'custom',
+ table: {
+ width: 180
+ },
+ isSearch: true
+ },
+ {
+ label: '采购订单号',
+ field: 'poNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isSearch: true
+ },
+ {
+ label: '订单行',
+ field: 'poLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+ field: 'fromBatch',
+ sort: 'custom',
+ isForm:false,
+ isTableForm:false,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装规格',
+ field: 'packUnit',
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '包装数量',
+ field: 'packQty',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'InputNumber',
+ },
+ tableForm: {
+ disabled: true,
+ },
+ isForm:false,
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+
+
+]))
+
/**
* @returns {Array} 采购退货申请主表
*/
@@ -99,9 +230,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([
searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: '采购收货记录', // 查询弹窗标题
- isConcatDetailSchemas:true,
- searchDetailSchemas: PurchasereceiptRecordDetail.allSchemas,
- searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+ searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
searchCondition: [
{
@@ -1454,4 +1583,5 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
- searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index c061dea6f..0f3d629ca 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -39,7 +39,7 @@ export const PurchaseMain = useCrudSchemas(reactive([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
- searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index f9027e7e8..584a70016 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -39,7 +39,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
- searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
+ searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 1a6818499..3e42b6e1a 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -201,6 +201,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive(
},
isTable:false,
form: {
+ disabled:true,
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 28b34d9d1..1ed0e3075 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -147,7 +147,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
- searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+ searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
}
}
},
@@ -38,7 +38,7 @@
-