Browse Source

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

hella_online_20240913
songguoqiang 2 months ago
parent
commit
0526b6d9ad
  1. 1
      .gitignore
  2. 2
      README.md
  3. 8
      src/api/wms/balance/index.ts
  4. 4
      src/locales/en-US.ts
  5. 4
      src/locales/zh-CN.ts
  6. 21
      src/views/login/components/LoginForm.vue
  7. 17
      src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
  8. 11
      src/views/wms/agvManage/backflushDetailbQad/index.vue
  9. 2
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  10. 30
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
  11. 41
      src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
  12. 6
      src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
  13. 33
      src/views/wms/inventoryManage/balance/index.vue
  14. 5
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
  15. 27
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
  16. 4
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
  17. 25
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
  18. 22
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
  19. 96
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
  20. 29
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
  21. 28
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
  22. 47
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
  23. 76
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  24. 39
      src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts
  25. 1
      src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
  26. 12
      src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
  27. 4
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

1
.gitignore

@ -12,3 +12,4 @@ auto-*.d.ts
.history .history
/sfms3.0 /sfms3.0
/sfms3.0-ui /sfms3.0-ui
.vscode/

2
README.md

@ -5,7 +5,7 @@ dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
dictAllOption:true,// true 字典中--下拉框中展示全选按钮 dictAllOption:true,// true 字典中--下拉框中展示全选按钮
dictAllValue:'全选', // 全选按钮的value值 dictAllValue:'全选', // 全选按钮的value值
hiddenSearchHigh?: boolean // 是否隐藏高级筛选 hiddenSearchHigh: boolean // 是否隐藏高级筛选
**form表单查询弹窗配置** **form表单查询弹窗配置**
form: { form: {

8
src/api/wms/balance/index.ts

@ -43,7 +43,13 @@ export const getBalancePage = async (params) => {
} }
export const getTransactionBalancePage = 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 })
}
} }
// 查询库存余额列表(包括已冻结,已失效的物料) // 查询库存余额列表(包括已冻结,已失效的物料)

4
src/locales/en-US.ts

@ -760,6 +760,7 @@ export default {
:'Change Record', :'Change Record',
:'Add Detail', :'Add Detail',
:'Upload quality report', :'Upload quality report',
:'Upload your resume',
:'Upload the quality inspection report', :'Upload the quality inspection report',
:'piece', :'piece',
:'sheet', :'sheet',
@ -1286,7 +1287,8 @@ export default {
:'The date of production cannot be less than', :'The date of production cannot be less than',
:'The production date cannot be greater than the current system date', :'The production date cannot be greater than the current system date',
:'Return of invoice', :'Return of invoice',
:'The invoice has been successfully forwarded' : 'The invoice has been successfully forwarded',
: 'Last Updated By'
}, },

4
src/locales/zh-CN.ts

@ -760,6 +760,7 @@ export default {
:'变更记录', :'变更记录',
:'添加明细', :'添加明细',
:'上传质量报告', :'上传质量报告',
:'上传履历表',
:'上传质检报告', :'上传质检报告',
:'个', :'个',
:'张', :'张',
@ -1282,7 +1283,8 @@ export default {
:'生产日期不能小于', :'生产日期不能小于',
:'生产日期不能大于当前系统日期', :'生产日期不能大于当前系统日期',
:'发票回转', :'发票回转',
:'发票回转成功' : '发票回转成功',
:'最后更新人'
}, },
} }

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

@ -258,18 +258,15 @@
} }
console.log('登陆res',res) console.log('登陆res',res)
try{ const msg = await PassWordApi.validateResetTime(res.userId)
await PassWordApi.validateResetTime(res.userId) if(msg){
}catch (e) { await ElMessageBox.alert(
if (e.code === 1002000010) { '<strong>'+msg+'</strong>',
await ElMessageBox.alert( '重要提示',
'<strong>密码长时间未修改,存在安全隐患,请及时修改</strong>', {
'重要提示', dangerouslyUseHTMLString: true,
{ }
dangerouslyUseHTMLString: true, )
}
)
}
} }
if (!res) { if (!res) {
console.log('登录-195') console.log('登录-195')

17
src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts

@ -11,11 +11,7 @@ export const BackflushDetailbQadRules = reactive({
}) })
export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '数量',
field: 'qty',
sort: 'custom',
},
{ {
label: '制品收货记录单据号', label: '制品收货记录单据号',
field: 'productreceiptNumber', field: 'productreceiptNumber',
@ -96,6 +92,17 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
},
{
label: '数量',
field: 'qty',
sort: 'custom',
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

11
src/views/wms/agvManage/backflushDetailbQad/index.vue

@ -27,6 +27,10 @@
v-model:currentPage="tableObject.currentPage" v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort" v-model:sort="tableObject.sort"
> >
<template #qty="{row}">
<span :class="{'red-text':row.qty<0}">{{ row.qty}}</span>
</template>
<template #status="{row}"> <template #status="{row}">
<span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span> <span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span>
</template> </template>
@ -258,3 +262,10 @@ onMounted(async () => {
}) })
</script> </script>
<style lang="scss" scoped>
.red-text{
color:var(--el-color-danger);
font-weight:700;
}
</style>

2
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@ -41,7 +41,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="t('ts.状态').replace('ts.','')" prop="status"> <el-form-item :label="t('ts.状态').replace('ts.','')" prop="status">
<el-switch key="status" v-model="formData.status" /> <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

30
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue

@ -26,15 +26,28 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }"> <el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
<el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode" /> <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode" show-overflow-tooltip width="150px" />
<el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip /> <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip width="150px" />
<el-table-column align="center" :label="t('ts.策略描述')" prop="description" /> <el-table-column align="center" :label="t('ts.策略描述')" prop="description" show-overflow-tooltip width="150px" />
<el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable/> <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable width="120"/>
<el-table-column align="center" :label="t('ts.状态')" prop="status"> <el-table-column align="center" :label="t('ts.状态')" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
vue
<el-table-column align="center" :label="t('ts.创建时间')" prop="createTime" width="200px" >
<template #default="scope">
{{ formatDate(scope.row.createTime) }}
</template>
</el-table-column>
<el-table-column align="center" :label="t('ts.创建人')" prop="creator" width="150px" />
<el-table-column align="center" :label="t('ts.最后更新时间')" prop="updateTime" width="200px" >
<template #default="scope">
{{ formatDate(scope.row.updateTime) }}
</template>
</el-table-column>
<el-table-column align="center" :label="t('ts.最后更新人')" prop="updater" width="150px" />
<el-table-column align="center" :label="t('ts.操作')" fixed="right" width="240"> <el-table-column align="center" :label="t('ts.操作')" fixed="right" width="240">
<template #default="scope"> <template #default="scope">
<ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" /> <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
@ -54,6 +67,7 @@ import { DICT_TYPE } from '@/utils/dict'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as RuleApi from '@/api/wms/rule' import * as RuleApi from '@/api/wms/rule'
import AddForm from './AddForm.vue' import AddForm from './AddForm.vue'
import dayjs from 'dayjs'
defineOptions({ name: 'SupplieDeliveryStrategy' }) defineOptions({ name: 'SupplieDeliveryStrategy' })
const queryFormRef = ref() // 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(() => { onMounted(() => {
getList() getList()

41
src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts

@ -17,6 +17,9 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
label: '供应商代码', label: '供应商代码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
table: {
width: 150,
},
isSearch: true, isSearch: true,
form: { form: {
componentProps: { componentProps: {
@ -151,6 +154,44 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
}, },
} }
}, },
{
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: '操作', label: '操作',
field: 'action', field: 'action',

6
src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@ -226,6 +226,12 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{
label: '创建人',
field: 'creator',
sort: 'custom',
isForm: false,
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

33
src/views/wms/inventoryManage/balance/index.vue

@ -54,17 +54,17 @@
<!-- 详情 --> <!-- 详情 -->
<Detail <Detail
ref="detailRef" ref="detailRef"
:isBasic="false" :isBasic="true"
:allSchemas="TransactionTab.allSchemas" :allSchemas="TransactionTab.allSchemas"
:detailAllSchemas="TransactionTab.allSchemas" :detailAllSchemas="TransactionTab.allSchemas"
:detailAllSchemasRules="BalanceRules" :apiPage="apiPage"
:apiPage="BalanceApi.getTransactionBalancePage" :tabsExtend="tabsExtend"
:isShowAddBtn="false"
:detailButtonIsShow="true"
:tabs="[{ :tabs="[{
label: '库存事务', label: '库存事务',
prop: 'Transaction' prop: 'Transaction'
}]" }]"
@changeTabs="changeTabs"
:tableObjectExtend="tableObjectExtend"
/> />
<!-- 导入 --> <!-- 导入 -->
@ -97,6 +97,9 @@ const route = useRoute() //路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(Balance.allSchemas.tableColumns) const tableColumns = ref(Balance.allSchemas.tableColumns)
const tabsExtend = ref(false)
const apiPage = ref()
const tableObjectExtend = ref()
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
@ -258,7 +261,9 @@ const openForm = (type: string, row?: any) => {
/** 详情操作 */ /** 详情操作 */
const detailRef = ref() const detailRef = ref()
const chooseRow = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => { const openDetail = (row: any, titleName: any, titleValue: any) => {
chooseRow.value = row
detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance') detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
} }
@ -343,7 +348,23 @@ const searchFormClick = (searchData) => {
} }
getList() // 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() => { onMounted(async() => {
getList() getList()

5
src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts

@ -419,7 +419,10 @@ export const ScrapJobMain = useCrudSchemas(
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
} },
isTable:false,
isForm:false,
isTableForm:false,
}, },
{ {
label: '自动完成', label: '自动完成',

27
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@ -383,17 +383,17 @@ export const ScrapRecordMain = useCrudSchemas(
width: 150 width: 150
} }
}, },
{ // {
label: '接口类型', // label: '接口类型',
field: 'interfaceType', // field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, // dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', // dictClass: 'string',
isTable: true, // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
} // }
}, // },
{ {
label: '通知单描述', label: '通知单描述',
field: 'noticeRemark', field: 'noticeRemark',
@ -411,7 +411,10 @@ export const ScrapRecordMain = useCrudSchemas(
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
} },
isTable:false,
isForm:false,
isTableForm:false,
}, },
{ {
label: '是否已撤销', label: '是否已撤销',

4
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -1101,14 +1101,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
componentProps: { componentProps: {
disabled:true, disabled:true,
min: 0, min: 0,
precision: 6, precision: 2,
} }
}, },
tableForm: { tableForm: {
type: 'InputNumber', type: 'InputNumber',
disabled:true, disabled:true,
min: 0, min: 0,
precision: 6, precision: 2,
}, },
}, },
{ {

25
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@ -666,7 +666,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x' valueFormat: 'x'
} }
} },
isTable:false,
}, },
{ {
label: '创建者', label: '创建者',
@ -1081,16 +1082,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
sortTableDefault: 1012, sortTableDefault: 1012,
hiddenInMain: true hiddenInMain: true
}, },
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: true,
sortTableDefault: 1012
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -1110,7 +1101,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
valueFormat: 'x' valueFormat: 'x'
} }
}, },
hiddenInMain: true, hiddenInMain: false,
sortTableDefault: 1012
},
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
hiddenInMain: false,
sortTableDefault: 1012 sortTableDefault: 1012
}, },
{ {

22
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@ -911,16 +911,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
sortTableDefault: 1007, sortTableDefault: 1007,
hiddenInMain: true hiddenInMain: true
}, },
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
sortTableDefault: 1014,
hiddenInMain: true,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -932,7 +922,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true, hiddenInMain: false,
sortTableDefault: 1014, sortTableDefault: 1014,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
@ -943,6 +933,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
}, },
{
label: '创建者',
field: 'creator',
sort: 'custom',
table: {
width: 150
},
sortTableDefault: 1014,
hiddenInMain: false,
},
])) ]))

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

@ -276,7 +276,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
isTable:true, isTable:false,
formatter: dateFormatter, formatter: dateFormatter,
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
@ -806,16 +806,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
min: 0 min: 0
} }
}, },
{
label: '创建者',
field: 'creator',
isTableForm: false,
table: {
width: 150
},
hiddenInMain:true,
isForm: false,
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -828,7 +818,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
hiddenInMain:true, hiddenInMain:false,
isForm: false, isForm: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
@ -841,48 +831,58 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '最后更新者', label: '创建者',
field: 'updater', field: 'creator',
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',
isTableForm: false, isTableForm: false,
isTable: true,
hiddenInMain:true,
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:false,
isForm: 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: '备注', label: '备注',
hiddenInMain:true, hiddenInMain:true,

29
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@ -159,3 +159,32 @@ export const SupplierdeliverInspectionDetailRules = reactive({
{ required: true, message: '请输入发货数量', trigger: 'blur' } { required: true, message: '请输入发货数量', trigger: 'blur' }
], ],
}) })
export const CurriculumVitae = useCrudSchemas(reactive<CrudSchema[]>([
{
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' }
]
})

28
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@ -737,6 +737,34 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
width: 150 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: '操作', label: '操作',
hiddenInMain:true, hiddenInMain:true,

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

@ -152,6 +152,14 @@
@footButtonClick="footButtonClick" @footButtonClick="footButtonClick"
@formSelectChange="formSelectChangeLabel" @formSelectChange="formSelectChangeLabel"
/> />
<!-- 上传履历表 -->
<BasicForm
ref="curriculumVitaeRef"
:formAllSchemas="CurriculumVitae.allSchemas"
@success="submitCurriculumVitae"
:tableFormRules="CurriculumVitaeRules"
:isBusiness="false"
/>
<!-- 上传质量报告 --> <!-- 上传质量报告 -->
<BasicForm <BasicForm
ref="ploadQualityReportRef" ref="ploadQualityReportRef"
@ -199,7 +207,9 @@ import {
} from './supplierdeliverRequestMain.data' } from './supplierdeliverRequestMain.data'
import { import {
SupplierdeliverInspectionDetail, SupplierdeliverInspectionDetail,
SupplierdeliverInspectionDetailRules SupplierdeliverInspectionDetailRules,
CurriculumVitae,
CurriculumVitaeRules
} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data' } from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain' import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail' import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@ -534,6 +544,16 @@ const butttondata = (row, $index) => {
hide: isShowMainButton(row, ['1', '2', '3']), hide: isShowMainButton(row, ['1', '2', '3']),
hasPermi: 'wms:supplierdeliver-request-main:uploadCheck' hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
}), // }), //
// {
// label: t('ts.'),
// name: 'mainPlanCurriculumVitae',
// hide: row.status!=5,
// type: 'primary',
// icon: '',
// color: '',
// hasPermi: '',
// link: true //
// }, //
defaultButtons.mainListPlanSubBtn({ defaultButtons.mainListPlanSubBtn({
hide: isShowMainButton(row, ['1']), hide: isShowMainButton(row, ['1']),
hasPermi: 'wms:supplierdeliver-request-main:sub' hasPermi: 'wms:supplierdeliver-request-main:sub'
@ -606,6 +626,9 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'mainPlanUploadQualityReport') { } else if (val == 'mainPlanUploadQualityReport') {
// //
handleUploadQualityReport(row) handleUploadQualityReport(row)
}else if (val == 'mainPlanCurriculumVitae') {
//
handleUploadCurriculumVitae(row)
} else if (val == 'mainPlanSub') { } else if (val == 'mainPlanSub') {
// //
handleSub(row.masterId) handleSub(row.masterId)
@ -948,6 +971,28 @@ const handleUploadQualityReport = async (row) => {
//uploadQualityReportTableData.value = [tableFormKeys] //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) => { const submitFormUploadQualityReport = async (formType, data) => {
delete data.number delete data.number
data.subList = uploadQualityReportTableData.value // data.subList = uploadQualityReportTableData.value //

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

@ -345,7 +345,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
isTable:true, isTable:false,
table: { table: {
width: 180 width: 180
}, },
@ -1169,7 +1169,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
hiddenInMain:true, hiddenInMain:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -1193,45 +1193,45 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true, hiddenInMain:false,
isTableForm: false,
isForm: false,
},
{
label: '最后更新时间',
field: 'updateTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x',
}
},
hiddenInMain:true,
sort: 'custom',
table: {
width: 180
},
isTableForm: false,
isForm: false,
},
{
label: '最后更新者',
field: 'updater',
sort: 'custom',
table: {
width: 150
},
hiddenInMain:true,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
// {
// label: '最后更新时间',
// field: 'updateTime',
// formatter: dateFormatter,
// detail: {
// dateFormat: 'YYYY-MM-DD HH:mm:ss'
// },
// form: {
// component: 'DatePicker',
// componentProps: {
// style: { width: '100%' },
// type: 'datetime',
// dateFormat: 'YYYY-MM-DD HH:mm:ss',
// valueFormat: 'x',
// }
// },
// hiddenInMain:false,
// sort: 'custom',
// table: {
// width: 180
// },
// isTableForm: false,
// isForm: false,
// },
// {
// label: '最后更新者',
// field: 'updater',
// sort: 'custom',
// table: {
// width: 150
// },
// hiddenInMain:false,
// isTableForm: false,
// isForm: false,
// },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',

39
src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts

@ -57,22 +57,6 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
field: 'remark', field: 'remark',
sort: 'custom', 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: '扩展属性', label: '扩展属性',
field: 'extraProperties', field: 'extraProperties',
@ -98,6 +82,29 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false, isTable: false,
isForm: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: '操作', label: '操作',
field: 'action', field: 'action',

1
src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts

@ -211,7 +211,6 @@ export const SupplierApbalanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
} }
}, },
isForm: false,
}, },
{ {
label: '备注', label: '备注',

12
src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts

@ -159,7 +159,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
formatter: dateFormatter, formatter: dateFormatter,
isSearch: false, isSearch: false,
isTable: false, isTable: true,
isForm:false, isForm:false,
isDetail:false, isDetail:false,
search: { search: {
@ -170,7 +170,15 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] 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', label: '部门id',

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

@ -104,7 +104,7 @@
formRef.value.setValues({ formRef.value.setValues({
afterTaxAmount: amount + taxAmount, // 3+ afterTaxAmount: amount + taxAmount, // 3+
adTaxAmount: beforeTaxAmount + totalTaxAmount, //6+ adTaxAmount: beforeTaxAmount + totalTaxAmount, //6+
beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //-- beforeTaxDiffAmount: beforeTaxAmount - amount, //-
taxAmountDiff: totalTaxAmount - taxAmount, // - taxAmountDiff: totalTaxAmount - taxAmount, // -
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // =+ totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // =+
rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)), rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
@ -132,7 +132,7 @@
taxAmount: taxAmount_, taxAmount: taxAmount_,
afterTaxAmount: amount + taxAmount, // 3+ afterTaxAmount: amount + taxAmount, // 3+
adTaxAmount: beforeTaxAmount + totalTaxAmount, //6+ adTaxAmount: beforeTaxAmount + totalTaxAmount, //6+
beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //-- beforeTaxDiffAmount: beforeTaxAmount - amount, //-
taxAmountDiff: totalTaxAmount - taxAmount, // - taxAmountDiff: totalTaxAmount - taxAmount, // -
totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // =+ totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // =+
rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)), rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),

Loading…
Cancel
Save