diff --git a/src/api/qms/counter/index.ts b/src/api/qms/counter/index.ts
index 3a75b8163..9190e34f5 100644
--- a/src/api/qms/counter/index.ts
+++ b/src/api/qms/counter/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
export interface CounterVO {
id: number
itemCode: string
- testTypeCode: string
+ inspectionType: string
supplierCode: string
qualifiedTimes: number
lastQualifiedBatch: string
diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index fe61e36c3..372fef2dc 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -1,7 +1,7 @@
import request from '@/config/axios'
-// 查询检验申请列表
+// 查询检验任务列表
export const getInspectionJobMainPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
@@ -12,29 +12,40 @@ export const getInspectionJobMainPage = async (params) => {
}
}
-// 查询检验申请详情
+// 查询检验任务详情
export const getInspectionJobMain = async (id: number) => {
return await request.get({ url: `/qms/inspection-job-main/get?id=` + id })
}
-// 新增检验申请
+// 新增检验任务
export const createInspectionJobMain = async (data) => {
return await request.post({ url: `/qms/inspection-job-main/create`, data })
}
-// 修改检验申请
+// 修改检验任务
export const updateInspectionJobMain = async (data) => {
return await request.put({ url: `/qms/inspection-job-main/update`, data })
}
-// 执行检验申请
+// 执行检验任务
export const executeInspectionJobMain = async (data) => {
return await request.put({ url: `/qms/inspection-job-main/execute`, data })
}
-// 删除检验申请
+// 删除检验任务
export const deleteInspectionJobMain = async (id: number) => {
return await request.delete({ url: `/qms/inspection-job-main/delete?id=` + id })
}
-
+// 承接检验任务
+export const acceptInspectionJobMain = async (id) => {
+ return await request.put({ url: `/qms/inspection-job-main/accept?id=` + id })
+}
+// 放弃检验任务
+export const abandonInspectionJobMain = async (id) => {
+ return await request.put({ url: `/qms/inspection-job-main/abandon?id=` + 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/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index 2afacb3e1..04699eb06 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -76,6 +76,12 @@ export const getPurchasereceiptRecordDetailPageBySupplierCode = async (params) =
export const getPurchasereceiptRecordDetailList = async (params) => {
return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params })
}
+
+// 查询采购收货记录子列表
+export const getPurchasereceiptRecordDetailListToRepeat = async (params) => {
+ return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeat`, params })
+}
+
// 查询采购收货记录子详情
export const getPurchasereceiptRecordDetail = async (id: number) => {
return await request.get({ url: `/wms/purchasereceipt-record-detail/get?id=` + id })
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index afc1d884d..bcd2d6326 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -658,7 +658,7 @@ const inpuFocus = (headerItem, row, index) => {
* @param cur 改变后值
*/
const onChange = (field, cur) => {
- emit('onChange', field, cur)
+ emit('onChange', field, cur, formRef)
}
/**
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 2cf1fadea..131269e58 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -46,7 +46,7 @@
:label="headerItem.label" :prop="headerItem.field"
:align="headerItem?.tableForm?.align || 'center'"
:sortable="headerItem?.tableForm?.sortable || false"
- :width="headerItem?.tableForm?.width || '200'"
+ :width="headerItem?.tableForm?.width || '200px'"
:min-width="headerItem?.tableForm?.minWidth || 'auto'">
([
diff --git a/src/views/qms/aql/index.vue b/src/views/qms/aql/index.vue
index b5d0446a4..76a3e5a65 100644
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@@ -48,6 +48,7 @@
:apiCreate="AqlApi.createAql"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
+ @onChange="onChange"
/>
@@ -235,6 +236,47 @@ const searchFormClick = (searchData) => {
getList() // 刷新当前列表
}
+const onChange = async (field, value, formRef) => {
+ // 检查字段是否以 "a" 开头
+ if (field.startsWith("a") || field.startsWith("r")) {
+ // 从 "a" 字段名中获取其余部分
+ const suffix = field.slice(1);
+ // 构建对应的 "r" 字段名
+ const correspondingField = field.startsWith("a") ? "r" + suffix : "a" + suffix ;
+console.log(correspondingField)
+ // 如果有值，则更新对应的 "r" 字段
+ if (value) {
+ // 查找并更新对应 "r" 字段的值和属性
+ Aql.allSchemas.formSchema.forEach(item => {
+ if (item.field === correspondingField) {
+ const setV = {};
+ if(correspondingField.startsWith("r")){
+ setV[correspondingField] = parseInt(value) + 1;
+ }else {
+ setV[correspondingField] = parseInt(value) - 1;
+ }
+ item.componentProps.disabled = true;
+
+ // 使用 Vue 的 nextTick 来等待 DOM 更新
+ nextTick(() => {
+ formRef.value.setValues(setV);
+ });
+ }
+ });
+ }else{
+ Aql.allSchemas.formSchema.forEach(item => {
+ if (item.field === correspondingField || item.field === field) {
+ item.componentProps.disabled = false;
+ const setV = {};
+ setV[correspondingField] = ''
+ nextTick(() => {
+ formRef.value.setValues(setV);
+ });
+ }
+ });
+ }
+ }
+};
/** 初始化 **/
onMounted(async () => {
getList()
diff --git a/src/views/qms/basicDataManage/counter/counter.data.ts b/src/views/qms/basicDataManage/counter/counter.data.ts
index 71a96b204..c5aa501fe 100644
--- a/src/views/qms/basicDataManage/counter/counter.data.ts
+++ b/src/views/qms/basicDataManage/counter/counter.data.ts
@@ -23,7 +23,7 @@ export const Counter = useCrudSchemas(reactive([
},
{
label: '检验类型编码',
- field: 'testTypeCode',
+ field: 'inspectionType',
sort: 'custom',
isSearch: true
},
diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
index f6d67ae35..a41ffb448 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
@@ -209,11 +209,11 @@
/>
-
+
([
table: {
width: 180
}
- },{
- label: '是否可用',
- field: 'available',
- 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: 'available',
+ // 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: 'action',
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index fdef80d4c..e931fdefb 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -312,7 +312,7 @@
-
+
{
const valid = await elForm.validate()
if (!valid) return
// 校验包装列表
- const validateForm1 = await tableFormRef.value.validateForm()
+
+ console.log(11,data.value.packageList)
+ if(data.value.packageList?.length>0){
+ const validateForm1 = await tableFormRef.value.validateForm()
if (!validateForm1) return
- let number = 0
- data.value.packageList.forEach(cur=>{
- number += parseFloat(cur.sampleAmount)
- })
- if(number > data.value.sampleTotalAmount){
- message.error(`采样数量之和不可以大于总数量`)
- return
+ let number = 0
+ data.value.packageList.forEach(cur=>{
+ number += parseFloat(cur.sampleAmount)
+ })
+ if(number != data.value.sampleTotalAmount){
+ message.error(`采样数量之和不等于总数量`)
+ return
+ }
}
+
const bol2 = await validateForm(formFeaturesRef.value)
if (!bol2) {
message.error(`模板中有检验工序和检验特性未填写完全`)
return
}
- // 判断附加费用数组是否有未填的选项
+ // 判断数组是否有未填的选项
let arrBol = []
let isOutweigh = []//结束时间是否大于开始时间
+ let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
data.value.subList.forEach((item, index) => {
if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
arrBol.push(
@@ -750,7 +756,7 @@ const submitForm = async () => {
arrBol.push(
item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
(cur, key) => {
- return !cur.estimateCode || !cur.defectLevel
+ return !cur.estimateCode
}
)
)
@@ -777,16 +783,32 @@ const submitForm = async () => {
if (item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime >item.inspectionJobCharacteristicsUpdateReqVO.inspectionEndTime) {
isOutweigh.push(item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime)
}
+ // 合格数量和不合格数量之和不等于总数量
+ if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
+ numberList.push(
+ item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
+ (cur, key) => {
+ return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) != data.value.sampleTotalAmount
+ }
+ )
+ )
+ }
})
let isEmpty1 = arrBol.some(item=>item == true)
+ let isEmptyNumberList = numberList.some(item=>item == true)
if(isEmpty1){
message.error('检验工序和检验特性有字段未填写完全')
return;
}
- if(isOutweigh.length>0){
+ if(isOutweigh?.length>0){
message.error('检验特性中有开始时间大于结束时间')
return;
}
+ console.log(44,numberList)
+ if(isEmptyNumberList){
+ message.error('合格数量和不合格数量之和不等于总数量')
+ return;
+ }
if (formType.value == 'create') {
// 主子表——提交请求
emit('submitForm', formType.value, data.value)
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 1bbaa59be..baf4fad85 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -161,10 +161,10 @@
// 列表-操作按钮
const butttondata = (row) => {
return [
- // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
- defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
- // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
- defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+ defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
+ defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
+ defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
+ defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
defaultButtons.mainListPackageBtn(null), // 包装
]
}
@@ -176,10 +176,15 @@ const listTableRef = ref()
}else if (val == 'mainPackage') { // 包装
const list = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
listTableRef.value.openPackage(row,'包装信息',InspectionJobPackage.allSchemas.tableColumns,list)
- }
- else if (val == 'mainJobClo') { // 关闭
- handleDelete(row.id)
- }
+ }else if (val == 'mainJobAba') { // 放弃
+ console.log('列表-操作按钮事件-放弃')
+ handleAbandon(row.id)
+ } else if (val == 'mainJobClo') { // 关闭
+ handleClose(row.id)
+ } else if (val == 'mainJobAcc') { // 承接
+ console.log('列表-操作按钮事件-承接')
+ handleAccept(row.id)
+ }
}
/** 添加/修改操作 */
@@ -200,19 +205,43 @@ const listTableRef = ref()
const execute = async (type : string, row ?: number) => {
formRef.value.open(type, row)
}
- /** 删除按钮操作 */
- const handleDelete = async (id : number) => {
+ /** 关闭按钮操作 */
+ const handleClose = async (id : number) => {
try {
// 删除的二次确认
- await message.delConfirm()
+ await message.confirm(t('common.confirmColse'))
// 发起删除
- await InspectionJobMainApi.deleteInspectionJobMain(id)
- message.success(t('common.delSuccess'))
+ await InspectionJobMainApi.closeInspectionJobMain(id)
+ message.success(t('common.closeSuccess'))
// 刷新列表
await getList()
} catch { }
}
-
+ // 承接
+ const handleAccept = async (id : number) => {
+ try {
+ // 承接的二次确认
+ await message.confirm(t('common.confirmAccept'))
+ // 发起承接
+ await InspectionJobMainApi.acceptInspectionJobMain(id)
+ message.success(t('common.acceptSuccess'))
+ // 刷新列表
+ await getList()
+ } catch { }
+ }
+ // 放弃任务
+ const handleAbandon = async (id : number) => {
+ try {
+ // 放弃的二次确认
+ await message.confirm(t('common.confirmGiveup'))
+ // 发起放弃
+ await InspectionJobMainApi.abandonInspectionJobMain(id)
+ message.success(t('common.giveupSuccess'))
+ // 刷新列表
+ await getList()
+ } catch { }
+ }
+
/** 导出按钮操作 */
const exportLoading = ref(false) // 导出的加载中
const handleExport = async () => {
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index ed4bfcfab..70f7ae62e 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -61,20 +61,47 @@ export const InspectionJobMain = useCrudSchemas(reactive([
table: {
width: 150
}
+ },{
+ label: '供应商名称',
+ field: 'supplierName',
+ sort: 'custom',
+ isSearch: false,
+ table: {
+ width: 150
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ },
},
{
label: '物料编码',
- field: 'materialCode',
+ field: 'itemCode',
sort: 'custom',
- isSearch: true,
+ isSearch: false,
+ table: {
+ width: 150
+ },
form: {
componentProps:{
disabled:true
}
},
+ },
+ {
+ label: '物料名称',
+ field: 'itemName',
+ sort: 'custom',
+ isSearch: false,
table: {
width: 150
- }
+ },
+ form: {
+ componentProps:{
+ disabled:true
+ }
+ },
},
{
label: '物料批次',
diff --git a/src/views/qms/inspection/inspectionRecord/index.vue b/src/views/qms/inspection/inspectionRecord/index.vue
index 3bf88f430..33e70f8d1 100644
--- a/src/views/qms/inspection/inspectionRecord/index.vue
+++ b/src/views/qms/inspection/inspectionRecord/index.vue
@@ -180,9 +180,9 @@
const butttondata = (row) => {
return [
// defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
- defaultButtons.mainListEditBtn(null), // 编辑
+ defaultButtons.mainListEditBtn({hasPermi:'qms:inspection-recode-main:edit'}), // 编辑
// defaultButtons.mainListDeleteBtn(null), // 删除
- defaultButtons.mainListOrderPubBtn(null), // 发布
+ defaultButtons.mainListOrderPubBtn({hasPermi:'qms:inspection-recode-main:pub'}), // 发布
defaultButtons.mainListPackageBtn(null), // 包装
]
}
diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index 8ddd8ba77..dc26eeb4e 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -220,7 +220,7 @@ const listTableRef = ref()
await message.confirm(t('common.confirmHandle'))
tableObject.loading = true
await InspectionMainApi.handleInspectRequestMain(id)
- message.success(t('common.handleSuccess'))
+ message.success(t('common.dealwithSuccess'))
await getList()
}catch{}finally{
tableObject.loading = false
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index 97c80ce99..fb1ad6bbe 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -368,7 +368,7 @@ export const InspectionRequestPackage = useCrudSchemas(reactive([
disabled:true
},
table:{
- width:150
+ width:200
}
},
{
@@ -380,7 +380,7 @@ export const InspectionRequestPackage = useCrudSchemas(reactive([
disabled:true
},
table:{
- width:150
+ width:200
}
},
{
@@ -392,7 +392,7 @@ export const InspectionRequestPackage = useCrudSchemas(reactive([
disabled:true
},
table:{
- width:150
+ width:180
}
},
{
diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue
index 1f1f0617e..6a8d47ec8 100644
--- a/src/views/system/systemInstallPackage/index.vue
+++ b/src/views/system/systemInstallPackage/index.vue
@@ -148,6 +148,8 @@ const openForm = (type: string, row?: any) => {
if(uploadFile){
uploadFile['componentProps']['upData']['tableId'] = currentTime
uploadFile['componentProps']['modelValue']= []
+ uploadFile['value'] = ''
+
}
}else if(type=='update'){
const uploadFile = SystemInstallPackage.allSchemas.formSchema.find(item=>item.field=='uploadFile')
@@ -163,7 +165,7 @@ const openForm = (type: string, row?: any) => {
// form表单提交
const formsSuccess = async (formType,data) => {
if (formType === 'create') {
- delete data['uploadFile']
+ // delete data['uploadFile']
await SystemInstallPackageApi.createSystemInstallPackage(data)
message.success(t('common.createSuccess'))
} else {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 01f83181a..67f5736d2 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -191,7 +191,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
setV['ppNumber'] = val[0]['ppNumber']
// 获取子表数据 getBomDisassemble
- PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
+ // PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
+ PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailListToRepeat({
masterId: val[0]['id']
}).then((res) => {
if (res) tableData.value = res
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index e20fb51a8..38d320971 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -172,10 +172,10 @@ const isShowMainButton = (row,val) => {
// 列表-操作按钮
const butttondata = (row) => {
return [
- defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
- defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
- defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
- defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 执行
+ // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
+ // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+ // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
+ defaultButtons.mainListJobRecBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 收货
]
}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 67e525b64..9a4167f45 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -56,7 +56,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([
width: 150
},
form: {
- labelMessage: '信息提示说明！！！',
+ // labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true,
searchListPlaceholder: '请选择采购订单',
@@ -89,7 +89,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([
},
form: {
componentProps: {
- disabled: true
+ disabled: false
}
}
},
@@ -101,7 +101,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive([
},
form: {
componentProps: {
- disabled: true
+ disabled: false
}
}
},
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index d07d76e25..6dbad5997 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -141,6 +141,18 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([
width: 180
},
},
+ {
+ label: '过账日期',
+ field: 'postingDate',
+ formatter: dateFormatter,
+ detail: {
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ },
+ sort: 'custom',
+ table: {
+ width: 180
+ }
+ },
{
label: '业务类型',
field:'businessType',
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index ebdecf62d..3c174965a 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -294,7 +294,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
},
},
{
- label: '发票时间',
+ label: '发票日期',
field: 'invoiceTime',
formatter: dateFormatter,
detail: {
@@ -314,7 +314,27 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive(
}
},
},
-
+ {
+ label: '过账日期',
+ field: 'postingDate',
+ 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: 'requestTime',