diff --git a/.gitignore b/.gitignore
index 5e6e2f3ae..1f4042215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ auto-*.d.ts
.history
/sfms3.0
/sfms3.0-ui
+.vscode/
diff --git a/README.md b/README.md
index eadbc6402..99e590948 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
dictAllOption:true,// true 字典中--下拉框中展示全选按钮
dictAllValue:'全选', // 全选按钮的value值
-hiddenSearchHigh?: boolean // 是否隐藏高级筛选
+hiddenSearchHigh: boolean // 是否隐藏高级筛选
**form表单查询弹窗配置**
form: {
diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 92ab46992..af60eb822 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -43,7 +43,13 @@ export const getBalancePage = async (params) => {
}
export const getTransactionBalancePage = async (params) => {
- return await request.get({ url: `/wms/transaction/page_balance`, params })
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/transaction/senior', data })
+ } else {
+ return await request.get({ url: `/wms/transaction/page_balance`, params })
+ }
}
// 查询库存余额列表(包括已冻结，已失效的物料)
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 2ffdbba5d..e28458942 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -760,6 +760,7 @@ export default {
变更记录:'Change Record',
添加明细:'Add Detail',
上传质量报告:'Upload quality report',
+ 上传履历表:'Upload your resume',
上传质检报告:'Upload the quality inspection report',
个:'piece',
张:'sheet',
@@ -1286,7 +1287,8 @@ export default {
生产日期不能小于:'The date of production cannot be less than',
生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date',
发票回转:'Return of invoice',
- 发票回转成功:'The invoice has been successfully forwarded'
+ 发票回转成功: 'The invoice has been successfully forwarded',
+ 最后更新人: 'Last Updated By'
},
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 9d42231a1..d49e9eef2 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -760,6 +760,7 @@ export default {
变更记录:'变更记录',
添加明细:'添加明细',
上传质量报告:'上传质量报告',
+ 上传履历表:'上传履历表',
上传质检报告:'上传质检报告',
个:'个',
张:'张',
@@ -1282,7 +1283,8 @@ export default {
生产日期不能小于:'生产日期不能小于',
生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期',
发票回转:'发票回转',
- 发票回转成功:'发票回转成功'
+ 发票回转成功: '发票回转成功',
+ 最后更新人:'最后更新人'
},
}
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 578cd990c..7efa0705c 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -258,18 +258,15 @@
}
console.log('登陆res',res)
- try{
- await PassWordApi.validateResetTime(res.userId)
- }catch (e) {
- if (e.code === 1002000010) {
- await ElMessageBox.alert(
- '密码长时间未修改，存在安全隐患,请及时修改',
- '重要提示',
- {
- dangerouslyUseHTMLString: true,
- }
- )
- }
+ const msg = await PassWordApi.validateResetTime(res.userId)
+ if(msg){
+ await ElMessageBox.alert(
+ ''+msg+'',
+ '重要提示',
+ {
+ dangerouslyUseHTMLString: true,
+ }
+ )
}
if (!res) {
console.log('登录-195')
diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 01ee0aa4e..976b4c7b4 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -11,11 +11,7 @@ export const BackflushDetailbQadRules = reactive({
})
export const BackflushDetailbQad = useCrudSchemas(reactive([
- {
- label: '数量',
- field: 'qty',
- sort: 'custom',
- },
+
{
label: '制品收货记录单据号',
field: 'productreceiptNumber',
@@ -96,6 +92,17 @@ export const BackflushDetailbQad = useCrudSchemas(reactive([
},
},
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '数量',
+ field: 'qty',
+ sort: 'custom',
+ },
{
label: '操作',
field: 'action',
diff --git a/src/views/wms/agvManage/backflushDetailbQad/index.vue b/src/views/wms/agvManage/backflushDetailbQad/index.vue
index e1bda5667..e11d81aee 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/index.vue
+++ b/src/views/wms/agvManage/backflushDetailbQad/index.vue
@@ -27,6 +27,10 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
+
+
+ {{ row.qty}}
+
{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}
@@ -258,3 +262,10 @@ onMounted(async () => {
})
+
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index bdaa21638..bc92c9ffe 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -41,7 +41,7 @@
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 0d8c6776a..58a70adb5 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -26,15 +26,28 @@
-
-
-
-
+
+
+
+
+ vue
+
+
+ {{ formatDate(scope.row.createTime) }}
+
+
+
+
+
+ {{ formatDate(scope.row.updateTime) }}
+
+
+
@@ -54,6 +67,7 @@ import { DICT_TYPE } from '@/utils/dict'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as RuleApi from '@/api/wms/rule'
import AddForm from './AddForm.vue'
+import dayjs from 'dayjs'
defineOptions({ name: 'SupplieDeliveryStrategy' })
const queryFormRef = ref() // 搜索的表单
@@ -165,6 +179,14 @@ const buttonTableClick = (val, row) => {
}
}
+//时间格式化
+const formatDate = (date) => {
+ if (!date) return ''; // 处理空值
+ return dayjs(date).format('YYYY-MM-DD HH:mm:ss'); // 根据需求格式化
+}
+
+
+
/** 初始化 **/
onMounted(() => {
getList()
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index 36a8f3d43..a650b8ced 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -17,6 +17,9 @@ export const SupplierCycle = useCrudSchemas(reactive([
label: '供应商代码',
field: 'supplierCode',
sort: 'custom',
+ table: {
+ width: 150,
+ },
isSearch: true,
form: {
componentProps: {
@@ -151,6 +154,44 @@ export const SupplierCycle = useCrudSchemas(reactive([
},
}
},
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ table: {
+ width: 200,
+ },
+ formatter: dateFormatter,
+ isForm:false,
+ },
+ {
+ label: '创建人',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150,
+ },
+ isForm:false,
+ },
+ {
+ label: '最后更新时间',
+ field: 'updateTime',
+ sort: 'custom',
+ table: {
+ width: 200,
+ },
+ formatter: dateFormatter,
+ isForm:false,
+ },
+ {
+ label: '最后更新人',
+ field: 'updater',
+ sort: 'custom',
+ table: {
+ width: 150,
+ },
+ isForm:false,
+ },
{
label: '操作',
field: 'action',
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index 841fa0727..e3d030079 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -226,6 +226,12 @@ export const SupplierUser = useCrudSchemas(reactive([
},
isForm: false,
},
+ {
+ label: '创建人',
+ field: 'creator',
+ sort: 'custom',
+ isForm: false,
+ },
{
label: '操作',
field: 'action',
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 6da4900a8..527bfa512 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -54,17 +54,17 @@
@@ -97,6 +97,9 @@ const route = useRoute() //路由信息
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(Balance.allSchemas.tableColumns)
+const tabsExtend = ref(false)
+const apiPage = ref()
+const tableObjectExtend = ref()
//字段设置 更新主列表字段
const updataTableColumns = (val) => {
@@ -258,7 +261,9 @@ const openForm = (type: string, row?: any) => {
/** 详情操作 */
const detailRef = ref()
+const chooseRow = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
+ chooseRow.value = row
detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
}
@@ -343,7 +348,23 @@ const searchFormClick = (searchData) => {
}
getList() // 刷新当前列表
}
-
+const changeTabs = (item) => {
+ if (item.prop == 'Transaction') {
+ tabsExtend.value = true
+ // 当前物料代码作为条件
+ tableObjectExtend.value = [{
+ key: 'masterId',
+ value: chooseRow.value.id
+ }]
+ apiPage.value = BalanceApi.getTransactionBalancePage
+
+ console.log(988,tableObjectExtend.value)
+ } else {
+ tableObjectExtend.value = []
+ tabsExtend.value = false
+ apiPage.value = ''
+ }
+}
/** 初始化 **/
onMounted(async() => {
getList()
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index e61b147f5..19b121e50 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -419,7 +419,10 @@ export const ScrapJobMain = useCrudSchemas(
sort: 'custom',
table: {
width: 150
- }
+ },
+ isTable:false,
+ isForm:false,
+ isTableForm:false,
},
{
label: '自动完成',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 7d06a9c15..23c449522 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -383,17 +383,17 @@ export const ScrapRecordMain = useCrudSchemas(
width: 150
}
},
- {
- label: '接口类型',
- field: 'interfaceType',
- dictType: DICT_TYPE.INTERFACE_TYPE,
- dictClass: 'string',
- isTable: true,
- sort: 'custom',
- table: {
- width: 150
- }
- },
+ // {
+ // label: '接口类型',
+ // field: 'interfaceType',
+ // dictType: DICT_TYPE.INTERFACE_TYPE,
+ // dictClass: 'string',
+ // isTable: true,
+ // sort: 'custom',
+ // table: {
+ // width: 150
+ // }
+ // },
{
label: '通知单描述',
field: 'noticeRemark',
@@ -411,7 +411,10 @@ export const ScrapRecordMain = useCrudSchemas(
sort: 'custom',
table: {
width: 150
- }
+ },
+ isTable:false,
+ isForm:false,
+ isTableForm:false,
},
{
label: '是否已撤销',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index af258d4f2..72cc661b5 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1101,14 +1101,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([
componentProps: {
disabled:true,
min: 0,
- precision: 6,
+ precision: 2,
}
},
tableForm: {
type: 'InputNumber',
disabled:true,
min: 0,
- precision: 6,
+ precision: 2,
},
},
{
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 86762ce33..940d6f7fd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -666,7 +666,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
- }
+ },
+ isTable:false,
},
{
label: '创建者',
@@ -1081,16 +1082,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
sortTableDefault: 1012,
hiddenInMain: true
},
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- hiddenInMain: true,
- sortTableDefault: 1012
- },
{
label: '创建时间',
field: 'createTime',
@@ -1110,7 +1101,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
valueFormat: 'x'
}
},
- hiddenInMain: true,
+ hiddenInMain: false,
+ sortTableDefault: 1012
+ },
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ hiddenInMain: false,
sortTableDefault: 1012
},
{
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index d9ccb8704..f50117219 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -911,16 +911,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive(
sortTableDefault: 1007,
hiddenInMain: true
},
- {
- label: '创建者',
- field: 'creator',
- sort: 'custom',
- table: {
- width: 150
- },
- sortTableDefault: 1014,
- hiddenInMain: true,
- },
{
label: '创建时间',
field: 'createTime',
@@ -932,7 +922,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive(
table: {
width: 180
},
- hiddenInMain: true,
+ hiddenInMain: false,
sortTableDefault: 1014,
form: {
component: 'DatePicker',
@@ -943,6 +933,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive(
}
},
},
+ {
+ label: '创建者',
+ field: 'creator',
+ sort: 'custom',
+ table: {
+ width: 150
+ },
+ sortTableDefault: 1014,
+ hiddenInMain: false,
+ },
]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index f29ccf027..00647dec5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -276,7 +276,7 @@ export const PurchaseMain = useCrudSchemas(reactive([
{
label: '创建时间',
field: 'createTime',
- isTable:true,
+ isTable:false,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -806,16 +806,6 @@ export const PurchaseDetail = useCrudSchemas(reactive([
min: 0
}
},
- {
- label: '创建者',
- field: 'creator',
- isTableForm: false,
- table: {
- width: 150
- },
- hiddenInMain:true,
- isForm: false,
- },
{
label: '创建时间',
field: 'createTime',
@@ -828,7 +818,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([
table: {
width: 180
},
- hiddenInMain:true,
+ hiddenInMain:false,
isForm: false,
form: {
component: 'DatePicker',
@@ -841,48 +831,58 @@ export const PurchaseDetail = useCrudSchemas(reactive([
}
},
{
- label: '最后更新者',
- field: 'updater',
- isTableForm: false,
- table: {
- width: 150
- },
- hiddenInMain:true,
- isForm: false,
- // form: {
- // component: 'DatePicker',
- // componentProps: {
- // style: {width:'100%'},
- // type: 'datetime',
- // dateFormat: 'YYYY-MM-DD HH:mm:ss',
- // valueFormat: 'x',
- // }
- // }
- },
- {
- label: '最后更新时间',
- field: 'updateTime',
+ label: '创建者',
+ field: 'creator',
isTableForm: false,
- isTable: true,
- hiddenInMain:true,
- formatter: dateFormatter,
- detail: {
- dateFormat: 'YYYY-MM-DD HH:mm:ss'
- },
table: {
width: 150
},
+ hiddenInMain:false,
isForm: false,
- form: {
- component: 'DatePicker',
- componentProps: {
- style: {width:'100%'},
- type: 'datetime',
- dateFormat: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
- }
- }
},
+ // {
+ // label: '最后更新时间',
+ // field: 'updateTime',
+ // isTableForm: false,
+ // isTable: true,
+ // hiddenInMain:false,
+ // formatter: dateFormatter,
+ // detail: {
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ // },
+ // table: {
+ // width: 150
+ // },
+ // isForm: false,
+ // form: {
+ // component: 'DatePicker',
+ // componentProps: {
+ // style: {width:'100%'},
+ // type: 'datetime',
+ // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // valueFormat: 'x',
+ // }
+ // }
+ // },
+ // {
+ // label: '最后更新者',
+ // field: 'updater',
+ // isTableForm: false,
+ // table: {
+ // width: 150
+ // },
+ // hiddenInMain:false,
+ // isForm: false,
+ // // form: {
+ // // component: 'DatePicker',
+ // // componentProps: {
+ // // style: {width:'100%'},
+ // // type: 'datetime',
+ // // dateFormat: 'YYYY-MM-DD HH:mm:ss',
+ // // valueFormat: 'x',
+ // // }
+ // // }
+ // },
{
label: '备注',
hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index de8ce0f18..ab2006ea6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -159,3 +159,32 @@ export const SupplierdeliverInspectionDetailRules = reactive({
{ required: true, message: '请输入发货数量', trigger: 'blur' }
],
})
+
+
+export const CurriculumVitae = useCrudSchemas(reactive([
+ {
+ label: '上传履历表',
+ field: 'uploadFile',
+ sort: 'custom',
+ isTable:false,
+ isTableForm:false,
+ form: {
+ component: 'UploadFile',
+ componentProps: {
+ upData:{
+ tableId: '',
+ tableName: 'SupplierdeliverInspectionDetail',
+ },
+ fileType:['pdf'],
+ fileSize:100,
+ limit:20000
+ }
+ },
+ }
+]))
+//表单校验
+export const CurriculumVitaeRules = reactive({
+ uploadFile: [
+ { required: true, message: '请上传文件', trigger: 'blur' }
+ ]
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index d9b4fa50e..91c16dbe6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -737,6 +737,34 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive
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: '操作',
hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0abaf2495..13f171714 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -152,6 +152,14 @@
@footButtonClick="footButtonClick"
@formSelectChange="formSelectChangeLabel"
/>
+
+
{
hide: isShowMainButton(row, ['1', '2', '3']),
hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
}), // 上传质量报告
+ // {
+ // label: t('ts.上传履历表'),
+ // name: 'mainPlanCurriculumVitae',
+ // hide: row.status!=5,
+ // type: 'primary',
+ // icon: '',
+ // color: '',
+ // hasPermi: '',
+ // link: true // 文本展现按钮
+ // }, // 上传履历表
defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -606,6 +626,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanUploadQualityReport') {
// 上传质量报告
handleUploadQualityReport(row)
+ }else if (val == 'mainPlanCurriculumVitae') {
+ // 上传履历表
+ handleUploadCurriculumVitae(row)
} else if (val == 'mainPlanSub') {
// 提交审批
handleSub(row.masterId)
@@ -948,6 +971,28 @@ const handleUploadQualityReport = async (row) => {
//uploadQualityReportTableData.value = [tableFormKeys]
}
+const curriculumVitaeRef = ref()
+const submitCurriculumVitae = async (formType, data) => {
+ console.log('上传履历表',data)
+
+}
+/** 上传质量报告 */
+const handleUploadCurriculumVitae = async (row) => {
+ const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
+ (item) => item.field == 'uploadFile'
+ )
+ if (uploadFile) {
+ uploadFile['componentProps']['upData']['tableId'] = row.masterId
+ }
+ curriculumVitaeRef.value.open(
+ 'create',
+ null,
+ { masterId: row.masterId },
+ t('ts.上传履历表'),
+ t('ts.上传履历表')
+ )
+}
+
const submitFormUploadQualityReport = async (formType, data) => {
delete data.number
data.subList = uploadQualityReportTableData.value // 拼接子表数据参数
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 321782718..a5e91400f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -345,7 +345,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive(
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
- isTable:true,
+ isTable:false,
table: {
width: 180
},
@@ -1169,7 +1169,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive([
field: 'remark',
sort: 'custom',
},
- {
- 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,
- isTable: false,
- },
{
label: '扩展属性',
field: 'extraProperties',
@@ -98,6 +82,29 @@ export const Invoicingcalendar = useCrudSchemas(reactive([
isTable: false,
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,
+ isTable: true,
+ },
+ {
+ label: '创建人',
+ field: 'creator',
+ sort: 'custom',
+ isTable: true,
+ isForm:false,
+ },
{
label: '操作',
field: 'action',
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
index 5f870287d..4c1af65b8 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
@@ -211,7 +211,6 @@ export const SupplierApbalanceDetail = useCrudSchemas(reactive([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
- isForm: false,
},
{
label: '备注',
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 146393b1e..8a4420f45 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -159,7 +159,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
- isTable: false,
+ isTable: true,
isForm:false,
isDetail:false,
search: {
@@ -170,7 +170,15 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
- isForm: false,
+ },
+ {
+ label: '创建人',
+ field: 'creator',
+ sort: 'custom',
+ isSearch: false,
+ isTable: true,
+ isForm:false,
+ isDetail:false,
},
{
label: '部门id',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3bf2ed2dd..eefb3f5c8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -104,7 +104,7 @@
formRef.value.setValues({
afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额
adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
- beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
+ beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
@@ -132,7 +132,7 @@
taxAmount: taxAmount_,
afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额
adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
- beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
+ beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),