diff --git a/.env.test-scp b/.env.test-scp
new file mode 100644
index 000000000..a68d25459
--- /dev/null
+++ b/.env.test-scp
@@ -0,0 +1,37 @@
+# 生产环境
+NODE_ENV=test
+
+VITE_DEV=false
+
+# 请求路径
+VITE_BASE_URL='http://dev.ccwin-in.com:25400/api'
+
+# 上传路径
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:25400/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:25311/magic/web/index.html'
+
+# 积木报表请求路径
+VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311'
diff --git a/Dockerfile_scp b/Dockerfile_scp
new file mode 100644
index 000000000..700cdf9a9
--- /dev/null
+++ b/Dockerfile_scp
@@ -0,0 +1,7 @@
+# 设置基础镜像
+FROM win-nginx
+
+WORKDIR /opt/sfms3.0
+COPY nginx_scp.conf /usr/local/nginx/conf/nginx.conf
+# 将dist文件中的内容复制到 /opt/sfms3.0 这个目录下面
+COPY sfms3.0/ /opt/sfms3.0
diff --git a/README.md b/README.md
index 4f12652d0..6795cf0cf 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ form: {
searchListPlaceholder: '请选择物料代码', // 输入框占位文本
searchField: 'itemCode', // 查询弹窗赋值字段
searchTitle: '生产线物料关系信息', // 查询弹窗标题
+ hiddenFilterButton:true,//是否隐藏筛选按钮
searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
searchCondition: [{
diff --git a/nginx_scp.conf b/nginx_scp.conf
new file mode 100644
index 000000000..00a1a93ea
--- /dev/null
+++ b/nginx_scp.conf
@@ -0,0 +1,53 @@
+user root;
+worker_processes 2;
+
+events {
+ worker_connections 1024;
+}
+
+http {
+ include mime.types;
+ charset utf-8,gbk;
+ default_type application/octet-stream;
+ log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+ '$status $body_bytes_sent "$http_referer" '
+ '"$http_user_agent" "$http_x_forwarded_for" "$request_time $upstream_response_time"';
+ access_log logs/access.log main;
+ sendfile on;
+ #tcp_nopush on;
+ keepalive_timeout 600s;
+ client_max_body_size 200m;
+ gzip on;
+ gzip_min_length 10k;
+ gzip_comp_level 9;
+ gzip_buffers 4 16k;
+ gzip_types text/plain application/javascript text/css application/xml text/javascript image/jpeg image/gif image/png;
+ gzip_vary on;
+ gzip_disable "MSIE [1-6]\.";
+ upstream sfms3.0 {
+ server localhost:25311 weight=10 max_fails=3 fail_timeout=10s;
+ }
+ server {
+ listen 25400;
+ server_name_in_redirect off;
+ server_name _;
+ location /api/ {
+ proxy_pass http://sfms3.0/;
+ proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+ proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+ }
+ location /profile/ {
+ alias /opt/profile/;
+ index index.html index.htm;
+ }
+ location / {
+ try_files $uri $uri/ /index.html;
+ root /opt/sfms3.0;
+ index index.html index.htm;
+ }
+ }
+}
+
diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index 2b59a7401..aca7fd268 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -22,6 +22,11 @@ export const createInspectionJobMain = async (data) => {
return await request.post({ url: `/qms/inspection-job-main/create`, data })
}
+// 暂存检验任务
+export const stagingInspectionJobMain = async (data) => {
+ return await request.post({ url: `/qms/inspection-job-main/staging`, data })
+}
+
// 修改检验任务
export const updateInspectionJobMain = async (data) => {
return await request.put({ url: `/qms/inspection-job-main/update`, data })
@@ -46,6 +51,7 @@ export const abandonInspectionJobMain = async (id) => {
export const closeInspectionJobMain = async (id) => {
return await request.put({ url: `/qms/inspection-job-main/close?id=` + id })
}
+
// 导出检验申请 Excel
export const exportInspectionJobMain = async (params) => {
return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
diff --git a/src/api/system/mail/template/index.ts b/src/api/system/mail/template/index.ts
index fb7ce5ea7..60b404863 100644
--- a/src/api/system/mail/template/index.ts
+++ b/src/api/system/mail/template/index.ts
@@ -48,3 +48,8 @@ export const deleteMailTemplate = async (id: number) => {
export const sendMail = (data: MailSendReqVO) => {
return request.post({ url: '/system/mail-template/send-mail', data })
}
+
+// 查询邮件模版列表不分页
+export const getMailTemplateNoPage = async (params: PageParam) => {
+ return await request.get({ url: '/system/mail-template/noPage', params })
+}
\ No newline at end of file
diff --git a/src/api/system/notify/template/index.ts b/src/api/system/notify/template/index.ts
index 6681e4bb3..fd7b5ac09 100644
--- a/src/api/system/notify/template/index.ts
+++ b/src/api/system/notify/template/index.ts
@@ -52,3 +52,8 @@ export const deleteNotifyTemplate = async (id: number) => {
export const sendNotify = (data: NotifySendReqVO) => {
return request.post({ url: '/system/notify-template/send-notify', data })
}
+
+// 查询站内信模板列表不分页
+export const getNotifyTemplateNoPage = async (params: PageParam) => {
+ return await request.get({ url: '/system/notify-template/noPage', params })
+}
diff --git a/src/api/system/sms/smsTemplate/index.ts b/src/api/system/sms/smsTemplate/index.ts
index b103eb3c4..4ad36c77c 100644
--- a/src/api/system/sms/smsTemplate/index.ts
+++ b/src/api/system/sms/smsTemplate/index.ts
@@ -62,3 +62,8 @@ export const exportSmsTemplate = (params) => {
export const sendSms = (data: SendSmsReqVO) => {
return request.post({ url: '/system/sms-template/send-sms', data })
}
+
+// 查询待发送列表
+export const getSmsTemplateNoPage = (data: SendSmsReqVO) => {
+ return request.get({ url: '/system/sms-template/noPage', data })
+}
diff --git a/src/api/wms/relegateRequest/index.ts b/src/api/wms/relegateRequest/index.ts
new file mode 100644
index 000000000..a26e8c360
--- /dev/null
+++ b/src/api/wms/relegateRequest/index.ts
@@ -0,0 +1,73 @@
+import request from '@/config/axios'
+
+export interface RelegateRequestVO {
+ id: number
+ itemCode: string
+ downItemCode: string
+ businessType: string
+ uom: string
+ qty: number
+ fromBatch: string
+ fromPackingNumber: string
+ fromLocationCode: string
+ fromAreaTypes: string
+ fromAreaCodes: string
+ fromWarehouseCode: string
+ toPackingNumber: string
+ toBatch: string
+ toLocationCode: string
+ toWarehouseCode: string
+ toAreaTypes: string
+ toAreaCodes: string
+ number: string
+ available: string
+ remark: string
+ departmentCode: string
+ siteId: number
+ extraProperties: string
+ status: string
+ concurrencyStamp: number
+ serialNumber: string
+ ruleUserId: number
+}
+
+// 查询物料降级信息列表
+export const getRelegateRequestPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/relegate-request/senior', data })
+ } else {
+ return await request.get({ url: `/wms/relegate-request/page`, params })
+ }
+}
+
+// 查询物料降级信息详情
+export const getRelegateRequest = async (id: number) => {
+ return await request.get({ url: `/wms/relegate-request/get?id=` + id })
+}
+
+// 新增物料降级信息
+export const createRelegateRequest = async (data: RelegateRequestVO) => {
+ return await request.post({ url: `/wms/relegate-request/create`, data })
+}
+
+// 修改物料降级信息
+export const updateRelegateRequest = async (data: RelegateRequestVO) => {
+ return await request.put({ url: `/wms/relegate-request/update`, data })
+}
+
+// 删除物料降级信息
+export const deleteRelegateRequest = async (id: number) => {
+ return await request.delete({ url: `/wms/relegate-request/delete?id=` + id })
+}
+
+// 导出物料降级信息 Excel
+export const exportRelegateRequest = async (params) => {
+ return await request.download({ url: `/wms/relegate-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/wms/relegate-request/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/saleShipmentDetail/index.ts b/src/api/wms/saleShipmentDetail/index.ts
new file mode 100644
index 000000000..50dd3e242
--- /dev/null
+++ b/src/api/wms/saleShipmentDetail/index.ts
@@ -0,0 +1,65 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentDetailVO {
+ id: number
+ soNumber: string
+ soLine: string
+ fromOwnerCode: string
+ packingNumber: string
+ batch: string
+ inventoryStatus: string
+ fromLocationCode: string
+ masterId: number
+ number: string
+ itemCode: string
+ itemName: string
+ itemDesc1: string
+ itemDesc2: string
+ projectCode: string
+ qty: number
+ uom: string
+ remark: string
+ concurrencyStamp: string
+ siteId: number
+}
+
+// 查询销售发运申请子列表
+export const getSaleShipmentDetailPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/sale-shipment-detail/senior', data })
+ } else {
+ return await request.get({ url: `/wms/sale-shipment-detail/page`, params })
+ }
+}
+
+// 查询销售发运申请子详情
+export const getSaleShipmentDetail = async (id: number) => {
+ return await request.get({ url: `/wms/sale-shipment-detail/get?id=` + id })
+}
+
+// 新增销售发运申请子
+export const createSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
+ return await request.post({ url: `/wms/sale-shipment-detail/create`, data })
+}
+
+// 修改销售发运申请子
+export const updateSaleShipmentDetail = async (data: SaleShipmentDetailVO) => {
+ return await request.put({ url: `/wms/sale-shipment-detail/update`, data })
+}
+
+// 删除销售发运申请子
+export const deleteSaleShipmentDetail = async (id: number) => {
+ return await request.delete({ url: `/wms/sale-shipment-detail/delete?id=` + id })
+}
+
+// 导出销售发运申请子 Excel
+export const exportSaleShipmentDetail = async (params) => {
+ return await request.download({ url: `/wms/sale-shipment-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/wms/sale-shipment-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts
new file mode 100644
index 000000000..e03719231
--- /dev/null
+++ b/src/api/wms/saleShipmentMain/index.ts
@@ -0,0 +1,64 @@
+import request from '@/config/axios'
+
+export interface SaleShipmentMainVO {
+ id: number
+ customerCode: string
+ number: string
+ businessType: string
+ remark: string
+ extraProperties: string
+ siteId: number
+ invoiceTime: Date
+ requestTime: Date
+ dueTime: Date
+ departmentCode: string
+ status: string
+ autoCommit: string
+ autoAgree: string
+ autoExecute: string
+ directCreateRecord: string
+ concurrencyStamp: string
+ ruleUserId: number
+ serialNumber: string
+}
+
+// 查询销售发运申请主列表
+export const getSaleShipmentMainPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/sale-shipment-main-request/senior', data })
+ } else {
+ return await request.get({ url: `/wms/sale-shipment-main-request/page`, params })
+ }
+}
+
+// 查询销售发运申请主详情
+export const getSaleShipmentMain = async (id: number) => {
+ return await request.get({ url: `/wms/sale-shipment-main-request/get?id=` + id })
+}
+
+// 新增销售发运申请主
+export const createSaleShipmentMain = async (data: SaleShipmentMainVO) => {
+ return await request.post({ url: `/wms/sale-shipment-main-request/create`, data })
+}
+
+// 修改销售发运申请主
+export const updateSaleShipmentMain = async (data: SaleShipmentMainVO) => {
+ return await request.put({ url: `/wms/sale-shipment-main-request/update`, data })
+}
+
+// 删除销售发运申请主
+export const deleteSaleShipmentMain = async (id: number) => {
+ return await request.delete({ url: `/wms/sale-shipment-main-request/delete?id=` + id })
+}
+
+// 导出销售发运申请主 Excel
+export const exportSaleShipmentMain = async (params) => {
+ return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/wms/sale-shipment-main-request/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts
index ced9da32c..f3846f143 100644
--- a/src/api/wms/supplierinvoiceRequestMain/index.ts
+++ b/src/api/wms/supplierinvoiceRequestMain/index.ts
@@ -123,4 +123,10 @@ export const exportSupplierinvoiceRequestDetail = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/supplierinvoice-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 根据角色编码获取用户列表
+export const queryUserInfoByRoleCode = async (params) => {
+ return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params })
+
+}
diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index ef289c6a8..7d5f0e142 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
-
@@ -16,17 +16,20 @@
{{ item.size }}KB
来自 {{ item.nickname }}
-
-
+
+
+
{{ formatDate(item.createTime) }}
+
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 3c2a924e4..cc20819b4 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -15,6 +15,7 @@
:schema="formSchema"
:is-col="true"
@opensearchTable="opensearchTable"
+ @hiddenFilterButton="hiddenSearchTableFilterButton"
@clearSearchInput="clearSearchInput"
@onChange="onChange"
@onBlur="onBlur"
@@ -433,7 +434,9 @@ const opensearchTable = (
searchDetailSchemas
)
}
-
+const hiddenSearchTableFilterButton = ()=>{
+ searchTableRef.value.hiddenFilterButton()
+}
const clearSearchInput = (field)=>{
emit('clearSearchInput',field)
}
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index d3308ecf0..9ce1534df 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -103,6 +103,8 @@
({
label: '附件',
showDownload:false,
+ showPreview:false,
hiddenDelete:false
})
},
@@ -460,10 +463,14 @@ const getFileList = async () => {
}
}
// 获取其他附件列表篇
-const getAnnexFileList = async (row:id) => {
- console.log('getAnnexFileList')
+const getAnnexFileList = async (row) => {
props.annexTable?.forEach(async (item) => {
let requstData = {...remarksData.data,tableName: item?.tableName}
+ if(item?.queryParams){
+ item?.queryParams?.forEach(queryItem => {
+ requstData[queryItem.queryField] = row[queryItem.rowField]
+ });
+ }
const annexList = await FileApi.getFileList(requstData)
const annexData = annexTableData.value.find(annex=>annex.label === item.label)
if(annexData){
@@ -476,6 +483,8 @@ const getAnnexFileList = async (row:id) => {
annexList,
hasSubDetail:item.hasSubDetail||false,
subDetailTableData:item.subDetailTableData,
+ fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+ showPreview:item.showPreview||false, // 是否展示预览按钮
showDownload:item.showDownload||false, // 是否展示下载按钮
hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
})
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index fdfc8441c..535381792 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -55,7 +55,7 @@ export default defineComponent({
vLoading: propTypes.bool.def(false),
labelPosition: propTypes.string.def('left'),
},
- emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter'],
+ emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton'],
setup(props, { slots, expose, emit }) {
// element form 实例
const elFormRef = ref>()
@@ -278,7 +278,14 @@ export default defineComponent({
item?.componentProps?.multiple,
item?.componentProps?.isConcatDetailSchemas,
item?.componentProps?.searchDetailSchemas,
- )}}/>
+ )
+
+ //隐藏筛选按钮
+ if(item?.componentProps?.hiddenFilterButton){
+ emit('hiddenFilterButton')
+ }
+
+ }}/>
>
)
}
@@ -316,7 +323,12 @@ export default defineComponent({
item?.componentProps?.multiple,
item?.componentProps?.isConcatDetailSchemas,
item?.componentProps?.searchDetailSchemas,
- )}}/>
+ )
+ //隐藏筛选按钮
+ if(item?.componentProps?.hiddenFilterButton){
+ emit('hiddenFilterButton')
+ }
+ }}/>
>
)
}
diff --git a/src/components/PreviewPDF/index.vue b/src/components/PreviewPDF/index.vue
new file mode 100644
index 000000000..c6b2320d2
--- /dev/null
+++ b/src/components/PreviewPDF/index.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index 5cdb3feda..f57fd7360 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -50,9 +50,9 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
// 列表头部按钮
-const HeadButttondata = [
+const HeadButttondata = ref([
defaultButtons.defaultFilterBtn(null), // 筛选
-]
+])
/** 打开弹窗 */
const getListRef = ref()
@@ -70,6 +70,9 @@ const multipleBol = ref(false)
const searchConditionRef = ref()
const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
+ HeadButttondata.value = [
+ defaultButtons.defaultFilterBtn(null), // 筛选
+ ]
dialogTitle.value = titleName
tableObjectRef.value = tableObject
searchDialogVisible.value = true
@@ -79,6 +82,10 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
tableColumns.value = allSchemas.tableColumns
}
const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any) => {
+ HeadButttondata.value = [
+ defaultButtons.defaultFilterBtn(null), // 筛选
+ ]
+
searchDialogVisible.value = true
formFieldRef.value = formField
searchFieldRef.value = searchField
@@ -112,6 +119,10 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
getList()
}
+const hiddenFilterButton = ()=>{
+ HeadButttondata.value = []
+}
+
// 筛选提交
const searchFormClick = (searchData) => {
console.log(99, rowRef.value)
@@ -153,7 +164,7 @@ const searchFormClick = (searchData) => {
getListRef.value() // 刷新当前列表
}
-defineExpose({ open,openData }) // 提供 open 方法,用于打开弹窗
+defineExpose({ open,openData,hiddenFilterButton }) // 提供 open 方法,用于打开弹窗
// Table 组件 ref
const searchTableRef = ref()
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 33de112d5..05ce5f239 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -56,7 +56,7 @@ const props = defineProps({
title: propTypes.string.def('文件上传'),
updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
upData: propTypes.object.def(),
- fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
+ fileType: propTypes.array.def(['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg']), // 文件类型, 例如['png', 'jpg', 'jpeg']
fileSize: propTypes.number.def(5), // 大小限制(MB)
limit: propTypes.number.def(5), // 数量限制
autoUpload: propTypes.bool.def(true), // 自动上传
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index a9cac12c6..def6ac63f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -668,13 +668,149 @@ export default {
价格:'Price',
订单日期:'Order Date',
行号:'Line Number',
- 操作:'Operations',
+ 操作:'Operation',
计量单位:'Measuring Unit',
- // ------
- // 客户代码:'Customer Code',
-
- },
- btn:{
+ 人民币:'RMB',
+ 美元:'Dollar',
+ 版本号:'Version Number',
+ 发布时间:'Publish Time',
+ 开始时间:'Start Time',
+ 结束时间:'Finish Time',
+ 业务类型:'Business Type',
+ 预测时间类型:'Forecast time type',
+ 预测日期:'Forecast Date',
+ 订单行:'Order Line',
+ 计划数量:'Planned Quantity',
+ 最后更新时间:'Last update time',
+ 最后更新者:'Last Updater',
+ 要货计划:'Demand plan',
+ 申请单号:'Request number',
+ 从仓库代码:'Code from the repository',
+ 到仓库代码:'to the repository code',
+ 到月台代码:'to the dock code',
+ 时间窗口:'Time window',
+ 计划到货时间:'Scheduled arrival time',
+ 承运商:'Carriers',
+ 运输方式:'Shipping method',
+ 车牌号:'License plate number',
+ 出库事务类型:'The type of outbound transaction',
+ 入库事务类型:'Inbound transaction type',
+ 执行时间:'Execution time',
+ 申请时间:'Application timeline',
+ 截止时间:'Deadline',
+ 部门:'department',
+ 接口类型:'Interface type',
+ 包装号:'Package number',
+ 订单号:'Order number',
+ 订单数量:'Order quantity',
+ 数量:'quantity',
+ 包装数量:'Packing quantity',
+ 供应商计量数量:'The quantity measured by the supplier',
+ 供应商:'vendor',
+ 从库位代码:'From the location code',
+ 到库位代码:'to the location code',
+ 从库位组代码:'From the bin location group code',
+ 到库位组代码:'to the bin location group code',
+ 从库区代码:'Code from the depot',
+ 到库区代码:'to the depot code',
+ 从货主代码:'Code from the shipper',
+ 到货主代码:'Shipper code',
+ 查看其他包装规格:'See other packaging formats',
+ 包装规格:'Packing specifications',
+ 单据打印:'Document printing',
+ 明细列表:'Itemized list',
+ 暂无数据:'No data yet',
+ 供应商发货申请:'supplier Shipping Request',
+ 查询字段:'Query Field',
+ 供应商批次:'Measuring UnitSupplier batchDate of production',
+ 生产日期:'Production Date',
+ 发货数量:'Number of shipments',
+ 主数据:'Primary data',
+ 要货计划单号:'Cargo Plan Bill Number',
+ 联系人姓名:'Contact name',
+ 联系人电话:'Contact phone',
+ 联系人电子邮件:'Contact email',
+ 供应商发货仓库代码:'Supplier shipments Repository code',
+ 运输方式车牌号:'Shipping method License plate number',
+ 自动提交:'Auto-submit',
+ 自动通过:'Automatically passed',
+ 自动执行:'Automated',
+ 直接生成记录:'Generate records directly',
+ 明细:'Details',
+ 批次:'Batch',
+ 生产日期:'Date of manufacture',
+ 到货日期:'Arrival date',
+ 过期日期:'Expiration date',
+ 供应商计量单位 :'Supplier unit of measure',
+ 转换率:'Conversion rate',
+ 物料名称:'Material Name',
+ 物料描述1:'Material Description1',
+ 物料描述2:'Material Description2',
+ 项目代码:'Item Code',
+ 质检明细:'Quality inspection details',
+ 添加附件:'Add Attachment',
+ 请输入备注:'Please enter a comment',
+ 变更记录:'Changelog',
+ 添加明细:'Add details',
+ 上传质量报告:'Upload quality report',
+ 上传质检报告:'Upload the quality inspection report',
+ 供应商批次:'Supplier lots',
+ 个:'piece',
+ 张:'sheet',
+ 克:'gram',
+ 公斤:'kg',
+ 吨:'ton',
+ 米:'rice',
+ 平方米:'square metre',
+ 生成标签:'Generate labels',
+ 创建标签:'Create a label',
+ 包装规格1:'Packing Specification 1',
+ 包装规格2:'Package Specification 2',
+ 包装数量1:'Package Quantity1',
+ 包装数量2:'Package Quantity2',
+ 物品包装信息:'Item packaging information',
+ 系统提示:'System prompts',
+ 是否为此数据生成标签:'Do you generate labels for this data?',
+ 是否处理所选中数据:'Do you process the selected data?',
+ 发货:'shipments',
+ 包装号:'Package number',
+ 标签信息:'Label information',
+ 采购收货记录:'Purchase receipt records',
+ 表单数据:'Form data',
+ 任务单号:'Task ticket number',
+ ERP单据号:'ERP document number',
+ 检验申请单号:'Inspection requisition number',
+ 采购订单号:'Purchase order number',
+ 物料名称:'The name of the item',
+ 数据来源:'Data source',
+ 从库区类型范围:'From the range of reservoir types',
+ 到库区类型范围:'to the depot type range',
+ 从库区代码范围:'From the range of depot codes',
+ 到库区代码范围:'to the range of codes in the reservoir',
+ 生效日期:'Effective Date',
+ 收货明细:'Receipt details',
+ 缺货明细:'Out-of-stock details',
+ 行类型:'Row type',
+ 收货数量:'The quantity received',
+ 到批次:'to the batch',
+ 从包装号:'From the package number',
+ 到包装号:'to the package number',
+ 库存状态:'Inventory status',
+ 从库位组:'From the bin location group',
+ 到库位组:'to the bin location group',
+ 从库区:'From the reservoir area',
+ 到库区:'to the reservoir area',
+ 从货主:'from the owner of the goods',
+ 到货主:'to the owner of the goods',
+ 采购退货记录:'Purchase return records',
+ 采购收货记录单号:'Purchase receipt record number',
+ qad采购退货记录单号:'QAD purchase return record number',
+ 从月台代码:'From the dock code',
+ 原因:'Cause',
+ 退货数量:'Number of returns',
+ 单位:'unit',
+ 金额:'amount',
+ 客户代码:'Customer Code',
查询:'Query',
重置:'Reset',
新增:'Add',
@@ -685,15 +821,11 @@ export default {
设置:'Settings',
确定:'Confirm',
取消:'Cancel',
- 操作:'Operations',
编辑:'Edit',
删除:'Delete',
- 添加附件:'Add Attachment',
添加筛选条件:'Add Filter',
- 关闭:'Close',
打开:'Open',
保存:'Save',
- 发布:'Punblish',
//--------
// 单据打印:'Document Print',
// 上传质量报告:'Upload Quality Report',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 252664561..5d35358ca 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -675,9 +675,73 @@ export default {
行号:'行号',
操作:'操作',
计量单位:'计量单位',
+ 人民币:'人民币',
+ 美元:'美元',
+ 版本号:'版本号',
+ 发布时间:'发布时间',
+ 开始时间:'开始时间',
+ 结束时间:'结束时间',
+ 业务类型:'业务类型',
+ 预测时间类型:'预测时间类型',
+ 预测日期:'预测日期',
+ 订单行:'订单行',
+ 计划数量:'计划数量',
+ 最后更新时间:'最后更新时间',
+ 最后更新者:'最后更新者',
+ 要货计划:'要货计划',
+ 申请单号:'申请单号',
+ 从仓库代码:'从仓库代码',
+ 到仓库代码:'到仓库代码',
+ 到月台代码:'到月台代码',
+ 时间窗口:'时间窗口',
+ 计划到货时间:'计划到货时间',
+ 承运商:'承运商',
+ 运输方式:'运输方式',
+ 车牌号:'车牌号',
+ 出库事务类型:'出库事务类型',
+ 入库事务类型:'入库事务类型',
+ 执行时间:'执行时间',
+ 申请时间:'申请时间',
+ 截止时间:'截止时间',
+ 部门:'部门',
+ 接口类型:'接口类型',
+ 包装号:'包装号',
+ 订单号:'订单号',
+ 订单数量:'订单数量',
+ 数量:'数量',
+ 包装数量:'包装数量',
+ 供应商计量数量:'供应商计量数量',
+ 供应商:'供应商',
- },
- btn:{
+ 从库位代码:'从库位代码',
+ 到库位代码:'到库位代码',
+ 从库位组代码:'从库位组代码',
+ 到库位组代码:'到库位组代码',
+ 从库区代码:'从库区代码',
+ 到库区代码:'到库区代码',
+ 从货主代码:'从货主代码',
+ 到货主代码:'到货主代码',
+ 查看其他包装规格:'查看其他包装规格',
+ 包装规格:'包装规格',
+ 单据打印:'单据打印',
+ 明细列表:'明细列表',
+ 暂无数据:'暂无数据',
+ 供应商发货申请:'供应商发货申请',
+ 查询字段:'查询字段',
+ 供应商批次:'供应商批次',
+ 生产日期:'生产日期',
+ 发货数量:'发货数量',
+ 主数据:'主数据',
+ 要货计划单号:'要货计划单号',
+ 联系人姓名:'联系人姓名',
+ 联系人电话:'联系人电话',
+ 联系人电子邮件:'联系人电子邮件',
+ 供应商发货仓库代码:'供应商发货仓库代码',
+ 运输方式车牌号:'运输方式车牌号',
+ 自动提交:'自动提交',
+ 自动通过:'自动通过',
+ 自动执行:'自动执行',
+ 直接生成记录:'直接生成记录',
查询:'查询',
重置:'重置',
新增:'新增',
@@ -688,15 +752,12 @@ export default {
设置:'设置',
确定:'确定',
取消:'取消',
- 操作:'操作',
编辑:'编辑',
删除:'删除',
添加附件:'添加附件',
添加筛选条件:'添加筛选条件',
- 关闭:'关闭',
- 打开:'关闭',
- 保存:'关闭',
- 发布:'发布',
+ 打开:'打开',
+ 保存:'保存',
//////
启用:'启用',
禁用:'禁用',
@@ -716,7 +777,6 @@ export default {
打印标签:'打印标签',
批量打印:'批量打印',
生成采购收货申请:'生成采购收货申请',
- 单据打印:'单据打印',
发送到货检验申请:'发送到货检验申请',
生成采购上架申请:'生成采购上架申请',
生成盘点调整申请:'生成盘点调整申请',
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index b17c3eb2d..1d967ae75 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -9,7 +9,7 @@ const { t } = useI18n()
// 新增按钮
export function defaultAddBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.新增`).replace('btn.', ''),
+ label: t(`ts.新增`).replace('ts.', ''),
name: 'add',
hide: false,
type: 'primary',
@@ -22,7 +22,7 @@ export function defaultAddBtn(option:any) {
// 导入按钮
export function defaultImportBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.导入`).replace('btn.', ''),
+ label: t(`ts.导入`).replace('ts.', ''),
name: 'import',
hide: false,
type: 'warning',
@@ -35,7 +35,7 @@ export function defaultImportBtn(option:any) {
// 导出按钮
export function defaultExportBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.导出`).replace('btn.', ''),
+ label: t(`ts.导出`).replace('ts.', ''),
name: 'export',
hide: false,
type: 'success',
@@ -79,7 +79,7 @@ export function defaultExportBtn(option:any) {
// 刷新按钮
export function defaultFreshBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.刷新`).replace('btn.', ''),
+ label: t(`ts.刷新`).replace('ts.', ''),
name: 'refresh',
hide: false,
type: 'primary',
@@ -93,7 +93,7 @@ export function defaultFreshBtn(option:any) {
// 重置按钮
export function defaultResetBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.重置`).replace('btn.', ''),
+ label: t(`ts.重置`).replace('ts.', ''),
name: 'reset',
hide: false,
type: 'info',
@@ -107,7 +107,7 @@ export function defaultResetBtn(option:any) {
// 字段设置
export function defaultSetBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.设置`).replace('btn.', ''),
+ label: t(`ts.设置`).replace('ts.', ''),
name: 'set',
hide: false,
type: 'info',
@@ -121,7 +121,7 @@ export function defaultSetBtn(option:any) {
// 筛选按钮
export function defaultFilterBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.筛选`).replace('btn.', ''),
+ label: t(`ts.筛选`).replace('ts.', ''),
name: 'filtrate',
hide: false,
type: 'info',
@@ -135,7 +135,7 @@ export function defaultFilterBtn(option:any) {
// 筛选——查询按钮
export function defaultSearchBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.搜索`).replace('btn.', ''),
+ label: t(`ts.搜索`).replace('ts.', ''),
name: 'search',
hide: false,
type: 'primary',
@@ -149,7 +149,7 @@ export function defaultSearchBtn(option:any) {
// 筛选——重置按钮
export function defaultSearchResetBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.重置`).replace('btn.', ''),
+ label: t(`ts.重置`).replace('ts.', ''),
name: 'searchReset',
hide: false,
type: 'info',
@@ -163,7 +163,7 @@ export function defaultSearchResetBtn(option:any) {
// form表单-保存按钮
export function formSaveBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.保存`).replace('btn.', ''),
+ label: t(`ts.保存`).replace('ts.', ''),
name: 'save',
hide: false,
type: 'primary',
@@ -177,7 +177,7 @@ export function formSaveBtn(option:any) {
// form表单-关闭按钮
export function formCloseBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'close',
hide: false,
icon: 'ep:close',
@@ -187,10 +187,24 @@ export function formCloseBtn(option:any) {
})
}
+// form表单-关闭按钮
+export function formStagingBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: t(`btn.暂存`).replace('btn.', ''),
+ name: 'staging',
+ hide: false,
+
+ color: '',
+ float:'right',
+ hasPermi: ''
+ })
+}
+
+
// drawer抽屉头部-编辑按钮
export function drawerEditBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.编辑`).replace('btn.', ''),
+ label: t(`ts.编辑`).replace('ts.', ''),
name: 'edit',
hide: false,
type: 'warning',
@@ -203,7 +217,7 @@ export function drawerEditBtn(option:any) {
// drawer抽屉头部-删除按钮
export function drawerDeleteBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.删除`).replace('btn.', ''),
+ label: t(`ts.删除`).replace('ts.', ''),
name: 'delete',
hide: false,
type: 'danger',
@@ -229,7 +243,7 @@ export function drawerDeleteBtn(option:any) {
// 主列表-编辑按钮
export function mainListEditBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.编辑`).replace('btn.', ''),
+ label: t(`ts.编辑`).replace('ts.', ''),
name: 'edit',
hide: false,
type: 'warning',
@@ -242,7 +256,7 @@ export function mainListEditBtn(option:any) {
// 主列表-删除按钮
export function mainListDeleteBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.删除`).replace('btn.', ''),
+ label: t(`ts.删除`).replace('ts.', ''),
name: 'delete',
hide: false,
type: 'danger',
@@ -253,7 +267,7 @@ export function mainListDeleteBtn(option:any) {
}
export function mainListEnableBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.启用`).replace('btn.', ''),
+ label: t(`ts.启用`).replace('ts.', ''),
name: 'enable',
hide: false,
type: 'danger',
@@ -264,7 +278,7 @@ export function mainListEnableBtn(option:any) {
}
export function mainListDisableBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.禁用`).replace('btn.', ''),
+ label: t(`ts.禁用`).replace('ts.', ''),
name: 'disable',
hide: false,
type: 'danger',
@@ -276,7 +290,7 @@ export function mainListDisableBtn(option:any) {
// 主列表-中止按钮1
export function mainListSuspend1Btn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.中止`),
+ label: t(`ts.中止`),
name: 'suspend',
hide: false,
type: 'danger',
@@ -289,7 +303,7 @@ export function mainListSuspend1Btn(option:any) {
// 主列表-中止按钮2
export function mainListSuspend2Btn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.中止`).replace('btn.', ''),
+ label: t(`ts.中止`).replace('ts.', ''),
name: 'suspend',
hide: false,
type: 'danger',
@@ -302,7 +316,7 @@ export function mainListSuspend2Btn(option:any) {
// 主列表-领取按钮
export function mainListReceiveBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.领取`).replace('btn.', ''),
+ label: t(`ts.领取`).replace('ts.', ''),
name: 'receive',
hide: false,
type: 'primary',
@@ -315,7 +329,7 @@ export function mainListReceiveBtn(option:any) {
// 主列表-完成按钮
export function mainListFinishBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.完成`).replace('btn.', ''),
+ label: t(`ts.完成`).replace('ts.', ''),
name: 'finish',
hide: false,
type: 'primary',
@@ -328,7 +342,7 @@ export function mainListFinishBtn(option:any) {
// 主列表-绑定
export function mainListBindBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.绑定`).replace('btn.', ''),
+ label: t(`ts.绑定`).replace('ts.', ''),
name: 'bind',
hide: false,
type: 'primary',
@@ -340,7 +354,7 @@ export function mainListBindBtn(option:any) {
// 主列表-申请流程-关闭按钮
export function mainListCloseBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'mainClose',
hide: false,
type: 'danger',
@@ -353,7 +367,7 @@ export function mainListCloseBtn(option:any) {
// 主列表-申请流程-重新添加按钮
export function mainListReAddBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.重新添加`).replace('btn.', ''),
+ label: t(`ts.重新添加`).replace('ts.', ''),
name: 'mainReAdd',
hide: false,
type: 'warning',
@@ -366,7 +380,7 @@ export function mainListReAddBtn(option:any) {
// 主列表-申请流程-提交审批按钮
export function mainListSubmitBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.提交审批`).replace('btn.', ''),
+ label: t(`ts.提交审批`).replace('ts.', ''),
name: 'mainSubmit',
hide: false,
type: 'primary',
@@ -379,7 +393,7 @@ export function mainListSubmitBtn(option:any) {
// 主列表-申请流程-驳回按钮
export function mainListTurnDownBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.驳回`).replace('btn.', ''),
+ label: t(`ts.驳回`).replace('ts.', ''),
name: 'mainTurnDown',
hide: false,
type: 'danger',
@@ -392,7 +406,7 @@ export function mainListTurnDownBtn(option:any) {
// 主列表-申请流程-审批通过按钮
export function mainListApproveBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.审批通过`).replace('btn.', ''),
+ label: t(`ts.审批通过`).replace('ts.', ''),
name: 'mainApprove',
hide: false,
type: 'primary',
@@ -405,7 +419,7 @@ export function mainListApproveBtn(option:any) {
// 主列表-申请流程-处理按钮
export function mainListHandleBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.处理`).replace('btn.', ''),
+ label: t(`ts.处理`).replace('ts.', ''),
name: 'mainHandle',
hide: false,
type: 'primary',
@@ -418,7 +432,7 @@ export function mainListHandleBtn(option:any) {
// 主列表-订单流程-发布按钮
export function mainListOrderPubBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.发布`).replace('btn.', ''),
+ label: t(`ts.发布`).replace('ts.', ''),
name: 'mainOrderPub',
hide: false,
type: 'success',
@@ -431,7 +445,7 @@ export function mainListOrderPubBtn(option:any) {
// 主列表-订单流程-关闭按钮
export function mainListOrderCloBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'mainOrderClo',
hide: false,
type: 'danger',
@@ -444,7 +458,7 @@ export function mainListOrderCloBtn(option:any) {
// 主列表-订单流程-打开按钮
export function mainListOrderOpeBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.打开`).replace('btn.', ''),
+ label: t(`ts.打开`).replace('ts.', ''),
name: 'mainOrderOpe',
hide: false,
type: 'warning',
@@ -457,7 +471,7 @@ export function mainListOrderOpeBtn(option:any) {
// 主列表-订单流程-下架按钮
export function mainListOrderWitBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.下架`).replace('btn.', ''),
+ label: t(`ts.下架`).replace('ts.', ''),
name: 'mainOrderWit',
hide: false,
type: 'danger',
@@ -470,7 +484,7 @@ export function mainListOrderWitBtn(option:any) {
// 主列表-计划流程-打开按钮
export function mainListPlanOpeBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.打开`).replace('btn.', ''),
+ label: t(`ts.打开`).replace('ts.', ''),
name: 'mainPlanOpe',
hide: false,
type: 'warning',
@@ -483,7 +497,7 @@ export function mainListPlanOpeBtn(option:any) {
// 主列表-计划流程-关闭按钮
export function mainListPlanCloBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'mainPlanClo',
hide: false,
type: 'danger',
@@ -496,7 +510,7 @@ export function mainListPlanCloBtn(option:any) {
// 主列表-上传质量报告
export function mainListPlanUploadQualityReportBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.上传质量报告`).replace('btn.', ''),
+ label: t(`ts.上传质量报告`).replace('ts.', ''),
name: 'mainPlanUploadQualityReport',
hide: false,
type: 'primary',
@@ -509,7 +523,7 @@ export function mainListPlanUploadQualityReportBtn(option:any) {
// 主列表-计划流程-提交审批按钮
export function mainListPlanSubBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.提交审批`).replace('btn.', ''),
+ label: t(`ts.提交审批`).replace('ts.', ''),
name: 'mainPlanSub',
hide: false,
type: 'primary',
@@ -522,7 +536,7 @@ export function mainListPlanSubBtn(option:any) {
// 主列表-计划流程-驳回按钮
export function mainListPlanTurBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.驳回`).replace('btn.', ''),
+ label: t(`ts.驳回`).replace('ts.', ''),
name: 'mainPlanTur',
hide: false,
type: 'danger',
@@ -535,7 +549,7 @@ export function mainListPlanTurBtn(option:any) {
// 主列表-计划流程-重置按钮
export function mainListPlanResBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.重置`).replace('btn.', ''),
+ label: t(`ts.重置`).replace('ts.', ''),
name: 'mainPlanRes',
hide: false,
type: 'danger',
@@ -548,7 +562,7 @@ export function mainListPlanResBtn(option:any) {
// 主列表-计划流程-审批通过按钮
export function mainListPlanAppBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.审批通过`).replace('btn.', ''),
+ label: t(`ts.审批通过`).replace('ts.', ''),
name: 'mainPlanApp',
hide: false,
type: 'primary',
@@ -561,7 +575,7 @@ export function mainListPlanAppBtn(option:any) {
// 主列表-计划流程-发布按钮
export function mainListPlanPubBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.发布`).replace('btn.', ''),
+ label: t(`ts.发布`).replace('ts.', ''),
name: 'mainPlanPub',
hide: false,
type: 'success',
@@ -574,7 +588,7 @@ export function mainListPlanPubBtn(option:any) {
// 主列表-计划流程-执行按钮
export function mainListPlanComBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.执行`).replace('btn.', ''),
+ label: t(`ts.执行`).replace('ts.', ''),
name: 'mainPlanCom',
hide: false,
type: 'danger',
@@ -587,7 +601,7 @@ export function mainListPlanComBtn(option:any) {
// 主列表-要货计划流程-修改按钮
export function mainListPurchasePlanModBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.修改`).replace('btn.', ''),
+ label: t(`ts.修改`).replace('ts.', ''),
name: 'mainPurPlanMod',
hide: false,
type: 'danger',
@@ -600,7 +614,7 @@ export function mainListPurchasePlanModBtn(option:any) {
// 主列表-要货计划流程-下架按钮
export function mainListPurchasePlanWitBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.下架`),
+ label: t(`ts.下架`),
name: 'mainPurPlanWit',
hide: false,
type: 'danger',
@@ -613,7 +627,7 @@ export function mainListPurchasePlanWitBtn(option:any) {
// 主列表-要货计划流程-不接受按钮
export function mainListPurchasePlanRejBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.不接受`).replace('btn.', ''),
+ label: t(`ts.不接受`).replace('ts.', ''),
name: 'mainPurPlanRej',
hide: false,
type: 'danger',
@@ -626,7 +640,7 @@ export function mainListPurchasePlanRejBtn(option:any) {
// 主列表-要货计划流程-接受按钮
export function mainListPurchasePlanAccBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.接受`).replace('btn.', ''),
+ label: t(`ts.接受`).replace('ts.', ''),
name: 'mainPurPlanAcc',
hide: false,
type: 'primary',
@@ -639,7 +653,7 @@ export function mainListPurchasePlanAccBtn(option:any) {
// 主列表-要货计划流程-发布按钮
export function mainListPurchasePlanPubBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.发布`).replace('btn.', ''),
+ label: t(`ts.发布`).replace('ts.', ''),
name: 'mainPurPlanPub',
hide: false,
type: 'success',
@@ -652,7 +666,7 @@ export function mainListPurchasePlanPubBtn(option:any) {
// 主列表-要货计划流程-关闭按钮
export function mainListPurchasePlanCloBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'mainPurPlanClo',
hide: false,
type: 'danger',
@@ -665,7 +679,7 @@ export function mainListPurchasePlanCloBtn(option:any) {
// 主列表-要货计划流程-打开按钮
export function mainListPurchasePlanOpeBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.打开`).replace('btn.', ''),
+ label: t(`ts.打开`).replace('ts.', ''),
name: 'mainPurPlanOpe',
hide: false,
type: 'warning',
@@ -678,7 +692,7 @@ export function mainListPurchasePlanOpeBtn(option:any) {
// 主列表-任务流程-承接按钮
export function mainListJobAccBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.承接`).replace('btn.', ''),
+ label: t(`ts.承接`).replace('ts.', ''),
name: 'mainJobAcc',
hide: false,
type: 'success',
@@ -691,7 +705,7 @@ export function mainListJobAccBtn(option:any) {
// 主列表-任务流程-关闭按钮
export function mainListJobCloBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.关闭`).replace('btn.', ''),
+ label: t(`ts.关闭`).replace('ts.', ''),
name: 'mainJobClo',
hide: false,
type: 'danger',
@@ -704,7 +718,7 @@ export function mainListJobCloBtn(option:any) {
// 主列表-任务流程-放弃按钮
export function mainListJobAbaBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.放弃`).replace('btn.', ''),
+ label: t(`ts.放弃`).replace('ts.', ''),
name: 'mainJobAba',
hide: false,
type: 'danger',
@@ -717,7 +731,7 @@ export function mainListJobAbaBtn(option:any) {
// 主列表-任务流程-执行按钮
export function mainListJobExeBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.执行`).replace('btn.', ''),
+ label: t(`ts.执行`).replace('ts.', ''),
name: 'mainJobExe',
hide: false,
type: 'primary',
@@ -730,7 +744,7 @@ export function mainListJobExeBtn(option:any) {
// 主列表-任务流程-执行按钮(与执行按钮一致 只是名改叫'收货'而已)
export function mainListJobRecBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.收货`).replace('btn.', ''),
+ label: t(`ts.收货`).replace('ts.', ''),
name: 'mainJobExe',
hide: false,
type: 'primary',
@@ -742,7 +756,7 @@ export function mainListJobRecBtn(option:any) {
// 主列表-包装按钮
export function mainListPackageBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.包装`).replace('btn.', ''),
+ label: t(`ts.包装`).replace('ts.', ''),
name: 'mainPackage',
hide: false,
type: 'primary',
@@ -754,7 +768,7 @@ export function mainListPackageBtn(option:any) {
// 主列表-打印
export function mainListPointBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.打印标签`).replace('btn.', ''),
+ label: t(`ts.打印标签`).replace('ts.', ''),
name: 'point',
hide: false,
type: 'primary',
@@ -766,7 +780,7 @@ export function mainListPointBtn(option:any) {
// 主列表-批量打印
export function mainLisSelectiontPointBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.批量打印`).replace('btn.', ''),
+ label: t(`ts.批量打印`).replace('ts.', ''),
name: 'selection_point',
hide: false,
type: 'primary',
@@ -779,7 +793,7 @@ export function mainLisSelectiontPointBtn(option:any) {
// 主列表-生成采购收货申请
export function mainListGenerateApplicationBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.生成采购收货申请`).replace('btn.', ''),
+ label: t(`ts.生成采购收货申请`).replace('ts.', ''),
name: 'generateApplication',
hide: false,
type: 'primary',
@@ -791,7 +805,7 @@ export function mainListGenerateApplicationBtn(option:any) {
// 主列表-打印
export function mainListDocumentPrintBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.单据打印`).replace('btn.', ''),
+ label: t(`ts.单据打印`).replace('ts.', ''),
name: 'documentPrint',
hide: false,
type: 'primary',
@@ -803,7 +817,7 @@ export function mainListDocumentPrintBtn(option:any) {
// 主列表-生成到货检验申请
export function mainInspectRequestBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.发送到货检验申请`).replace('btn.', ''),
+ label: t(`ts.发送到货检验申请`).replace('ts.', ''),
name: 'inspectRequest',
hide: false,
type: 'primary',
@@ -815,7 +829,7 @@ export function mainInspectRequestBtn(option:any) {
// 主列表-生成采购上架申请
export function mainPutawayRequestBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.生成采购上架申请`).replace('btn.', ''),
+ label: t(`ts.生成采购上架申请`).replace('ts.', ''),
name: 'putawayRequest',
hide: false,
type: 'primary',
@@ -827,7 +841,7 @@ export function mainPutawayRequestBtn(option:any) {
// 主列表-生成盘点调整申请
export function mainCountAdjustRequesttBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.生成盘点调整申请`).replace('btn.', ''),
+ label: t(`ts.生成盘点调整申请`).replace('ts.', ''),
name: 'countAdjustRequest',
hide: false,
type: 'primary',
@@ -839,7 +853,7 @@ export function mainCountAdjustRequesttBtn(option:any) {
// 主列表-重盘
export function mainReCountBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.重盘`).replace('btn.', ''),
+ label: t(`ts.重盘`).replace('ts.', ''),
name: 'mainReCount',
hide: false,
type: 'primary',
@@ -851,7 +865,7 @@ export function mainReCountBtn(option:any) {
// 主列表-监盘
export function mainSuperviseCountBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.监盘`).replace('btn.', ''),
+ label: t(`ts.监盘`).replace('ts.', ''),
name: 'mainSuperviseCount',
hide: false,
type: 'primary',
@@ -863,7 +877,7 @@ export function mainSuperviseCountBtn(option:any) {
// 主列表-解冻
export function mainThawRequesttBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.解冻`).replace('btn.', ''),
+ label: t(`ts.解冻`).replace('ts.', ''),
name: 'mainThaw',
hide: false,
type: 'primary',
@@ -875,7 +889,7 @@ export function mainThawRequesttBtn(option:any) {
// 主列表-更新检验记录
export function mainUpdataRecodeBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.更新检验记录`).replace('btn.', ''),
+ label: t(`ts.更新检验记录`).replace('ts.', ''),
name: 'updataRecode',
hide: false,
type: 'primary',
@@ -887,7 +901,7 @@ export function mainUpdataRecodeBtn(option:any) {
// 主列表-使用决策
export function mainApplyDecisionBtn(option:any) {
return __defaultBtnOption(option,{
- label: t(`btn.使用决策`).replace('btn.', ''),
+ label: t(`ts.使用决策`).replace('ts.', ''),
name: 'applyDecision',
hide: false,
type: 'primary',
diff --git a/src/utils/formatter.ts b/src/utils/formatter.ts
index 7c6e39ffa..600e0b724 100644
--- a/src/utils/formatter.ts
+++ b/src/utils/formatter.ts
@@ -10,3 +10,14 @@ export const fenToYuanFormat = (
) => {
return `¥${fenToYuan(cellValue)}`
}
+export const accountantFormart = (row, column, cellValue) => {
+ cellValue = cellValue + '' || ''
+ let x = cellValue.split('.')
+ let x1 = x[0]
+ let x2 = x.length > 1 ? '.' + x[1] : ''
+ const reg = /(\d+)(\d{3})/
+ while(reg.test(x1)){
+ x1 = x1.replace(reg, '$1,$2')
+ }
+ return x1+x2
+}
diff --git a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts b/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
deleted file mode 100644
index ac8af2650..000000000
--- a/src/views/qms/basicDataManage/selectedProject/selectedProject.data.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-import * as DictTypeApi from '@/api/system/dict/dict.type'
-
-const optionsList = await DictTypeApi.getDictTypeAndData('inspection')
-optionsList.forEach(element => {
- element.options = element.dictDataRespVOList.map(item => {
- return {
- value: element.type + "-%%%-" + item.value,
- label: element.name + "-" + item.label
- }
- })
-})
-
-// 表单校验
-export const SelectedProjectRules = reactive({
- code: [required],
- dictionaryTypeAndCode: [required],
- estimateCode: [required],
- defectLevel: [required],
-})
-
-export const SelectedProject = useCrudSchemas(reactive([
-
- {
- label: '编码',
- field: 'code',
- sort: 'custom',
- isTableForm: false,
- isSearch: true,
- fixed: 'left',
- form: {
- componentProps:{
- disabled:true
- }
- }
- },
- {
- label: '字典及字典项',
- field: 'dictionaryTypeAndCode',
- sort: 'custom',
- formatter: (_: Recordable, __: TableColumn, cellValue: boolean) => {
- return optionsList.find(item => item.options.some(option => option.value === cellValue))?.options.find(option => option.value === cellValue)?.label
- },
- isSearch: false,
- isDetail: false,
- isTable: true,
- isForm: true,
- tableForm: {
- type: 'SelectGroup',
- initOptions: optionsList,
- filterable: true,
- },
- form: {
- component: 'Select',
- componentProps: {
- options: optionsList,
- filterable: true,
- }
- },
-
- },
- {
- label: '字典',
- field: 'dictionaryCode',
- sort: 'custom',
- isSearch: false,
- isTableForm: false,
- isDetail: false,
- isTable: false,
- isForm: false,
- },
- {
- label: '字典项',
- field: 'dictionaryValue',
- sort: 'custom',
- isSearch: false,
- isTableForm: false,
- isDetail: false,
- isTable: false,
- isForm: false,
- },
- {
- label: '字典名称',
- field: 'dictionaryLabel',
- sort: 'custom',
- isSearch: false,
- isTableForm: false,
- isDetail: false,
- isTable: false,
- isForm: false,
- },
- {
- label: '评估代码',
- field: 'estimateCode',
- sort: 'custom',
- isSearch: true,
- dictType: DICT_TYPE.EVALUATION_CODE,
- dictClass: 'string',
- tableForm: {
- type: 'Select',
- },
- form: {
- component: 'Select',
- }
- },
- {
- label: '缺陷级别',
- field: 'defectLevel',
- sort: 'custom',
- isSearch: true,
- dictType: DICT_TYPE.DEFECT_LEVEL,
- dictClass: 'string',
- tableForm: {
- type: 'Select',
- },
- form: {
- component: 'Select',
- }
- },
- {
- label: '操作',
- field: 'action',
- isForm: false,
- table: {
- width: 150,
- fixed: 'right'
- },
- isTableForm: false,
- }
-]))
-
-
diff --git a/src/views/qms/basicDataManage/counter/counter.data.ts b/src/views/qms/counter/counter.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/counter/counter.data.ts
rename to src/views/qms/counter/counter.data.ts
diff --git a/src/views/qms/basicDataManage/counter/index.vue b/src/views/qms/counter/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/counter/index.vue
rename to src/views/qms/counter/index.vue
diff --git a/src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts b/src/views/qms/dynamicRule/dynamicRule.data.ts
similarity index 100%
rename from src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts
rename to src/views/qms/dynamicRule/dynamicRule.data.ts
diff --git a/src/views/qms/basicDataManage/dynamicRule/index.vue b/src/views/qms/dynamicRule/index.vue
similarity index 100%
rename from src/views/qms/basicDataManage/dynamicRule/index.vue
rename to src/views/qms/dynamicRule/index.vue
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionJob/addForm.vue
rename to src/views/qms/inspectionJob/addForm.vue
diff --git a/src/views/qms/inspection/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue
similarity index 100%
rename from src/views/qms/inspection/inspectionJob/detail.vue
rename to src/views/qms/inspectionJob/detail.vue
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
similarity index 98%
rename from src/views/qms/inspection/inspectionJob/index.vue
rename to src/views/qms/inspectionJob/index.vue
index 1c3b1f33b..dcc7d81b3 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -59,7 +59,7 @@
diff --git a/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
new file mode 100644
index 000000000..d5dee49f8
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/relegateRequest/relegateRequest.data.ts
@@ -0,0 +1,243 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+
+// 表单校验
+export const RelegateRequestRules = reactive({
+ itemCode: [required],
+ downItemCode: [required],
+ businessType: [required],
+ available: [required],
+ departmentCode: [required],
+ concurrencyStamp: [required],
+})
+
+export const RelegateRequest = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '物料代码',
+ field: 'itemCode',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ componentProps: {
+ isSearchList: true,
+ searchListPlaceholder: '请选择物料代码',
+ searchField: 'itemCode',
+ searchTitle: '客户物料基础信息',
+ searchAllSchemas: Itembasic.allSchemas,
+ searchPage: ItembasicApi.getItembasicPage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ }
+ }
+ },
+ {
+ label: '降级后物料代码',
+ field: 'downItemCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ sort: 'custom',
+ form: {
+ componentProps: {
+ disabled: true,
+ }
+ },
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ },
+ {
+ label: '从批次',
+ field: 'fromBatch',
+ sort: 'custom',
+ form: {
+ componentProps: {
+ disabled: true,
+ }
+ },
+ },
+ {
+ label: '从包装号',
+ field: 'fromPackingNumber',
+ sort: 'custom',
+ form: {
+ componentProps: {
+ disabled: true,
+ }
+ },
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ form: {
+ componentProps: {
+ disabled: true,
+ }
+ },
+ },
+ {
+ label: '从库区类型',
+ field: 'fromAreaTypes',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '从库区代码',
+ field: 'fromAreaCodes',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '从仓库代码',
+ field: 'fromWarehouseCode',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '到包装号',
+ field: 'toPackingNumber',
+ sort: 'custom',
+ },
+ {
+ label: '到批次',
+ field: 'toBatch',
+ sort: 'custom',
+ },
+ {
+ label: '到库位代码',
+ field: 'toLocationCode',
+ sort: 'custom',
+ },
+ {
+ label: '到仓库代码',
+ field: 'toWarehouseCode',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '到库区类型',
+ field: 'toAreaTypes',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '到库区代码',
+ field: 'toAreaCodes',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '地点ID',
+ field: 'siteId',
+ sort: 'custom',
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ isForm:false,
+ },
+ {
+ label: '扩展属性',
+ field: 'extraProperties',
+ sort: 'custom',
+ isForm:false,
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ 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')]
+ }
+ },
+ isForm: false,
+ },
+ {
+ label: '状态',
+ field: 'status',
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isForm: false,
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '并发乐观锁',
+ field: 'concurrencyStamp',
+ sort: 'custom',
+ isForm:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '工作流流水号',
+ field: 'serialNumber',
+ isForm:false,
+ sort: 'custom',
+ },
+ {
+ label: '权限所属人员id',
+ field: 'ruleUserId',
+ sort: 'custom',
+ isForm:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 9394880ba..e0345b511 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -92,7 +92,6 @@ import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,Deliver
import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain'
import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
// 发货申请
defineOptions({ name: 'DeliverRequestMain' })
@@ -103,7 +102,6 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
-const customerCode = ref()
const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 4a5107150..623f4d311 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -4,6 +4,9 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
import * as CustomerApi from '@/api/wms/customer'
import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data'
+
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
@@ -357,15 +360,20 @@ export const SaleDetail = useCrudSchemas(reactive([
{
label: '包装规格',
field: 'packUnit',
- // dictType: DICT_TYPE.PACK_UNIT,
- // dictClass: 'string',
- isTable: true,
sort: 'custom',
table: {
width: 150
},
- tableForm: {
- type: 'Select'
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '包装规格信息', // 查询弹窗标题
+ searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+ searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+ }
}
},
{
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
new file mode 100644
index 000000000..cb188aa14
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -0,0 +1,348 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.number }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
new file mode 100644
index 000000000..8f9dbb872
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -0,0 +1,463 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
+
+import * as SaleDetailApi from '@/api/wms/saleDetail'
+import { SaleDetail } from '@/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data'
+
+import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
+// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
+const queryParams = {
+ pageSize:10,
+ pageNo:1,
+ code:'DeliverRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+// 表单校验
+export const SaleShipmentMainRules = reactive({
+})
+
+export const SaleShipmentMain = useCrudSchemas(reactive([
+ {
+ label: '客户代码',
+ field: 'customerCode',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ enterSearch: true,
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '客户信息', // 查询弹窗标题
+ searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+ searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ }
+ }
+ },
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false,
+ },
+ {
+ label: '业务类型',
+ field: 'businessType',
+ sort: 'custom',
+ isForm: false,
+ table: {
+ width: 150
+ },
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isForm: false,
+ },
+ {
+ label: '发票时间',
+ field: 'invoiceTime',
+ 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')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '地点',
+ field: 'siteId',
+ sort: 'custom',
+ isSearch: true,
+ hiddenInMain: true,
+ },
+ {
+ label: '部门',
+ field: 'departmentCode',
+ sort: 'custom',
+ isForm: false,
+ },
+ {
+ label: '状态',
+ field: 'status',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ dictType: DICT_TYPE.REQUEST_STATUS,
+ dictClass: 'string',
+ isSearch: true,
+ isForm:false,
+ },
+ {
+ label: '自动提交',
+ field: 'autoCommit',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoCommit,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '自动通过',
+ field: 'autoAgree',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoAgree,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '自动执行',
+ field: 'autoExecute',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: false,
+ isForm: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.autoExecute,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '直接生成记录',
+ field: 'directCreateRecord',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isForm: false,
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ form: {
+ component: 'Switch',
+ value: requestsettingData.directCreateRecord,
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE',
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ 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')]
+ }
+ },
+ isForm: false,
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
+
+// 表单校验
+export const SaleShipmentDetailRules = reactive({
+})
+
+export const SaleShipmentDetail = useCrudSchemas(reactive([
+ {
+ label: '单据号',
+ field: 'number',
+ sort: 'custom',
+ isSearch: true,
+ table: {
+ width: 180
+ },
+ isTable: false,
+ isTableForm: false,
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '销售订单号',
+ field: 'soNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select',
+ disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '销售订单行',
+ field: 'soLine',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm:{
+ isInpuFocusShow: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择销售订单行',
+ searchField: 'lineNumber',
+ searchTitle: '销售订单信息',
+ searchAllSchemas: SaleDetail.allSchemas,
+ searchPage: SaleDetailApi.getSaleDetailPage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ }]
+ },
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true,
+ searchListPlaceholder: '请选择销售订单行',
+ searchField: 'lineNumber',
+ searchTitle: '销售订单信息',
+ searchAllSchemas: SaleDetail.allSchemas,
+ searchPage: SaleDetailApi.getSaleDetailPage,
+ searchCondition: [{
+ key: 'available',
+ value: 'TRUE',
+ isMainValue: false
+ },
+ {
+ key: 'customerCode',
+ value: 'customerCode',
+ isMainValue: true
+ }]
+ }
+ }
+ },
+ {
+ label: '物品代码',
+ field: 'itemCode',
+ sort: 'custom',
+ isSearch: true,
+ tableForm: {
+ type: 'Select',
+ disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '批次',
+ field: 'batch',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '从货主代码',
+ field: 'fromOwnerCode',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false,
+ isTableForm: false
+ },
+ {
+ label: '包装号',
+ field: 'packingNumber',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false,
+ isTableForm: false
+ },
+
+ {
+ label: '库存状态',
+ field: 'inventoryStatus',
+ // dictType: DICT_TYPE.INVENTORY_STATUS,
+ // dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isTableForm: false,
+ hiddenInMain: true,
+ isForm: false,
+ },
+ {
+ label: '从库位代码',
+ field: 'fromLocationCode',
+ sort: 'custom',
+ isSearch: true,
+ isTableForm: false
+ },
+
+ {
+ label: '物品名称',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTableForm: false
+ },
+ {
+ label: '物品描述1',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTableForm: false
+ },
+ {
+ label: '物品描述2',
+ field: 'itemName',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ isForm: false,
+ isTableForm: false
+ },
+ {
+ label: '项目代码',
+ field: 'projectCode',
+ sort: 'custom',
+ isSearch: true,
+ isTableForm: false,
+ hiddenInMain: true,
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '计量单位',
+ field: 'uom',
+ dictType: DICT_TYPE.UOM,
+ dictClass: 'string',
+ isTable: true,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ tableForm: {
+ type: 'Select',
+ disabled: true
+ },
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ }
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isSearch: true,
+ isTableForm: false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: true,
+ 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')]
+ }
+ },
+ isForm: false,
+ isTableForm: false
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
\ No newline at end of file
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index c29587068..573346e1d 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -35,25 +35,25 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '使用在途库',
- field: 'useOnTheWayLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
+ // {
+ // label: '使用在途库',
+ // field: 'useOnTheWayLocation',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
{
label: '申请时间',
field: 'requestTime',
@@ -105,6 +105,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([
table: {
width: 180
},
+ isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@@ -130,394 +131,409 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '优先级',
- field: 'priority',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '优先级增量',
- field: 'priorityIncrement',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'InputNumber',
- }
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '自动完成',
- field: 'autoComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许修改库位',
- field: 'allowModifyLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许修改数量',
- field: 'allowModifyQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许大于推荐数量',
- field: 'allowBiggerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许小于推荐数量',
- field: 'allowSmallerQty',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许修改库存状态',
- field: 'allowModifyInventoryStatus',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许连续扫描',
- field: 'allowContinuousScanning',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许部分完成',
- field: 'allowPartialComplete',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许修改批次',
- field: 'allowModifyBatch',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '允许修改箱码',
- field: 'allowModifyPackingNumber',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '承接时间',
- field: 'acceptTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '承接人',
- field: 'acceptUserId',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '完成时间',
- field: 'completeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '完成人',
- field: 'completeUserId',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '从库区代码范围',
+ // field: 'fromAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '到库区代码范围',
+ // field: 'toAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '从库区类型范围',
+ // field: 'fromAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isSearch: true,
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '到库区类型范围',
+ // field: 'toAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isSearch: true,
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '优先级',
+ // field: 'priority',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'InputNumber',
+ // }
+ // },
+ // {
+ // label: '优先级增量',
+ // field: 'priorityIncrement',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'InputNumber',
+ // }
+ // },
+ // {
+ // label: '业务类型',
+ // field: 'businessType',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '部门',
+ // field: 'departmentCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '自动完成',
+ // field: 'autoComplete',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许修改库位',
+ // field: 'allowModifyLocation',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许修改数量',
+ // field: 'allowModifyQty',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许大于推荐数量',
+ // field: 'allowBiggerQty',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许小于推荐数量',
+ // field: 'allowSmallerQty',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许修改库存状态',
+ // field: 'allowModifyInventoryStatus',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许连续扫描',
+ // field: 'allowContinuousScanning',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许部分完成',
+ // field: 'allowPartialComplete',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许修改批次',
+ // field: 'allowModifyBatch',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '允许修改箱码',
+ // field: 'allowModifyPackingNumber',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '承接时间',
+ // field: 'acceptTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '承接人',
+ // field: 'acceptUserId',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '完成时间',
+ // field: 'completeTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '完成人',
+ // field: 'completeUserId',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '创建者',
+ // field: 'creator',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '最后更新时间',
+ // field: 'updateTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // isTable: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '最后更新者',
+ // field: 'updater',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
// {
// label: '状态',
// field: 'jobStageStatus',
@@ -604,6 +620,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
table: {
width: 180
},
+ hiddenInMain:true
},
{
label: '物料代码',
@@ -653,14 +670,14 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '器具号',
- field: 'containerNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '器具号',
+ // field: 'containerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
{
label: '数量',
field: 'qty',
@@ -721,22 +738,22 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
// width: 150
// },
// },
- {
- label: '订单号',
- field: 'poNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '订单行',
- field: 'poLine',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '订单号',
+ // field: 'poNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '订单行',
+ // field: 'poLine',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
{
label: '从货主代码',
field: 'fromOwnerCode',
@@ -744,6 +761,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ hiddenInMain:true
},
{
label: '到货主代码',
@@ -752,51 +770,52 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([
table: {
width: 150
},
+ hiddenInMain:true
},
- {
- label: '项目代码',
- field: 'projectCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '项目代码',
+ // field: 'projectCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '创建者',
+ // field: 'creator',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
]))
//表单校验
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index 28365764f..814928486 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -33,106 +33,106 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([
},
isSearch: true
},
- {
- label: '使用在途库',
- field: 'useOnTheWayLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '执行时间',
- field: 'executeTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '生效日期',
- field: 'activeDate',
- formatter: dateFormatter2,
- detail: {
- dateFormat: 'YYYY-MM-DD'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width: '100%'},
- type: 'date',
- dateFormat: 'YYYY-MM-DD',
- valueFormat: 'x',
- }
- },
- },
+ // {
+ // label: '使用在途库',
+ // field: 'useOnTheWayLocation',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '申请时间',
+ // field: 'requestTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '截止时间',
+ // field: 'dueTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '执行时间',
+ // field: 'executeTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '生效日期',
+ // field: 'activeDate',
+ // formatter: dateFormatter2,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width: '100%'},
+ // type: 'date',
+ // dateFormat: 'YYYY-MM-DD',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
{
label: '从仓库代码',
field: 'fromWarehouseCode',
@@ -149,44 +149,44 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区类型范围',
- field: 'toAreaTypes',
- dictType: DICT_TYPE.AREA_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '从库区类型范围',
+ // field: 'fromAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '到库区类型范围',
+ // field: 'toAreaTypes',
+ // dictType: DICT_TYPE.AREA_TYPE,
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '从库区代码范围',
+ // field: 'fromAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '到库区代码范围',
+ // field: 'toAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
{
label: '出库事务类型',
field: 'outTransactionType',
@@ -211,61 +211,61 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '创建时间',
- field: 'createTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '部门',
+ // field: 'departmentCode',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '接口类型',
+ // field: 'interfaceType',
+ // dictType: DICT_TYPE.INTERFACE_TYPE,
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // },
+ // {
+ // label: '创建者',
+ // field: 'creator',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
// {
// label: '代码',
// field: 'code',
@@ -274,26 +274,26 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([
// width: 150
// },
// },
- {
- label: '是否可用',
- field: 'available',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
+ // {
+ // label: '是否可用',
+ // field: 'available',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isSearch: true,
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
]))
//表单校验
@@ -362,6 +362,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([
table: {
width: 180
},
+ hiddenInMain: true,
},
{
label: '物料代码',
@@ -435,22 +436,22 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([
width: 150
},
},
- {
- label: '从器具号',
- field: 'fromContainerNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- },
- {
- label: '到器具号',
- field: 'toContainerNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '从器具号',
+ // field: 'fromContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
+ // {
+ // label: '到器具号',
+ // field: 'toContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
{
label: '数量',
field: 'qty',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index b5228220e..0c45941bd 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -84,7 +84,6 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq
import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain'
import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import { log } from 'console'
// 库存转移申请
defineOptions({ name: 'InventorymoveRequestMain' })
@@ -602,8 +601,6 @@ const submitForm = async (formType, data) => {
data.subList = tableData.value // 拼接子表数据参数
let isExist = false
tableData.value.forEach(item => {
- console.log(item,777777777777);
-
let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) )
console.log(rs,5666);
if(rs.length > 1) isExist = true
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 9a1178d44..03be56344 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -102,70 +102,6 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([
}
}
},
- {
- label: '申请时间',
- field: 'requestTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: { width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isForm: false,
- },
- {
- label: '截止时间',
- field: 'dueTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: { width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- },
- {
- label: '从库区类型范围',
- field: 'fromAreaTypes',
- // dictType: DICT_TYPE.AREA_TYPE,
- // dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '从库区代码范围',
- field: 'fromAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
{
label: '到仓库代码',
field: 'toWarehouseCode',
@@ -176,182 +112,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '到库区类型范围',
- field: 'toAreaTypes',
- // dictType: DICT_TYPE.AREA_TYPE,
- // dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- isSearch: true,
- isForm: false,
- },
- {
- label: '到库区代码范围',
- field: 'toAreaCodes',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '业务类型',
- field: 'businessType',
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- value: 'Move',
- componentProps: {
- disabled: true
- }
- },
- isForm: false,
- },
- {
- label: '部门',
- field: 'departmentCode',
- sort: 'custom',
- isForm: false,
- table: {
- width: 150
- },
- formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
- return userDeptArray.find((account) => account.id == cellValue)?.name
- },
- form: {
- value: userDept.id,
- component: 'Select',
- api: () => userDeptArray,
- componentProps: {
- disabled: true,
- optionsAlias: {
- labelField: 'name',
- valueField: 'id'
- }
- }
- }
- },
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- isTable: false,
- },
- {
- label: '自动提交',
- field: 'autoCommit',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.autoCommit,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
- }
- }
- },
- {
- label: '自动通过',
- field: 'autoAgree',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.autoAgree,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
- }
- }
- },
- {
- label: '自动执行',
- field: 'autoExecute',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isTable: true,
- isForm: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.autoExecute,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
- }
- }
- },
- {
- label: '直接生成记录',
- field: 'directCreateRecord',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isForm: false,
- isTable: false,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: requestsettingData.directCreateRecord,
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE',
- disabled: true
- }
- }
- },
- {
- label: '使用在途库',
- field: 'useOnTheWayLocation',
- dictType: DICT_TYPE.TRUE_FALSE,
- dictClass: 'string',
- isSearch: true,
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- },
- form: {
- component: 'Switch',
- value: 'TRUE',
- componentProps: {
- inactiveValue: 'FALSE',
- activeValue: 'TRUE'
- }
- }
- },
- {
- label: '创建时间',
- field: 'createTime',
+ label: '申请时间',
+ field: 'requestTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -372,17 +134,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([
isForm: false,
},
{
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false,
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
+ label: '截止时间',
+ field: 'dueTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -400,17 +153,265 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([
valueFormat: 'x',
}
},
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isForm: false
},
+ // {
+ // label: '从库区类型范围',
+ // field: 'fromAreaTypes',
+ // // dictType: DICT_TYPE.AREA_TYPE,
+ // // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '从库区代码范围',
+ // field: 'fromAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
+
+ // {
+ // label: '到库区类型范围',
+ // field: 'toAreaTypes',
+ // // dictType: DICT_TYPE.AREA_TYPE,
+ // // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isSearch: true,
+ // isForm: false,
+ // },
+ // {
+ // label: '到库区代码范围',
+ // field: 'toAreaCodes',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '业务类型',
+ // field: 'businessType',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // value: 'Move',
+ // componentProps: {
+ // disabled: true
+ // }
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '部门',
+ // field: 'departmentCode',
+ // sort: 'custom',
+ // isForm: false,
+ // table: {
+ // width: 150
+ // },
+ // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+ // return userDeptArray.find((account) => account.id == cellValue)?.name
+ // },
+ // form: {
+ // value: userDept.id,
+ // component: 'Select',
+ // api: () => userDeptArray,
+ // componentProps: {
+ // disabled: true,
+ // optionsAlias: {
+ // labelField: 'name',
+ // valueField: 'id'
+ // }
+ // }
+ // }
+ // },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTable: false,
+ // },
+ // {
+ // label: '自动提交',
+ // field: 'autoCommit',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: true,
+ // isForm: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: requestsettingData.autoCommit,
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE',
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '自动通过',
+ // field: 'autoAgree',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: true,
+ // isForm: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: requestsettingData.autoAgree,
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE',
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '自动执行',
+ // field: 'autoExecute',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isTable: true,
+ // isForm: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: requestsettingData.autoExecute,
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE',
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '直接生成记录',
+ // field: 'directCreateRecord',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isForm: false,
+ // isTable: false,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: requestsettingData.directCreateRecord,
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE',
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '使用在途库',
+ // field: 'useOnTheWayLocation',
+ // dictType: DICT_TYPE.TRUE_FALSE,
+ // dictClass: 'string',
+ // isSearch: true,
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // form: {
+ // component: 'Switch',
+ // value: 'TRUE',
+ // componentProps: {
+ // inactiveValue: 'FALSE',
+ // activeValue: 'TRUE'
+ // }
+ // }
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: { width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '创建者',
+ // field: 'creator',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // },
+ // {
+ // label: '最后更新时间',
+ // field: 'updateTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: { width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // isForm: false
+ // },
+ // {
+ // label: '最后更新者',
+ // field: 'updater',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isForm: false
+ // },
{
label: '操作',
field: 'action',
@@ -463,6 +464,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
width: 180
},
isTableForm: false,
+ hiddenInMain: true,
form: {
componentProps: {
disabled: true
@@ -578,32 +580,32 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
isTableForm: false,
isForm: false,
},
- {
- label: '从器具号',
- field: 'fromContainerNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- tableForm: {
- disabled: true
- },
- form: {
- componentProps: {
- disabled: true
- }
- }
- },
- {
- label: '到器具号',
- field: 'toContainerNumber',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false,
- },
+ // {
+ // label: '从器具号',
+ // field: 'fromContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // tableForm: {
+ // disabled: true
+ // },
+ // form: {
+ // componentProps: {
+ // disabled: true
+ // }
+ // }
+ // },
+ // {
+ // label: '到器具号',
+ // field: 'toContainerNumber',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTableForm: false,
+ // isForm: false,
+ // },
{
label: '数量',
field: 'qty',
@@ -747,6 +749,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
},
isTableForm: false,
isForm: false,
+ hiddenInMain: true,
},
{
label: '到货主代码',
@@ -757,6 +760,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
},
isTableForm: false,
isForm: false,
+ hiddenInMain: true,
},
{
label: '项目代码',
@@ -767,15 +771,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
},
isTableForm: false,
isForm: false,
+ hiddenInMain: true,
},
- {
- label: '备注',
- field: 'remark',
- sort: 'custom',
- table: {
- width: 150
- },
- },
+ // {
+ // label: '备注',
+ // field: 'remark',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // },
{
label: '创建时间',
field: 'createTime',
@@ -796,6 +801,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
valueFormat: 'x',
}
},
+ hiddenInMain: true,
isTableForm: false,
isForm: false
},
@@ -806,42 +812,43 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
table: {
width: 150
},
+ hiddenInMain: true,
isTableForm: false,
isForm: false
},
- {
- label: '最后更新时间',
- field: 'updateTime',
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
- sort: 'custom',
- table: {
- width: 180
- },
- form: {
- component: 'DatePicker',
- componentProps: {
- style: { width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- },
- isTableForm: false,
- isForm: false
- },
- {
- label: '最后更新者',
- field: 'updater',
- sort: 'custom',
- table: {
- width: 150
- },
- isTableForm: false,
- isForm: false
- },
+ // {
+ // label: '最后更新时间',
+ // field: 'updateTime',
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // sort: 'custom',
+ // table: {
+ // width: 180
+ // },
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: { width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // },
+ // isTableForm: false,
+ // isForm: false
+ // },
+ // {
+ // label: '最后更新者',
+ // field: 'updater',
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // },
+ // isTableForm: false,
+ // isForm: false
+ // },
{
label: '操作',
field: 'action',
@@ -851,6 +858,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
width: 150,
fixed: 'right'
},
+ hiddenInMain: true,
isTableForm:false,
}
]))
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 94704b3d3..233abdeed 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
@@ -545,6 +545,7 @@ const submitForm = async (formType, data) => {
}
try {
if (formType === 'create') {
+ data.productionLineCode = data.subList[0].productionLineCode;
await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
message.success(t('common.createSuccess'))
} else {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index e125b7976..34c890aa4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -15,6 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive
import download from '@/utils/download'
+import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail'
+import { SupplierdeliverInspectionDetail,SupplierdeliverInspectionDetailRules} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
import { SupplierdeliverRecordMain,SupplierdeliverRecordMainRules,
SupplierdeliverRecordDetail,SupplierdeliverRecordDetailRules,SupplierdeliverRecordDetailPickingNumer } from './supplierdeliverRecordMain.data'
import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import { getAccessToken } from '@/utils/auth'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
@@ -197,9 +225,17 @@ const { getList:getDetailList } = detatableMethods
const { wsCache } = useCache()
/** 详情操作 */
const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
+const openDetail = async (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+ //获取申请中的masterId
+ const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({
+ getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
+ })
+ const { getList:requestGetList } = requestTableMethods
+ requestTableObject.params.number = 'REQ0120240506-0002'
+ await requestGetList()
+ row.annexMasterId = requestTableObject.tableList[0].masterId
detailRef.value.openDetail(row, titleName, titleValue,'recordSupplierdeliverMain')
}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index abe1f8cbc..674cfb502 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -82,6 +82,8 @@
prop: 'uploadFile',
tableName:'SupplierdeliverInspectionDetail',
hasSubDetail:true, // 附件中是否展示明细表
+ showPreview:true, // 附件中是否展示预览按钮
+ fileType:['pdf','jpg','png','jpeg'],
align:'left',
//明细表数据
subDetailTableData:{
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index 12d78a6e6..d4870f42d 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -560,7 +560,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive
},
},
{
- label: '发货单号',
+ label: '供应商发货单号',
field: 'asnBillNum',
sort: 'custom',
table: {
@@ -699,6 +699,14 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive
component: 'InputNumber',
}
},
+ {
+ label: '凭证号',
+ field: 'voucherNumber',
+ sort: 'custom',
+ table: {
+ width: 150
+ }
+ },
{
label: '备注',
field: 'remark',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 9c2271c45..49653cb14 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -45,7 +45,6 @@
:tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
:tableFormRules="SupplierinvoiceRequestDetailRules"
:tableData="tableData"
-
:sumFormDataByForm ="(formRef,formModel)=>{
const {taxRate=0,amount=0} = formModel
formRef.value.setValues({
@@ -616,6 +615,14 @@ const handleImport = () => {
data.subList = tableData.value // 拼接子表数据参数
try {
if (formType === 'create') {
+ if(data.subList.length == 0){
+ message.warning("请添明细数据")
+ return;
+ }
+ if(data.subList.length > 999){
+ message.warning("明细数据条数已超过最大数量限制【999条】")
+ return;
+ }
await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)
message.success(t('common.createSuccess'))
} else {
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 20c906e6b..c78a98cee 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1,6 +1,9 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+import { accountantFormart } from '@/utils/formatter'
+
import * as SupplierApi from '@/api/wms/supplier'
+import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
const { t } = useI18n() // 国际化
@@ -25,6 +28,32 @@ const requestsettingData = data?.list[0] || {}
userDept.id = userDept.id.toString()
const userDeptArray:any = [userDept]
+/**
+ * @returns {Array} 采购员列表
+ */
+export const PurchaseMemberInfo = useCrudSchemas(reactive([
+ {
+ label: '用户编号',
+ field: 'id',
+ table: {
+ width: 180,
+ },
+ },
+ {
+ label: '用户名称',
+ field: 'username',
+ table: {
+ width: 180,
+ },
+ },
+ {
+ label: '用户昵称',
+ field: 'nickname',
+ table: {
+ width: 180,
+ },
+ }
+]))
/**
* @returns {Array} 采购订单或者采购退货单
@@ -35,14 +64,14 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive(
}
}
},
+ {
+ label: '订单类型',
+ field: 'orderType',
+ dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
+ dictClass: 'string',
+ isTable: false,
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ },
{
label: '供应商名称',
field: 'supplierName',
@@ -152,6 +192,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '金额',
field: 'amount',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -183,6 +224,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '税额',
field: 'taxAmount',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -203,6 +245,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '税后金额',
field: 'afterTaxAmount',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -224,6 +267,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '索赔金额',
field: 'claimAmount',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -247,6 +291,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '折扣金额',
field: 'discountAmount',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -283,6 +328,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '总差额',
field: 'totalDifference',
+ formatter: accountantFormart,
table: {
width: 150
},
@@ -407,7 +453,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
{
label: '创建者',
field: 'creator',
- sort: 'custom',
table: {
width: 150
},
@@ -462,14 +507,30 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
},
},
{
- label: '采购审批人',
+ label: '采购价格审批人',
field: 'procurementCreator',
- sort: 'custom',
sortTableDefault:1003,
table: {
width: 150
},
- isForm: false,
+ isForm: true,
+ form: {
+ // labelMessage: '信息提示说明!!!',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ hiddenFilterButton:true,//是否隐藏筛选按钮
+ searchListPlaceholder: '请选择采购员', // 输入框占位文本
+ searchField: 'id', // 查询弹窗赋值字段
+ searchTitle: '采购员信息', // 查询弹窗标题
+ searchAllSchemas: PurchaseMemberInfo.allSchemas, // 查询弹窗所需类
+ searchPage: SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode, // 查询弹窗所需分页方法
+ searchCondition: [{
+ key: 'roleCode', // 查询列表中字段
+ value: 'purchase', // 指查询具体值
+ isMainValue: false // 表示查询条件不是主表的字段的值
+ }]
+ }
+ }
},
{
label: '采购审批时间',
@@ -690,6 +751,9 @@ export const SupplierinvoiceRequestMainRules = reactive({
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
+ procurementCreator: [
+ { required: true, message: '请选择采购员', trigger: 'change' }
+ ],
})
@@ -733,6 +797,11 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive