From d5731d821ee9eed20a087e741a83971ccd68153a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 9 May 2024 16:05:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preregistration/preregistration.vue | 12 +++-- .../preregistration/preregistrationAdd.vue | 49 ++++++++++++++----- .../preregistration/preregistrationInfo.vue | 26 +++++++--- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue index 663d57bf4c..8d6e5a4dbf 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue @@ -39,7 +39,7 @@ - + @@ -69,14 +69,14 @@ - + @@ -86,12 +86,12 @@ - + - + @@ -203,6 +203,7 @@ export default { createDept: '', createByName: '', billNo: '', + waitorName: '', startCreateDate: '', endCreateDate: '' } @@ -305,6 +306,7 @@ export default { createDept: '', createByName: '', billNo: '', + waitorName: '', startCreateDate: '', endCreateDate: '' } diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue index e0f796abb2..8f905dfae0 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue @@ -46,7 +46,7 @@
至 - +
@@ -78,15 +78,15 @@ {{ formobj.customerOrg }} -
服务项目
+
+
服务项目
+ 添加 +
- - + @@ -138,7 +138,7 @@ - + @@ -205,7 +205,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -214,6 +215,12 @@ export default { } }, methods: { + // 限制日期不可选择开始日期之前的 + pickerEndData(newtime) { + return { + disabledDate(time) { return time.getTime() < new Date(newtime) - 1000 * 60 * 60 * 24 } + } + }, init() { selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { @@ -227,7 +234,7 @@ export default { this.$refs['form_obj'].clearValidate() }) this.init() - this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath') + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) @@ -339,10 +346,10 @@ export default { row.hours = Math.round((parseFloat(row.price === '' ? '0' : row.price) / parseFloat(row.hourPrice === '' ? '0' : row.hourPrice)) * 100) / 100 }, handleClick(value) { - this.formobj.trackLogs = value + this.formobj.trackLog = value }, handleAdd() { - if (this.formobj.trackLogs !== '') { + if (this.formobj.trackLog !== '') { req.saveTrackingRecord(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '添加成功' }) @@ -355,6 +362,10 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.sitemVos.length === 0) { + this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' }) + return + } this.submitdisabled = true req.saveOrUpdate(this.formobj).then((res) => { if (res.success) { @@ -372,6 +383,10 @@ export default { toService() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.sitemVos.length === 0) { + this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' }) + return + } if (this.formobj.sitemVos.length === 0) { this.$message({ showClose: true, type: 'error', message: '表格不能为空' }) return @@ -439,7 +454,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -462,4 +478,11 @@ export default { margin-left: 120px !important; width: calc(100% - 115px); } +.titleOne{ + padding: 7px; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue index 98c9ad99bd..8ed6eed384 100644 --- a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue +++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue @@ -74,11 +74,10 @@
跟踪记录
- - - {{ formobj.trackLogs }} - - + + + + @@ -94,6 +93,8 @@ export default { viewState: 1, index: 0, serviceKey: 0, + tableKey: 1, + list: [], formobj: { sid: '', createBySid: '', @@ -113,7 +114,8 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' @@ -126,6 +128,13 @@ export default { req.fetchBySid(row.sid).then((res) => { if (res.success) { this.formobj = res.data + if (this.formobj.trackLogs.length > 0) { + this.formobj.trackLogs.forEach((e) => { + this.list.push({ + name: e + }) + }) + } } }) }, @@ -149,13 +158,14 @@ export default { orgPath: '', createTime: '', vinNo: '', - trackLogs: '', + trackLog: '', + trackLogs: [], createDeptSid: '', createDept: '', customerOrg: '' } this.$emit('doback') - }, + } } } From b88dea803db0f8d8d4f424eb7f4922a71527d14d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 9 May 2024 16:19:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/router/index.js | 302 +++++++++++----------------------- 1 file changed, 94 insertions(+), 208 deletions(-) diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 0857a9f022..8863779665 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -49,69 +49,49 @@ export const constantRoutes = [{ meta: { title: '业务' }, - children: [{ + children: [ + { path: '/preregistration/preregistration', component: () => import('@/views/operation/preregistration/preregistration.vue'), name: 'Preregistration', - meta: { - title: '预约登记', - noCache: true - } + meta: { title: '预约单管理', noCache: true } }, { path: '/repairbill/repairbill', component: () => import('@/views/operation/repairbill/repairbill.vue'), name: 'RepairBill', - meta: { - title: '维修开单管理(登记)', - noCache: true - } + meta: { title: '维修开单管理(登记)', noCache: true } }, { path: '/repairbill/repairbillBySendWork', component: () => import('@/views/operation/repairbill/repairbillBySendWork.vue'), name: 'RepairBillBySendWork', - meta: { - title: '维修开单管理(派工)', - noCache: true - } + meta: { title: '维修开单管理(派工)', noCache: true } }, { path: '/repairbill/repairbillByMaintain', component: () => import('@/views/operation/repairbill/repairbillByMaintain.vue'), name: 'RepairBillByMaintain', - meta: { - title: '维修开单管理(维修)', - noCache: true - } + meta: { title: '维修开单管理(维修)', noCache: true } }, { path: '/repairbill/repairbillByBeCompleted', component: () => import('@/views/operation/repairbill/repairbillByBeCompleted.vue'), name: 'RepairBillByBeCompleted', - meta: { - title: '维修开单管理(竣工)', - noCache: true - } + meta: { title: '维修开单管理(竣工)', noCache: true } }, { path: '/repairbill/repairbillBySettleAccounts', component: () => import('@/views/operation/repairbill/repairbillBySettleAccounts.vue'), name: 'RepairBillBySettleAccounts', - meta: { - title: '维修开单管理(结算)', - noCache: true - } + meta: { title: '维修开单管理(结算)', noCache: true } }, { path: '/repairbill/repairbillBYLeaveFactory', component: () => import('@/views/operation/repairbill/repairbillBYLeaveFactory.vue'), name: 'RepairBillBYLeaveFactory', - meta: { - title: '维修开单管理(出厂)', - noCache: true - } - }, + meta: { title: '维修开单管理(出厂)', noCache: true } + } // { // path: '/workslrsettlement/workslrsettlement', // component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'), @@ -127,43 +107,31 @@ export const constantRoutes = [{ meta: { title: '仓库管理' }, - children: [{ + children: [ + { path: '/goodsShelves/index', component: () => import('@/views/warehouse/goodsShelves/index.vue'), name: 'GoodsShelves', - meta: { - title: '库位管理', - noCache: true - } + meta: { title: '库位管理', noCache: true } }, { path: '/warehouseArea/index', component: () => import('@/views/warehouse/warehouseArea/index.vue'), name: 'WarehouseArea', - meta: { - title: '库区管理', - noCache: true - } + meta: { title: '库区管理', noCache: true } }, { path: '/warehouseAreaType/index', component: () => import('@/views/warehouse/warehouseAreaType/index.vue'), name: 'WarehouseAreaType', - meta: { - title: '库区类型管理', - noCache: true - } + meta: { title: '库区类型管理', noCache: true } }, { path: '/warehouse/index', component: () => import('@/views/warehouse/warehouse/index.vue'), name: 'Warehouse', - meta: { - title: '仓库管理', - noCache: true - } - }, - + meta: { title: '仓库管理', noCache: true } + } ] }, @@ -174,51 +142,37 @@ export const constantRoutes = [{ meta: { title: '商品管理' }, - children: [{ + children: [ + { path: '/brands/index', component: () => import('@/views/goods/brands/index.vue'), name: 'Brands', - meta: { - title: '品牌管理', - noCache: true - } + meta: { title: '品牌管理', noCache: true } }, { path: '/category/index', component: () => import('@/views/goods/category/index.vue'), name: 'Category', - meta: { - title: '类别管理', - noCache: true - } + meta: { title: '类别管理', noCache: true } }, { path: '/factory/index', component: () => import('@/views/goods/factory/index.vue'), name: 'Factory', - meta: { - title: '厂家管理', - noCache: true - } + meta: { title: '厂家管理', noCache: true } }, { path: '/goods/index', component: () => import('@/views/goods/goods/index.vue'), name: 'Goods', - meta: { - title: '商品管理', - noCache: true - } + meta: { title: '商品管理', noCache: true } }, { path: '/unit/index', component: () => import('@/views/goods/unit/index.vue'), name: 'Unit', - meta: { - title: '单位管理', - noCache: true - } - }, + meta: { title: '单位管理', noCache: true } + } ] }, { @@ -228,132 +182,109 @@ export const constantRoutes = [{ meta: { title: '仓储' }, - children: [{ + children: [ + { path: '/outStorage/index', - name: 'OutStorage', component: () => import('@/views/storage/outStorage/index'), - meta: { - title: '出库管理', - noCache: true - } + name: 'OutStorage', + meta: { title: '出库管理', noCache: true } }, { path: '/inventory/inventory', component: () => import('@/views/storage/inventory/inventory.vue'), name: 'Inventory', - meta: { - title: '库存查询', - noCache: true - } + meta: { title: '库存查询', noCache: true } }, { path: '/inventory/inventoryRefer', component: () => import('@/views/storage/inventory/inventoryRefer.vue'), name: 'InventoryRefer', - meta: { - title: '出入库查询', - noCache: true - } + meta: { title: '出入库查询', noCache: true } }, { path: '/stocktaking/index', - name: 'Stocktaking', component: () => import('@/views/storage/stocktaking/index'), - meta: { - title: '盘点管理', - noCache: true - } + name: 'Stocktaking', + meta: { title: '盘点管理', noCache: true } }, { path: '/allocation/index', - name: 'Allocation', component: () => import('@/views/storage/allocation/index'), - meta: { - title: '调拨管理', - noCache: true - } + name: 'Allocation', + meta: { title: '调拨管理', noCache: true } }, { path: '/deliveryNotice/index', - name: 'DeliveryNotice', component: () => import('@/views/storage/deliveryNotice/index'), - meta: { - title: '到货通知单', - noCache: true - } + name: 'DeliveryNotice', + meta: { title: '到货通知单', noCache: true } }, { path: '/receivingGoods/index', - name: 'ReceivingGoods', component: () => import('@/views/storage/receivingGoods/index'), - meta: { - title: '收货单管理', - noCache: true - } + name: 'ReceivingGoods', + meta: { title: '收货单管理', noCache: true } }, { path: '/upShelf/index', - name: 'UpShelf', component: () => import('@/views/storage/upShelf/index'), - meta: { - title: '上架单管理', - noCache: true - } + name: 'UpShelf', + meta: { title: '上架单管理', noCache: true } }, { path: '/oldPartsFactory/index', - name: 'OldPartsFactory', component: () => import('@/views/storage/oldPartsFactory/index'), - meta: { - title: '旧件返厂', - noCache: true - } + name: 'OldPartsFactory', + meta: { title: '旧件返厂', noCache: true } }, { path: '/oldPartsCope/index', - name: 'OldPartsCope', component: () => import('@/views/storage/oldPartsCope/index'), - meta: { - title: '旧件处理', - noCache: true - } + name: 'OldPartsCope', + meta: { title: '旧件处理', noCache: true } }, { path: '/oldPartsRecovery/index', - name: 'OldPartsRecovery', component: () => import('@/views/storage/oldPartsRecovery/index'), - meta: { - title: '旧件回收', - noCache: true - } + name: 'OldPartsRecovery', + meta: { title: '旧件回收', noCache: true } }, { path: '/oldPartsInStorage/index', - name: 'OldPartsInStorage', component: () => import('@/views/storage/oldPartsInStorage/index'), - meta: { - title: '旧件入库', - noCache: true - } + name: 'OldPartsInStorage', + meta: { title: '旧件入库', noCache: true } }, { path: '/oldPartsInvertory/index', - name: 'OldPartsInvertory', component: () => import('@/views/storage/oldPartsInvertory/index'), - meta: { - title: '旧件库存', - noCache: true - } + name: 'OldPartsInvertory', + meta: { title: '旧件库存', noCache: true } }, { path: '/oldPartsInAndOutStorage/index', - name: 'OldPartsInAndOutStorage', component: () => import('@/views/storage/oldPartsInAndOutStorage/index'), - meta: { - title: '旧件出入库查询', - noCache: true - } + name: 'OldPartsInAndOutStorage', + meta: { title: '旧件出入库查询', noCache: true } }, + { + path: '/storageage/storageage', + component: () => import('@/views/storage/storageage/storageage'), + name: 'StorageAge', + meta: { title: '库龄查询', noCache: true } + }, + { + path: '/carryover/carryoverstock', + component: () => import('@/views/storage/carryover/carryoverstock'), + name: 'CarryoverStock', + meta: { title: '结转库存查询', noCache: true } + }, + { + path: '/carryover/carryforwardrecord', + component: () => import('@/views/storage/carryover/carryforwardrecord'), + name: 'CarryForwardRecord', + meta: { title: '结转记录查询', noCache: true } + } ] }, @@ -364,23 +295,18 @@ export const constantRoutes = [{ meta: { title: '采购' }, - children: [{ + children: [ + { path: '/procurement/procurement', component: () => import('@/views/purchase/procurement/procurement.vue'), name: 'Procurement', - meta: { - title: '采购开单', - noCache: true - } + meta: { title: '采购单管理', noCache: true } }, { path: '/purchasereturn/purchasereturn', component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'), name: 'PurchaseReturn', - meta: { - title: '采购退货', - noCache: true - } + meta: { title: '采购退货', noCache: true } } ] }, @@ -391,68 +317,48 @@ export const constantRoutes = [{ meta: { title: '报表' }, - children: [{ + children: [ + { path: '/salesstatement/merchandisesalesdetail', component: () => import('@/views/statement/salesstatement/merchandisesalesdetail.vue'), name: 'MerchandiseSalesDetail', - meta: { - title: '销售明细商品', - noCache: true - } + meta: { title: '销售明细商品', noCache: true } }, { path: '/salesstatement/merchandisesalessummary', component: () => import('@/views/statement/salesstatement/merchandisesalessummary.vue'), name: 'MerchandiseSalesSummary', - meta: { - title: '销售汇总商品', - noCache: true - } + meta: { title: '销售汇总商品', noCache: true } }, { path: '/salesstatement/salestrendreport', component: () => import('@/views/statement/salesstatement/salestrendreport.vue'), name: 'SalesTrendReport', - meta: { - title: '销售价趋势报表', - noCache: true - } + meta: { title: '销售价趋势报表', noCache: true } }, { path: '/warehousereport/inventorystatistics', component: () => import('@/views/statement/warehousereport/inventorystatistics.vue'), name: 'InventoryStatistics', - meta: { - title: '库存统计', - noCache: true - } + meta: { title: '库存统计', noCache: true } }, { path: '/warehousereport/receiptandreceiptrecord', component: () => import('@/views/statement/warehousereport/receiptandreceiptrecord.vue'), name: 'ReceiptAndReceiptRecord', - meta: { - title: '收发存明细报表', - noCache: true - } + meta: { title: '收发存明细报表', noCache: true } }, { path: '/purchasereport/detailedpurchasereport', component: () => import('@/views/statement/purchasereport/detailedpurchasereport.vue'), name: 'DetailedPurchaseReport', - meta: { - title: '采购明细报表', - noCache: true - } + meta: { title: '采购明细报表', noCache: true } }, { path: '/purchasereport/purchasesummaryreport', component: () => import('@/views/statement/purchasereport/purchasesummaryreport.vue'), name: 'PurchaseSummaryReport', - meta: { - title: '采购汇总报表', - noCache: true - } + meta: { title: '采购汇总报表', noCache: true } } ] }, @@ -463,68 +369,48 @@ export const constantRoutes = [{ meta: { title: '基础信息' }, - children: [{ + children: [ + { path: '/maintenanceitem/maintenanceitem', component: () => import('@/views/basicinformation/maintenanceitem/maintenanceitem.vue'), name: 'MaintenanceItem', - meta: { - title: '维修项目管理', - noCache: true - } + meta: { title: '维修项目管理', noCache: true } }, { path: '/additionitem/additionitem', component: () => import('@/views/basicinformation/additionitem/additionitem.vue'), name: 'AdditionItem', - meta: { - title: '附加项目管理', - noCache: true - } + meta: { title: '附加项目管理', noCache: true } }, { path: '/setmeal/setmeal', component: () => import('@/views/basicinformation/setmeal/setmeal.vue'), name: 'Setmeal', - meta: { - title: '套餐管理', - noCache: true - } + meta: { title: '套餐管理', noCache: true } }, { path: '/profession/profession', component: () => import('@/views/basicinformation/profession/profession.vue'), name: 'Profession', - meta: { - title: '工种管理', - noCache: true - } + meta: { title: '工种管理', noCache: true } }, { path: '/subjects/subjects', component: () => import('@/views/basicinformation/subjects/subjects.vue'), name: 'Subjects', - meta: { - title: '科目管理', - noCache: true - } + meta: { title: '科目管理', noCache: true } }, { path: '/team/team', component: () => import('@/views/basicinformation/team/team.vue'), name: 'Team', - meta: { - title: '班组管理', - noCache: true - } + meta: { title: '班组管理', noCache: true } }, { path: '/suppliertype/suppliertype', component: () => import('@/views/basicinformation/suppliertype/suppliertype.vue'), name: 'SupplierType', - meta: { - title: '供应商类型管理', - noCache: true - } + meta: { title: '供应商类型管理', noCache: true } }, { path: '/supplier/supplier', @@ -533,7 +419,7 @@ export const constantRoutes = [{ meta: { title: '供应商管理', noCache: true } } ] - }, + } // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ]