Browse Source

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

master_hella_20240701
zhousq 7 months ago
parent
commit
e947530d25
  1. 37
      .env.wyf
  2. 1
      package.json
  3. 57
      src/api/system/user/index.ts
  4. 6
      src/api/wms/package/index.ts
  5. 6
      src/components/Detail/src/Detail.vue
  6. 3
      src/permission.ts
  7. 16
      src/router/modules/remaining.ts
  8. 10
      src/views/login/aa.vue
  9. 172
      src/views/login/components/LoginForm.vue
  10. 72
      src/views/login/forgetPassword.vue
  11. 78
      src/views/login/updatePassword.vue
  12. 11
      src/views/wms/basicDataManage/documentSetting/switch/index.vue
  13. 2
      src/views/wms/basicDataManage/itemManage/itemarea/index.vue
  14. 26
      src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
  15. 47
      src/views/wms/basicDataManage/labelManage/callmaterials/index.vue
  16. 39
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
  17. 10
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
  18. 5
      src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
  19. 5
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
  20. 5
      src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
  21. 5
      src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
  22. 6
      src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
  23. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  24. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
  25. 5
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  26. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
  27. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
  28. 5
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  29. 5
      src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
  30. 5
      src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
  31. 5
      src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
  32. 5
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
  33. 5
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
  34. 5
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
  35. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
  36. 6
      src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
  37. 5
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
  38. 6
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  39. 11
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  40. 5
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue
  41. 6
      src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
  42. 19
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
  43. 6
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  44. 36
      src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

37
.env.wyf

@ -0,0 +1,37 @@
# 生产环境
NODE_ENV=test
VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://dev.ccwin-in.com:25300/api'
# 上传路径
VITE_UPLOAD_URL='http://dev.ccwin-in.com:25300/api/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
# 是否删除debugger
VITE_DROP_DEBUGGER=true
# 是否删除console.log
VITE_DROP_CONSOLE=true
# 是否sourcemap
VITE_SOURCEMAP=false
# 打包路径
VITE_BASE_PATH=/
# 输出路径
VITE_OUT_DIR=sfms3.0
# 自定义接口路径
VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
# 积木报表请求路径
VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'

1
package.json

@ -6,6 +6,7 @@
"private": false,
"scripts": {
"dev": "vite",
"wyf": "vite --mode wyf",
"test": "vite build --mode test",
"hella8": "vite build --mode hella8",
"hella9": "vite build --mode hella9",

57
src/api/system/user/index.ts

@ -1,28 +1,29 @@
import request from '@/config/axios'
export interface UserVO {
id: number
username: string
nickname: string
deptId: number
postIds: string[]
email: string
mobile: string
sex: number
avatar: string
loginIp: string
status: number
remark: string
loginDate: Date
createTime: Date
userType :string
id : number
username : string
nickname : string
deptId : number
postIds : string[]
email : string
mobile : string
sex : number
avatar : string
loginIp : string
status : number
remark : string
loginDate : Date
createTime : Date
userType : string
mailKey : string
}
export const getUserPage = async (params) => {
console.log(params)
if (params.isSearch) {
delete params.isSearch
const data = {...params}
const data = { ...params }
return await request.post({ url: '/system/user/senior', data })
} else {
return await request.get({ url: '/system/user/page', params })
@ -35,22 +36,22 @@ export const getUserPage = async (params) => {
// }
// 查询用户详情
export const getUser = (id: number) => {
export const getUser = (id : number) => {
return request.get({ url: '/system/user/get?id=' + id })
}
// 新增用户
export const createUser = (data: UserVO) => {
export const createUser = (data : UserVO) => {
return request.post({ url: '/system/user/create', data })
}
// 修改用户
export const updateUser = (data: UserVO) => {
export const updateUser = (data : UserVO) => {
return request.put({ url: '/system/user/update', data })
}
// 删除用户
export const deleteUser = (id: number) => {
export const deleteUser = (id : number) => {
return request.delete({ url: '/system/user/delete?id=' + id })
}
@ -65,7 +66,7 @@ export const importUserTemplate = () => {
}
// 用户密码重置
export const resetUserPwd = (id: number, password: string) => {
export const resetUserPwd = (id : number, password : string) => {
const data = {
id,
password
@ -74,7 +75,7 @@ export const resetUserPwd = (id: number, password: string) => {
}
// 用户状态修改
export const updateUserStatus = (id: number, status: number) => {
export const updateUserStatus = (id : number, status : number) => {
const data = {
id,
status
@ -83,6 +84,16 @@ export const updateUserStatus = (id: number, status: number) => {
}
// 获取用户精简信息列表
export const getSimpleUserList = (): Promise<UserVO[]> => {
export const getSimpleUserList = () : Promise<UserVO[]> => {
return request.get({ url: '/system/user/list-all-simple' })
}
// 忘记密码
export const forgetPassword = (data : UserVO) => {
return request.put({ url: '/system/user/forgetPassword', data })
}
// 忘记密码->修改密码
export const updatePassword = (data : UserVO) => {
return request.put({ url: '/system/user/updatePassword', data })
}

6
src/api/wms/package/index.ts

@ -94,3 +94,9 @@ export const importTemplate = () => {
export const createPackageLabel = async (data: PackageVO) => {
return await request.post({ url: `/wms/package/createLabel`, data })
}
// 创建标签
export const createBatchPrintingLable = async (data: PackageVO) => {
return await request.post({ url: `/wms/package/batchPrintingLable`, data })
}

6
src/components/Detail/src/Detail.vue

@ -97,7 +97,7 @@
</DetailTable>
</ContentWrap>
<!-- other附件组件:如质检明细 -->
<div v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexTableData.some(item=>item.label==tabsList[current].label)" class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
<div v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexItem.label==tabsList[current].label" class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
<ContentWrap class="w-[100%]">
<ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
<Annex v-show="tabsList[current].label==annexItem.label"
@ -108,7 +108,7 @@
/>
</ElScrollbar>
</ContentWrap>
<ContentWrap class="w-[100%]">
<ContentWrap class="w-[100%]" v-if="annexItem.subDetailTableData">
<Table
v-if="!isBasic && fromeWhere != 'countPlan'"
:align="annexItem.align?annexItem.align:'center'"
@ -451,7 +451,7 @@ const getAnnexFileList = async (row:id) => {
tableName: item?.tableName || '',
annexList,
hasSubDetail:item.hasSubDetail||false,
subDetailTableData:item.subDetailTableData||{}
subDetailTableData:item.subDetailTableData
})
if(item?.subDetailTableData){
const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({

3
src/permission.ts

@ -15,7 +15,8 @@ const { loadStart, loadDone } = usePageLoading()
// 路由不重定向白名单
const whiteList = [
'/login',
'/aa',
'/forgetPassword',
'/updatePassword',
'/social-login',
'/auth-redirect',
'/bind',

16
src/router/modules/remaining.ts

@ -185,9 +185,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
noTagsView: true
}
},{
path: '/aa',
component: () => import('@/views/login/aa.vue'),
name: 'Aa',
path: '/forgetPassword',
component: () => import('@/views/login/forgetPassword.vue'),
name: 'ForgetPassword',
meta: {
hidden: true,
title: t('router.login'),
noTagsView: true
}
},
{
path: '/updatePassword',
component: () => import('@/views/login/updatePassword.vue'),
name: 'UpdatePassword',
meta: {
hidden: true,
title: t('router.login'),

10
src/views/login/aa.vue

@ -1,10 +0,0 @@
<template>
<div>11</div>
</template>
<script lang="ts" setup>
</script>
<style lang="scss" scoped>
</style>

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

@ -1,5 +1,6 @@
<template>
<el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules" class="login-form" label-position="top" label-width="120px" size="large">
<el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules" class="login-form"
label-position="top" label-width="120px" size="large">
<el-row style="margin-right: -10px; margin-left: -10px">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item>
@ -8,23 +9,27 @@
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')" :prefix-icon="iconHouse" link type="primary" />
<el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse" link type="primary" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="username">
<el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')" :prefix-icon="iconAvatar" style="height: 42px;" />
<el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
:prefix-icon="iconAvatar" style="height: 42px;" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="password">
<el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')" :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
<el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
:prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" style="height: 42px;" />
</el-form-item>
</el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="code">
<div class="flex w-[100%]">
<el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')" style="width: 76%;margin-right: 10px;height: 42px;" @keyup.enter="handleLogin()">
<el-input v-model="loginData.loginForm.code" :placeholder="t('login.codePlaceholder')"
style="width: 76%;margin-right: 10px;height: 42px;" @keyup.enter="handleLogin()">
<template #prefix>
<img src="@/assets/imgs/code.png" alt="" style="width: 16px;height: 16px;" />
</template>
@ -44,14 +49,17 @@
</el-checkbox>
</el-col>
<el-col :offset="6" :span="12">
<el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
<el-link style="float: right" type="primary"
@click="handleUpdate()">{{ t('login.forgetPassword') }}</el-link>
<!-- <el-button type="text" icon="Edit">忘记密码按钮</el-button> -->
</el-col>
</el-row>
</el-form-item>
</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" @click="handleLogin()" />
<XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
@click="handleLogin()" />
</el-form-item>
</el-col>
<!-- <Verify
@ -65,49 +73,50 @@
</el-form>
</template>
<script lang="ts" setup>
import { ElLoading } from 'element-plus'
import LoginFormTitle from './LoginFormTitle.vue'
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import { ElLoading } from 'element-plus'
import LoginFormTitle from './LoginFormTitle.vue'
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import { useIcon } from '@/hooks/web/useIcon'
import { useIcon } from '@/hooks/web/useIcon'
import * as authUtil from '@/utils/auth'
import { usePermissionStore } from '@/store/modules/permission'
import * as LoginApi from '@/api/login'
import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
import { getCodeImg } from "@/api/login";
import * as authUtil from '@/utils/auth'
import { usePermissionStore } from '@/store/modules/permission'
import * as LoginApi from '@/api/login'
import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
import { getCodeImg } from "@/api/login";
import router from "@/router";
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import * as DeptApi from '@/api/system/dept'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import * as DeptApi from '@/api/system/dept'
defineOptions({ name: 'LoginForm' })
defineOptions({ name: 'LoginForm' })
const { t } = useI18n()
const message = useMessage()
const iconHouse = useIcon({ icon: 'ep:house' })
const iconAvatar = useIcon({ icon: 'ep:avatar' })
const iconLock = useIcon({ icon: 'ep:lock' })
const formLogin = ref()
const { validForm } = useFormValid(formLogin)
const { setLoginState, getLoginState } = useLoginState()
const { currentRoute, push, replace } = useRouter()
const permissionStore = usePermissionStore()
const redirect = ref<string>('')
const loginLoading = ref(false)
const verify = ref()
const captchaType = ref('blockPuzzle') // blockPuzzle clickWord
const { t } = useI18n()
const message = useMessage()
const iconHouse = useIcon({ icon: 'ep:house' })
const iconAvatar = useIcon({ icon: 'ep:avatar' })
const iconLock = useIcon({ icon: 'ep:lock' })
const formLogin = ref()
const { validForm } = useFormValid(formLogin)
const { setLoginState, getLoginState } = useLoginState()
const { currentRoute, push , replace} = useRouter()
const permissionStore = usePermissionStore()
const redirect = ref<string>('')
const loginLoading = ref(false)
const verify = ref()
const captchaType = ref('blockPuzzle') // blockPuzzle clickWord
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
//
const captchaEnabled = ref(true);
const codeUrl = ref("");
const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
//
const captchaEnabled = ref(true);
const codeUrl = ref("");
const LoginRules = {
const LoginRules = {
tenantName: [required],
username: [required],
password: [required]
}
const loginData = reactive({
}
const loginData = reactive({
isShowPassword: false,
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
@ -120,27 +129,27 @@ const loginData = reactive({
code: '',
uuid: ''
}
})
})
const socialList = [
const socialList = [
{ icon: 'ant-design:github-filled', type: 0 },
{ icon: 'ant-design:wechat-filled', type: 30 },
{ icon: 'ant-design:alipay-circle-filled', type: 0 },
{ icon: 'ant-design:dingtalk-circle-filled', type: 20 }
]
]
//
// const getCode = async () => {
// //
// if (loginData.captchaEnable === 'false') {
// await handleLogin({})
// } else {
// //
// //
// verify.value.show()
// }
// }
function getCode() {
//
// const getCode = async () => {
// //
// if (loginData.captchaEnable === 'false') {
// await handleLogin({})
// } else {
// //
// //
// verify.value.show()
// }
// }
function getCode() {
getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
if (captchaEnabled.value) {
@ -148,16 +157,16 @@ function getCode() {
loginData.loginForm.uuid = res.uuid;
}
});
}
//ID
const getTenantId = async () => {
}
//ID
const getTenantId = async () => {
if (loginData.tenantEnable === 'true') {
const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
authUtil.setTenantId(res)
}
}
//
const getCookie = () => {
}
//
const getCookie = () => {
const loginForm = authUtil.getLoginForm()
if (loginForm) {
loginData.loginForm = {
@ -168,10 +177,17 @@ const getCookie = () => {
tenantName: loginForm.tenantName ? loginForm.tenantName : loginData.loginForm.tenantName
}
}
}
const loading = ref() // ElLoading.service
//
const handleLogin = async (params) => {
}
const handleUpdate = () => {
router.push({
name: 'ForgetPassword',
})
};
const loading = ref() // ElLoading.service
//
const handleLogin = async (params) => {
console.log('登录-185')
loginLoading.value = true
try {
@ -216,10 +232,10 @@ const handleLogin = async (params) => {
loginLoading.value = false
loading?.value?.close()
}
}
}
//
const doSocialLogin = async (type: number) => {
//
const doSocialLogin = async (type : number) => {
if (type === 0) {
message.error('此方式未配置')
} else {
@ -238,30 +254,30 @@ const doSocialLogin = async (type: number) => {
console.log(33)
window.location.href = res
}
}
watch(
}
watch(
() => currentRoute.value,
(route: RouteLocationNormalizedLoaded) => {
(route : RouteLocationNormalizedLoaded) => {
redirect.value = route?.query?.redirect as string
},
{
immediate: true
}
)
onMounted(() => {
)
onMounted(() => {
getCode();
getCookie()
})
})
</script>
<style lang="scss" scoped>
:deep(.anticon) {
:deep(.anticon) {
&:hover {
color: var(--el-color-primary) !important;
}
}
}
.login-code {
.login-code {
float: right;
width: 100%;
height: 38px;
@ -273,5 +289,5 @@ onMounted(() => {
vertical-align: middle;
cursor: pointer;
}
}
}
</style>

72
src/views/login/forgetPassword.vue

@ -0,0 +1,72 @@
<template>
<div v-loading="loading" style="display: flex; justify-content: center; align-items: center;">
<el-form ref="formSmsLogin" :model="loginData" :rules="rules" label-width="130px" label-position="top" size="large">
<div class="title" style="font-size:25px" margin-left="0px">忘记密码</div>
<el-row type="flex" justify="center" align="middle">
<el-col :span="13">
<el-form-item label="请输入用户名" prop="username" align="center">
<el-input v-model="loginData.username" placeholder="请输入用户名" />
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="请输入邮箱" prop="email">
<el-input v-model="loginData.email" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
</div>
</div>
</template>
<script lang="ts" setup name="forgetPassword">
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import { useIcon } from '@/hooks/web/useIcon'
import { setTenantId, setToken } from '@/utils/auth'
import { usePermissionStore } from '@/store/modules/permission'
import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
import * as UserApi from '@/api/system/user'
const { t } = useI18n()
const message = useMessage()
const permissionStore = usePermissionStore()
const formSmsLogin = ref()
const loginLoading = ref(false)
const iconHouse = useIcon({ icon: 'ep:house' })
const iconCellphone = useIcon({ icon: 'ep:cellphone' })
const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
const rules = {
username: [required],
email: [required]
}
const loginData = reactive({
username: '',
email: '',
})
const loading = ref(false);
const submitForm = async () => {
try {
const data = loginData as unknown as UserApi.UserVO
await UserApi.forgetPassword(data)
message.success(t('common.updateSuccess'))
//
router.go(-1)
} finally {
// formLoading.value = false
}
}
</script>
<style lang="scss" scoped>
:deep(.anticon) {
&:hover {
color: var(--el-color-primary) !important;
}
}
.smsbtn {
margin-top: 33px;
}
</style>

78
src/views/login/updatePassword.vue

@ -0,0 +1,78 @@
<template>
<div v-loading="loading" style="display: flex; justify-content: center; align-items: center;">
<el-form ref="formSmsLogin" :model="loginData" :rules="rules" label-width="130px" label-position="top" size="large">
<div class="title" style="font-size:25px" margin-left="0px">重置密码</div>
<el-row type="flex" justify="center" align="middle">
<el-col :span="13">
<el-form-item label="新密码" prop="password" align="center">
<el-input v-model="loginData.password" placeholder="请输入新密码" />
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="确认新密码" prop="againPassword">
<el-input v-model="loginData.againPassword" placeholder="请再次新密码" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
</div>
</div>
</template>
<script lang="ts" setup name="bb">
import type { RouteLocationNormalizedLoaded } from 'vue-router'
import { useIcon } from '@/hooks/web/useIcon'
import { setTenantId, setToken } from '@/utils/auth'
import { usePermissionStore } from '@/store/modules/permission'
import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
import * as UserApi from '@/api/system/user'
const { t } = useI18n()
const message = useMessage()
const permissionStore = usePermissionStore()
const formSmsLogin = ref()
const loginLoading = ref(false)
const iconHouse = useIcon({ icon: 'ep:house' })
const iconCellphone = useIcon({ icon: 'ep:cellphone' })
const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
const route = useRoute() //
const rules = {
password: [required],
againPassword: [required]
}
const loginData = reactive({
password: '',
againPassword: '',
mailKey: '',
})
const loading = ref(false);
const submitForm = async () => {
try {
loginData.mailKey = route.query.mailKey;
if (loginData.password != loginData.againPassword) {
message.error('两次输入的密码不一致,请重新输入!')
} else {
const data = loginData as unknown as UserApi.UserVO
await UserApi.updatePassword(data)
//
message.success(t('common.updateSuccess'))
 router.go(-1)
}
} finally {
// formLoading.value = false
}
}
</script>
<style lang="scss" scoped>
:deep(.anticon) {
&:hover {
color: var(--el-color-primary) !important;
}
}
.smsbtn {
margin-top: 33px;
}
</style>

11
src/views/wms/basicDataManage/documentSetting/switch/index.vue

@ -41,7 +41,7 @@
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="getList"
@success="success"
:rules="SwitchRules"
:formAllSchemas="Switch.allSchemas"
:apiUpdate="SwitchApi.updateSwitch"
@ -210,7 +210,16 @@ const searchFormClick = (searchData) => {
}
getList() //
}
const success = async (formType, data) => {
const res = await SwitchApi.updateSwitch(data)
if(true===res){
message.success(t('common.updateSuccess'))
getList()
}else{
message.error('修改失败')
}
}
/** 初始化 **/
onMounted(async() => {
getList()

2
src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@ -141,6 +141,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['outPackUnit'] = val[0]['packUnit']
}else if(formField == 'itemCode') {
setV['itemCode'] = val[0]['code']
}else if(formField == 'overflowLocationCode') {
setV['overflowLocationCode'] = val[0]['code']
}else{
setV[formField] = setV[0][searchField]
}

26
src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@ -83,6 +83,30 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
}
}
},
{
label: '溢出库位',
field: 'overflowLocationCode',
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择溢出库位代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '库位信息', // 查询弹窗标题
searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
}]
}
}
},
{
label: '入库包装规格',
field: 'inPackUnit',
@ -279,7 +303,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE'
}
},
isTable:false
},
{
label: '出库自动转为出库包装规格',
@ -300,7 +323,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE'
}
},
isTable:false
},
{
label: '需要接收确认',

47
src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table ref="tableRef" :selection="true"
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
@ -26,6 +26,7 @@
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
@getSelectionRows="getSelectionRows"
>
<template #itemCode="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
@ -111,6 +112,7 @@ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:callmaterials:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:callmaterials:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:callmaterials:export'}), //
defaultButtons.mainLisSelectiontPointBtn(null), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -137,7 +139,9 @@ const buttonBaseClick = (val, item) => {
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
} else if (val=='selection_point'){//
handleSelectionPoint()
}else { //
console.log('其他按钮', item)
}
}
@ -229,6 +233,7 @@ const handleExport = async () => {
} finally {
exportLoading.value = false
}
}
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
@ -237,7 +242,14 @@ const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAcces
const handlePoint = async (row) => {
window.open(src.value+'&relateNumber='+row.id)
}
//
const handleSelectionPoint = ()=>{
let rows:any = []
selectionRows.value.forEach(item=>{
rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
})
console.log('批量打印',rows)
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
@ -262,6 +274,35 @@ const searchFormClick = (searchData) => {
getList() //
}
watch(
() => tableObject.tableList,
() => {
const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
if(currentRows){
nextTick(() => {
currentRows.selectionRows.forEach(item=>{
tableRef.value.toggleRowSelection(item,true)
})
})
}
}
)
const selectionRows = ref<any>([])
const tableRef = ref()
const getSelectionRows = (currentPage,currentPageSelectionRows) => {
console.log("getSelectionRows",currentPage,currentPageSelectionRows)
const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
if(currentRows){
currentRows.selectionRows = currentPageSelectionRows
}else{
selectionRows.value.push({
currentPage,
selectionRows:currentPageSelectionRows
})
}
}
/** 初始化 **/
onMounted(async () => {
getList()

39
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@ -32,6 +32,9 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="[defaultButtons.mainListPointBtn(null)]" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -42,9 +45,11 @@
<script setup lang="ts">
import download from '@/utils/download'
import { getAccessToken } from '@/utils/auth'
import { PackageoverRetrospect } from './packageoverRetrospect.data'
import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as PackageApi from '@/api/wms/package'
defineOptions({ name: 'PackageoverRetrospect' })
@ -77,7 +82,39 @@ const HeadButttondata = [
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
]
// -
const buttonTableClick = async (val, row) => {
if (val == 'point') { //
handlePoint(row)
}
}
//
const handlePoint = async (row) => {
//
let labelType = ''
await PackageApi.getPackagePage({
requestNumber: row.number
}).then((res) => {
if(res.list.length > 0) {
if (res.list[0].productionLineCode != null) {
labelType = 'zz'
} else {
labelType = 'cg'
}
}
}).catch(err => {
console.log(err)
})
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
//
if (labelType == 'cg') {
const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
window.open(src.value+'&request_number='+row.number)
} else {
const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
window.open(src.value+'&request_number='+row.number)
}
}
//
const buttonBaseClick = (val, item) => {
if (val == 'export') { //

10
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts

@ -405,5 +405,15 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x',
}
},
},
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false ,
table: {
width: 150,
fixed: 'right'
}
}
]))

5
src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PreparetoissueMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PreparetoissueMain.allSchemas.searchSchema,...PreparetoissueDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PreparetoissueMain.allSchemas"
:detailAllSchemas="PreparetoissueDetail.allSchemas"
/>
<!-- 列表 -->
@ -92,7 +93,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PreparetoissueMain.allSchemas.tableColumns)
const tableColumns = ref([...PreparetoissueMain.allSchemas.tableColumns,...PreparetoissueDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)

5
src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="RepleinshRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...RepleinshRequestMain.allSchemas.searchSchema,...RepleinshRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="RepleinshRequestMain.allSchemas"
:detailAllSchemas="RepleinshRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -92,7 +93,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(RepleinshRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...RepleinshRequestMain.allSchemas.tableColumns,...RepleinshRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="InspectJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...InspectJobMain.allSchemas.searchSchema,...InspectJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InspectJobMain.allSchemas"
:detailAllSchemas="InspectJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(InspectJobMain.allSchemas.tableColumns)
const tableColumns = ref([...InspectJobMain.allSchemas.tableColumns,...InspectJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="InspectRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...InspectRecordMain.allSchemas.searchSchema,...InspectRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="InspectRecordMain.allSchemas"
:detailAllSchemas="InspectRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -80,7 +81,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(InspectRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...InspectRecordMain.allSchemas.tableColumns,...InspectRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

6
src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@ -1,13 +1,13 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="InspectRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...InspectRequestMain.allSchemas.searchSchema,...InspectRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
:allSchemas="InspectRequestMain.allSchemas" />
:allSchemas="InspectRequestMain.allSchemas" :detailAllSchemas="InspectRequestDetail.allSchemas"/>
<!-- 列表 -->
<ContentWrap>
@ -62,7 +62,7 @@
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(InspectRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...InspectRequestMain.allSchemas.tableColumns,...InspectRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptJobMain.allSchemas.searchSchema,...PurchasereceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptJobMain.allSchemas"
:detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -105,7 +106,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptJobMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptJobMain.allSchemas.tableColumns,...PurchasereceiptJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptRecordMain.allSchemas.searchSchema,...PurchasereceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptRecordMain.allSchemas"
:detailAllSchemas="PurchasereceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -114,7 +115,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
//

5
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptRequestMain.allSchemas"
:detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -148,7 +149,7 @@ const genLabelId = ref(); //主表ID
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereturnJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereturnJobMain.allSchemas.searchSchema,...PurchasereturnJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereturnJobMain.allSchemas"
:detailAllSchemas="PurchasereturnJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereturnJobMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereturnJobMain.allSchemas.tableColumns,...PurchasereturnJobDetail.allSchemas.tableColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereturnRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereturnRecordMain.allSchemas.searchSchema,...PurchasereturnRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereturnRecordMain.allSchemas"
:detailAllSchemas="PurchasereturnRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereturnRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereturnRecordMain.allSchemas.tableColumns,...PurchasereturnRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -2,7 +2,7 @@
<ContentWrap>
<!-- 搜索工作栏 -->
<Search
:schema="PurchasereturnRequestMain.allSchemas.searchSchema"
:schema="[...PurchasereturnRequestMain.allSchemas.searchSchema,...PurchasereturnRequestDetail.allSchemas.searchSchema]"
@search="setSearchParams"
@reset="setSearchParams"
/>
@ -16,6 +16,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereturnRequestMain.allSchemas"
:detailAllSchemas="PurchasereturnRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -119,7 +120,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereturnRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereturnRequestMain.allSchemas.tableColumns,...PurchasereturnRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)

5
src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PutawayJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PutawayJobMain.allSchemas.searchSchema,...PutawayJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PutawayJobMain.allSchemas"
:detailAllSchemas="PutawayJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -104,7 +105,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PutawayJobMain.allSchemas.tableColumns)
const tableColumns = ref([...PutawayJobMain.allSchemas.tableColumns,...PutawayJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PutawayRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PutawayRecordMain.allSchemas.searchSchema,...PutawayRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PutawayRecordMain.allSchemas"
:detailAllSchemas="PutawayRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -99,7 +100,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PutawayRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...PutawayRecordMain.allSchemas.tableColumns,...PutawayRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PutawayRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PutawayRequestMain.allSchemas.searchSchema,...PutawayRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PutawayRequestMain.allSchemas"
:detailAllSchemas="PutawayRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -117,7 +118,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PutawayRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...PutawayRequestMain.allSchemas.tableColumns,...PutawayRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptJobMain.allSchemas.searchSchema,...PurchasereceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptJobMain.allSchemas"
:detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
/>
<!-- 列表 -->
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptJobMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptJobMain.allSchemas.tableColumns,...PurchasereceiptJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptRecordMain.allSchemas.searchSchema,...PurchasereceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptRecordMain.allSchemas"
:detailAllSchemas="PurchasereceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -81,7 +82,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptRecordMain.allSchemas.tableColumns,...PurchasereceiptRecordDetail.allSchemas.tableMainColumns])
const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
//

5
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasereceiptRequestMain.allSchemas.searchSchema,...PurchasereceiptRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchasereceiptRequestMain.allSchemas"
:detailAllSchemas="PurchasereceiptRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -124,7 +125,7 @@ const genLabelId = ref(); //主表ID
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasereceiptRequestMain.allSchemas.tableColumns,...PurchasereceiptRequestDetail.allSchemas.tableMainColumns])
const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)

5
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DemandforecastingMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...DemandforecastingMain.allSchemas.searchSchema,...DemandforecastingDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DemandforecastingMain.allSchemas"
:detailAllSchemas="DemandforecastingDetail.allSchemas"
/>
<!-- 列表 -->
@ -92,7 +93,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(DemandforecastingMain.allSchemas.tableColumns)
const tableColumns = ref([...DemandforecastingMain.allSchemas.tableColumns,...DemandforecastingDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

6
src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@ -1,13 +1,13 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
:allSchemas="PurchasePlanMain.allSchemas" />
:allSchemas="PurchasePlanMain.allSchemas" :detailAllSchemas="PurchasePlanDetail.allSchemas"/>
<!-- 列表 -->
<ContentWrap>
@ -86,7 +86,7 @@
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchasePlanMain.allSchemas.tableColumns,...PurchasePlanDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

5
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="SupplierdeliverRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...SupplierdeliverRecordMain.allSchemas.searchSchema,...SupplierdeliverRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="SupplierdeliverRecordMain.allSchemas"
:detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -94,7 +95,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(SupplierdeliverRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...SupplierdeliverRecordMain.allSchemas.tableColumns,...SupplierdeliverRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

6
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -2,7 +2,7 @@
<ContentWrap>
<!-- 搜索工作栏 -->
<Search
:schema="SupplierdeliverRequestMain.allSchemas.searchSchema"
:schema="[...SupplierdeliverRequestMain.allSchemas.searchSchema,...SupplierdeliverRequestDetail.allSchemas.searchSchema]"
@search="setSearchParams"
@reset="setSearchParams"
/>
@ -16,6 +16,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="SupplierdeliverRequestMain.allSchemas"
:detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -179,7 +180,8 @@ const genLabelId = ref();
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...SupplierdeliverRequestMain.allSchemas.tableColumns,...SupplierdeliverRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

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

@ -648,6 +648,17 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
disabled: false
}
},
{
label: '供应商批次',
field: 'supplierBatch',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: false
}
},
{
label: '生产日期',
field: 'produceDate',

5
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchaseclaimRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...PurchaseclaimRecordMain.allSchemas.searchSchema,...PurchaseclaimRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRecordMain.allSchemas"
:detailAllSchemas="PurchaseclaimRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchaseclaimRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchaseclaimRecordMain.allSchemas.tableColumns,...PurchaseclaimRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

6
src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@ -2,14 +2,14 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="PurchaseclaimRequestMain.allSchemas.searchSchema" @search="setSearchParams"
<Search :schema="[...PurchaseclaimRequestMain.allSchemas.searchSchema,...PurchaseclaimRequestDetail.allSchemas.searchSchema]" @search="setSearchParams"
@reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
:allSchemas="PurchaseclaimRequestMain.allSchemas" />
:allSchemas="PurchaseclaimRequestMain.allSchemas" :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"/>
<!-- 列表 -->
<ContentWrap>
@ -84,7 +84,7 @@
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(PurchaseclaimRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...PurchaseclaimRequestMain.allSchemas.tableColumns,...PurchaseclaimRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

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

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="SupplierinvoiceRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...SupplierinvoiceRecordMain.allSchemas.searchSchema,...SupplierinvoiceRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="SupplierinvoiceRecordMain.allSchemas"
:detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
/>
<!-- 列表 -->
@ -52,6 +53,19 @@
<!-- 详情 -->
<Detail
ref="detailRef"
:annexTable="[{
label: '合同附件',
prop: 'Annex',
tableName:'contract'
},{
label: '电子发票附件',
prop: 'Annex',
tableName:'invoice'
},{
label: '货运单附件',
prop: 'Annex',
tableName:'waybill'
}]"
:isBasic="false"
:allSchemas="SupplierinvoiceRecordMain.allSchemas"
:detailAllSchemas="SupplierinvoiceRecordDetail.allSchemas"
@ -76,8 +90,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(SupplierinvoiceRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...SupplierinvoiceRecordMain.allSchemas.tableColumns,...SupplierinvoiceRecordDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
tableColumns.value = val

6
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...SupplierinvoiceRequestMain.allSchemas.searchSchema,...SupplierinvoiceRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,6 +12,8 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="SupplierinvoiceRequestMain.allSchemas"
:detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
/>
<!-- 列表 -->
@ -141,7 +143,7 @@
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(SupplierinvoiceRequestMain.allSchemas.tableColumns)
const tableColumns = ref([...SupplierinvoiceRequestMain.allSchemas.tableColumns,...SupplierinvoiceRequestDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {

36
src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@ -10,6 +10,42 @@ export const SupplierinvoiceInvoicedRules = reactive({
})
export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '供应商送货日期',
field: 'supplierDeliveryTime',
sort: 'custom',
formatter: dateFormatter,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
table: {
width: 150
},
isForm: false,
},
{
label: '物流收货日期',
field: 'logisticsReceiptTime',
sort: 'custom',
formatter: dateFormatter,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
table: {
width: 150
},
isForm: false,
},
{
label: '项目编码',
field: 'projectCode',

Loading…
Cancel
Save