Browse Source

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

master_hella_20240701
ljlong_2630 6 months ago
parent
commit
d10ee54864
  1. 2
      .env
  2. 2
      README.md
  3. 6
      index.html
  4. BIN
      src/assets/imgs/login-bg.png
  5. BIN
      src/assets/imgs/login-bg1.png
  6. BIN
      src/assets/imgs/logo1.png
  7. 22
      src/views/login/login.vue
  8. 2
      src/views/mes/orderDay/components/schedule.vue
  9. 7
      src/views/mes/workScheduling/index.vue
  10. 1
      src/views/system/user/UserForm.vue
  11. 16
      src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts
  12. 23
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  13. 1
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
  14. 138
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
  15. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  16. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  17. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
  18. 1
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  19. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

2
.env

@ -1,5 +1,5 @@
# 标题
VITE_APP_TITLE=富维海拉管理系统
VITE_APP_TITLE=富维海拉智慧工厂管理平台
# 项目本地运行端口号
VITE_PORT=80

2
README.md

@ -10,6 +10,8 @@ form: {
searchTitle: '生产线物料关系信息', // 查询弹窗标题
hiddenFilterButton:true,//是否隐藏筛选按钮
dialogWidth:'100px',//搜索出来弹窗的宽度
isConcatDetailSchemas:true, // 是否主子表合并
searchDetailSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需子表类
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{

6
index.html

@ -3,16 +3,16 @@
<head>
<meta charset="UTF-8" />
<!-- <link rel="icon" href="/favicon.ico" /> -->
<!-- <link rel="icon" href="/src/assets/imgs/logo1.png" /> -->
<link rel="icon" href="/src/assets/imgs/logo1.png" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta
name="keywords"
content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!"
content="富维海拉智慧工厂管理平台 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!"
/>
<meta
name="description"
content="富维海拉管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!"
content="富维海拉智慧工厂管理平台 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!"
/>
<title>%VITE_APP_TITLE%</title>
</head>

BIN
src/assets/imgs/login-bg.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 KiB

BIN
src/assets/imgs/login-bg1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

BIN
src/assets/imgs/logo1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 52 KiB

22
src/views/login/login.vue

@ -1,14 +1,14 @@
<template>
<div
:class="prefixCls"
class="relative h-[100%] lt-xl:bg-[var(--login-bg-color)] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px"
:class="`${prefixCls} ${prefixCls}__left`"
class="relative h-[100%] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px"
>
<div class="relative mx-auto h-full flex">
<div
:class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"
:class="` flex-1 bg-opacity-20 relative p-30px lt-xl:hidden`"
>
<!-- 左上角的 logo + 系统标题 -->
<div class="relative flex items-center text-white">
<div class="relative flex items-center ">
<img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div>
@ -19,18 +19,18 @@
enter-active-class="animate__animated animate__bounceInLeft"
tag="div"
>
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div>
<!-- <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> -->
<!-- <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> -->
<div key="3" class="mt-5 text-14px font-normal text-white">
{{ t('login.message') }}
</div>
</TransitionGroup>
</div>
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<div class="relative flex-1 p-30px lt-sm:p-10px">
<!-- 右上角的主题语言选择 -->
<div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
class="flex items-center justify-between at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
<img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
@ -38,7 +38,7 @@
</div>
<div class="flex items-center justify-end space-x-10px">
<!-- <ThemeSwitch /> -->
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
<LocaleDropdown class="dark:text-white " />
</div>
</div>
<!-- 右边的登录界面 -->
@ -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: '';
}
}
}
</style>

2
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 () =>{

7
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("当前工序不是完工工序,不能进行完工操作!")
}
}

1
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: [
{

16
src/views/wms/agvManage/interfaceInfo/interfaceInfo.data.ts

@ -50,6 +50,22 @@ export const InterfaceInfo = useCrudSchemas(reactive<CrudSchema[]>([
},
isSearch: true,
},
{
label: '业务编号',
field: 'businessNumber',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '业务ID',
field: 'businessId',
sort: 'custom',
table: {
width: 180,
},
},
{
label: '请求地址',
field: 'url',

23
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@ -503,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
hiddenInMain: true,
isTableForm: false,
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
@ -751,28 +752,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
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',

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

@ -857,6 +857,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
label: '操作',
field: 'action',
isDetail: false,
hiddenInMain:true,
isForm: false ,
table: {
width: 150,

138
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@ -28,6 +28,137 @@ const queryParams = {
userDept.id = userDept.id.toString()
const userDeptArray:any = [userDept]
// 采购收货记录展示列
const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
{
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<CrudSchema[]>([
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<CrudSc
isTableForm: true,
isForm: true
},
]))
]))

2
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@ -40,7 +40,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -39,7 +39,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',

2
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@ -39,7 +39,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',

1
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@ -201,6 +201,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
},
isTable:false,
form: {
disabled:true,
component: 'DatePicker',
componentProps: {
style: { width: '100%' },

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -147,7 +147,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '供应商信息', // 查询弹窗标题
searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
searchPage: SupplierApi.getSupplierPageSCP // 查询弹窗所需分页方法
}
}
},

Loading…
Cancel
Save