diff --git a/index.html b/index.html index dc8466c..4b869f9 100644 --- a/index.html +++ b/index.html @@ -17,16 +17,7 @@
- - + diff --git a/src/api/list/index.ts b/src/api/list/index.ts index 9d63bf4..0826497 100644 --- a/src/api/list/index.ts +++ b/src/api/list/index.ts @@ -103,5 +103,13 @@ export function listApi() { data, }); }, + //采购信息 + getFPurchaseOrgList: (data: object) => { + return request({ + url: '/api/Admin/Login/GetFPurchaseOrgList', + method: 'get', + params:data, + }); + }, }; } diff --git a/src/api/login/index.ts b/src/api/login/index.ts index 3c3794e..20b16b7 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -23,5 +23,13 @@ export function useLoginApi() { data, }); }, + //获取用户信息 + getAccountInfo: (data: object) => { + return request({ + url: '/api/Admin/Login/GetAccountInfo', + method: 'get', + params:data, + }); + }, }; } diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index eab9fe6..2e1e033 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -16,6 +16,7 @@ export default { items: 'items', proceed: 'proceed', date: 'Date', + date1: 'Date', status: 'Status', unclosed: 'Unclosed', partNumber: 'Part Number', @@ -55,9 +56,12 @@ export default { passwordChangedFailed:'Password changed failed', shipmentQTY:'Shipment QTY', invoiceNumber:'Invoice number', + invoiceNumber1:'Invoice #', deliveryNote1:'Delivery Note', deliveryNoteNumber:'Delivery Note Number', + deliveryNoteNumber1:'GRN #', PO:'PO #', + PO1:'PO #', shipper:'Shipper', year:'Year', month:'Mnth', @@ -69,6 +73,7 @@ export default { success:'Success', copy:'Copy', deleteText:'Delete', - scqd:'Please confirm the deletion of the delivery note?' + scqd:'Please confirm the deletion of the delivery note?', + receiver:'Receiver' }, }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index db58851..2d998e4 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -16,6 +16,7 @@ export default { items: '条数据', proceed: '去查看', date: '日期', + date1: '采购日期', status: '关闭状态', unclosed: '未关闭', partNumber: '物料编码', @@ -23,15 +24,16 @@ export default { unit: '采购单位', unit1: '单位', qty: '采购数量', - requestDate: '交货日期', + requestDate: '需求日期', receivedQTY: '累计已送货数量', unreceivedQTY: '未发货数量', earliestDeliveryDate: '供应商承诺交期', - latestDeliveryDate: '供应商承诺交期', + latestDeliveryDate: '供应商承诺最新交期', view: '查看', batchUpdateEarliestDeliveryDate: '批量修改选中承诺日期', batchUpdateLatestDeliveryDate: '批量修改选中承诺最新交期', specification: '物料规格', + xsddh:'销售订单号', /*发货订单及其明细*/ startDate: '开始送货日期', @@ -56,9 +58,12 @@ export default { prompt:'提示', pleaseConfirmTheDateChange:'是否修改此项日期', invoiceNumber:'发票号', + invoiceNumber1:'发票号', deliveryNote1:'采购送货单', deliveryNoteNumber:'收料通知单编号（送货单号）', + deliveryNoteNumber1:'收料通知单编号', PO:'PO号', + PO1:'采购订单号', shipper:'送货人', year:'年', month:'月', @@ -70,6 +75,7 @@ export default { success:'成功', copy:'复制', deleteText:'删除', - scqd:'确定要删除该条送货单?' + scqd:'确定要删除该条送货单?', + receiver:'接收人', }, }; diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 723cdae..1c11855 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -109,12 +109,14 @@ const onSignIn = () => { passWord: state.ruleForm.password, }).then( async (res:any) => { state.loading.signIn = false; - console.log(res) + useLoginApi().getAccountInfo({}).then((resUser:any) => { + Local.set('setUserInfo',resUser.data); + Cookies.set('userName', resUser.data.name); + }) if(res.data !== null){ // 存储 token 到浏览器缓存 Session.set('token', res.data); // 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断（模拟数据） - Cookies.set('userName', state.ruleForm.userName); if (!themeConfig.value.isRequestRoutes) { // 前端控制路由，2、请注意执行顺序 const isNoPower = await initFrontEndControlRoutes(); @@ -126,6 +128,7 @@ const onSignIn = () => { // 执行完 initBackEndControlRoutes，再执行 signInSuccess signInSuccess(isNoPower); } + } }) diff --git a/src/views/materialReceiptNotice/barCode.vue b/src/views/materialReceiptNotice/barCode.vue index 09eba2c..c19112b 100644 --- a/src/views/materialReceiptNotice/barCode.vue +++ b/src/views/materialReceiptNotice/barCode.vue @@ -15,16 +15,16 @@ -
打印
\ No newline at end of file diff --git a/src/views/materialReceiptNotice/index.vue b/src/views/materialReceiptNotice/index.vue index c83de62..034a7db 100644 --- a/src/views/materialReceiptNotice/index.vue +++ b/src/views/materialReceiptNotice/index.vue @@ -15,6 +15,7 @@ + + 43 @@ -73,18 +74,14 @@ diff --git a/src/views/mssPurchaseOrder/index.vue b/src/views/mssPurchaseOrder/index.vue index b384562..47913f2 100644 --- a/src/views/mssPurchaseOrder/index.vue +++ b/src/views/mssPurchaseOrder/index.vue @@ -82,6 +82,7 @@ style="width: 220px" format="YYYY-MM-DD" value-format="YYYY-MM-DD" + :disabled="row.chengNuoJiaoQi != null" @change="batchSetChengNuoJiaoQiFun([{ id: row.id, newTime: row.chengNuoJiaoQi }])" /> @@ -140,7 +141,7 @@ const state = reactive({ option: { height: computed(() => window.innerHeight - window.innerHeight * 0.23 + ''), tip: false, - index: true, + index: false, menu: true, menuWidth: 85, border: true, @@ -153,37 +154,42 @@ const state = reactive({ searchMenuSpan: 3, addBtn: false, column: [ - { label: computed(() => t('message.index.DocNumber')), prop: 'fBillNo', searchSpan: 3, width: '125' }, - { label: computed(() => t('message.index.date')), prop: 'fDate', type: 'datetime', searchSpan: 6, searchRange: true }, + { label: computed(() => t('message.index.DocNumber')), prop: 'fBillNo', searchSpan: 3, width: '125',filters: true }, + { label: '销售订单号', prop: '', searchSpan: 3, width: '125',filters: true }, + { label: '手工销售订单号', prop: '', searchSpan: 3, width: '125',filters: true }, + { label: '采购组织', prop: 'fPurchaseOrgName', searchSpan: 3, width: '125',filters: true }, + { label: computed(() => t('message.index.date1')), prop: 'fDate', type: 'datetime', searchSpan: 6, searchRange: true,filters: true }, { label: computed(() => t('message.index.status')), prop: 'fCancelStatus', + filters: true, dicData: [ - { label: computed(() => t('message.index.closed')), value: 'A' }, - { label: computed(() => t('message.index.unclosed')), value: 'B' }, + { label: computed(() => t('message.index.unclosed')), value: 'A' }, + { label: computed(() => t('message.index.closed')), value: 'B' }, ], width: '90', }, - { label: computed(() => t('message.index.partNumber')), prop: 'materialCode', width: '120' }, - { label: computed(() => t('message.index.materialName')), prop: 'materialName', width: '240' }, - { label: computed(() => t('message.index.specification')), prop: 'guige', width: '120' }, - { label: computed(() => t('message.index.unit')), prop: 'unitName', width: '90' }, - { label: computed(() => t('message.index.qty')), prop: 'qty', width: '90' }, - { label: computed(() => t('message.index.requestDate')), prop: 'fDeliveryDate', width: '165' }, + { label: computed(() => t('message.index.partNumber')), prop: 'materialCode', width: '120',filters: true }, + { label: computed(() => t('message.index.materialName')), prop: 'materialName', width: '240',filters: true }, + // { label: computed(() => t('message.index.specification')), prop: 'guige', width: '120',filters: true }, + { label: computed(() => t('message.index.unit')), prop: 'unitName', width: '90',filters: true }, + { label: computed(() => t('message.index.qty')), prop: 'qty', width: '90',filters: true }, + { label: computed(() => t('message.index.requestDate')), prop: 'fDeliveryDate', width: '165',filters: true }, { label: computed(() => t('message.index.DocStatus')), prop: 'fmrpCloseStatus', searchSpan: 3, + filters: true, dicData: [ { label: computed(() => t('message.index.normal')), value: 'A' }, { label: computed(() => t('message.index.closed')), value: 'B' }, ], width: '90', }, - { label: computed(() => t('message.index.receivedQTY')), prop: 'sendedQty', width: '110' }, - { label: computed(() => t('message.index.unreceivedQTY')), prop: 'notSendQty', width: '110' }, - { label: computed(() => t('message.index.earliestDeliveryDate')), prop: 'chengNuoJiaoQi', width: '160' }, - { label: computed(() => t('message.index.latestDeliveryDate')), prop: 'newChengNuoJiaoQi', width: '160' }, + { label: computed(() => t('message.index.receivedQTY')), prop: 'sendedQty', width: '130',filters: true }, + { label: computed(() => t('message.index.unreceivedQTY')), prop: 'notSendQty', width: '110',filters: true }, + { label: computed(() => t('message.index.earliestDeliveryDate')), prop: 'chengNuoJiaoQi', width: '160',filters: true }, + { label: computed(() => t('message.index.latestDeliveryDate')), prop: 'newChengNuoJiaoQi', width: '160',filters: true }, ], }, data: [], @@ -311,6 +317,7 @@ const batchSetChengNuoJiaoQiFun = (arr: any) => { } }); } else { + getList(); done(); } }, @@ -343,6 +350,7 @@ const batchSetNewChengNuoJiaoQiFun = (arr: any) => { } }); } else { + getList(); done(); } }, diff --git a/src/views/mssPurchaseOrder/purchaseDetails.vue b/src/views/mssPurchaseOrder/purchaseDetails.vue index 07dcfdd..6b66c3d 100644 --- a/src/views/mssPurchaseOrder/purchaseDetails.vue +++ b/src/views/mssPurchaseOrder/purchaseDetails.vue @@ -53,6 +53,7 @@ style="width: 220px" format="YYYY-MM-DD" value-format="YYYY-MM-DD" + :disabled="row.chengNuoJiaoQi != null" @change="batchSetChengNuoJiaoQiFun([{id:row.id,newTime:row.chengNuoJiaoQi}])" /> @@ -191,6 +192,7 @@ const chengNuoJiaoQiPFun = (e: string) => { } }); } else { + getList(); done(); } }, @@ -227,6 +229,7 @@ const chengNuoJiaoQiPFun = (e: string) => { } }); } else { + getList(); done(); } }, diff --git a/src/views/mssPurchaseOrder/selectedData.vue b/src/views/mssPurchaseOrder/selectedData.vue index 97f2fbc..2a60c3a 100644 --- a/src/views/mssPurchaseOrder/selectedData.vue +++ b/src/views/mssPurchaseOrder/selectedData.vue @@ -78,6 +78,8 @@ const state = reactive({ { label: computed(() => t('message.index.unreceivedQTY')), prop: 'notSendQtyText' }, { label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' }, { label: computed(() => t('message.index.shipmentQTY')), prop: 'notSendQty', width: '180' }, + { label: '包装数量', prop: '123'}, + { label: '条码张数', prop: '1233'}, { label: computed(() => t('message.index.earliestDeliveryDate')), prop: 'chengNuoJiaoQi', width: '180' }, { label: computed(() => t('message.index.latestDeliveryDate')), prop: 'newChengNuoJiaoQi', width: '180' }, ], diff --git a/src/views/system/user/dialog.vue b/src/views/system/user/dialog.vue index d579d7a..627c7b2 100644 --- a/src/views/system/user/dialog.vue +++ b/src/views/system/user/dialog.vue @@ -34,6 +34,19 @@ + + + + + + + { } state.dialog.isShowDialog = true; getMenuData(); + getFPurchaseOrgListFun() }; // 关闭弹窗 const closeDialog = () => { @@ -134,15 +150,16 @@ const onSubmit = () => { closeDialog(); emit('refresh', {...state.ruleForm,dataState:state.dialog.title === '新增用户' ? '0':'1'}); }; - const BDSupplierListItemChange = (val:any) => { - let dbsObj:any = state.BDSupplierList.find(item => item.value === val); - console.log(dbsObj) state.ruleForm.supplierId = dbsObj.value state.ruleForm.supplierName = dbsObj.text } - +const BDFPurchaseOrgListItemChange = (val:any) => { + let dbsObj:any = state.BDFPurchaseOrgList.find(item => item.value === val); + state.ruleForm.fPurchaseOrgId = dbsObj.value + state.ruleForm.fPurchaseOrgName = dbsObj.text +} // 初始化供应商数据 const getMenuData = () => { listApi().getBDSupplierList({}).then((res:any) => { @@ -155,6 +172,18 @@ const getMenuData = () => { }) }; +//初始化采购信息 +const getFPurchaseOrgListFun = () => { + listApi().getFPurchaseOrgList({}).then((res:any) => { + if (res.resultCode === 0) { + state.BDFPurchaseOrgList = res.data + } + if (res.resultCode === -1) { + ElMessage.error(res.errorMessage); + } + }) +} + // 暴露变量 defineExpose({ openDialog, diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index fb34c8a..8d071ff 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -79,6 +79,10 @@ const state = reactive({ { label: '管理员', value: '1' }, ], }, + { + label: '采购组织名称', + prop: 'fPurchaseOrgName', + }, { label: '账号状态', prop: 'status', @@ -87,6 +91,7 @@ const state = reactive({ { label: '正常', value: '1' }, ], }, + ], }, data: [], @@ -107,8 +112,6 @@ const state = reactive({ const getTableData = (item: any) => { let data1 = { ...item }; let data2 = { ...item, id: state.itemId }; - console.log(data2) - debugger listApi() .loginSave(state.itemId === '' ? data1 : data2) .then((res: any) => {