diff --git a/src/api/model/orders.js b/src/api/model/orders.js index f63a3a4..b1ee77a 100644 --- a/src/api/model/orders.js +++ b/src/api/model/orders.js @@ -114,54 +114,23 @@ export default { } }, }, - list: { - url: `${config.API_URL}/order.list`, - name: "获取加工单列表", - get: async function (params) { - return await http.post(this.url, params); - }, + sock: { + list:{ + url: `${config.API_URL}/inventory.list`, + name: "库存列表", + get: async function (params) { + return await http.post(this.url, params); + }, + } }, - add: { - url: `${config.API_URL}/order.add`, - name: "获取加工单添加", - post: async function (params) { - return await http.post(this.url, params); - }, - }, - delete: { - url: `${config.API_URL}/order.delete`, - name: "获取加工单删除", - post: async function (params) { - return await http.post(this.url, params); - }, - }, - cancel:{ - url: `${config.API_URL}/order.cancel`, - name: "加工单撤回", - post: async function (params) { - return await http.post(this.url, params); - }, - }, - info:{ - url: `${config.API_URL}/order.info`, - name: "加工单详情", - post: async function (params) { - return await http.post(this.url, params); - }, - }, - review: { - url: `${config.API_URL}/order.review`, - name: "加工单审核", - post: async function (params) { - return await http.post(this.url, params); - }, - }, - active: { - url: `${config.API_URL}/order.active.list`, - name: "已排期工单", - get: async function (params) { - return await http.post(this.url, params); - }, + out:{ + list:{ + url: `${config.API_URL}/out.stock.list`, + name: "销售出库清单列表", + get: async function (params) { + return await http.post(this.url, params); + }, + } } } }; diff --git a/src/api/model/shipment.js b/src/api/model/shipment.js new file mode 100644 index 0000000..4b3cf6d --- /dev/null +++ b/src/api/model/shipment.js @@ -0,0 +1,14 @@ +import config from "@/config"; +import http from "@/utils/request"; + +export default { + out:{ + list:{ + url: `${config.API_URL}/out.stock.list`, + name: "销售出库清单列表", + get: async function (params) { + return await http.post(this.url, params); + }, + } + } +}; diff --git a/src/assets/icons/OrderConfirm.vue b/src/assets/icons/OrderConfirm.vue new file mode 100644 index 0000000..5ffa375 --- /dev/null +++ b/src/assets/icons/OrderConfirm.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/OrderLog.vue b/src/assets/icons/OrderLog.vue new file mode 100644 index 0000000..26f5b6c --- /dev/null +++ b/src/assets/icons/OrderLog.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/OrderSee.vue b/src/assets/icons/OrderSee.vue new file mode 100644 index 0000000..db7ae8a --- /dev/null +++ b/src/assets/icons/OrderSee.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/OrderSetup.vue b/src/assets/icons/OrderSetup.vue new file mode 100644 index 0000000..e310850 --- /dev/null +++ b/src/assets/icons/OrderSetup.vue @@ -0,0 +1,13 @@ + + + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 8306ed1..6df8b42 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -62,6 +62,10 @@ export { default as AbilityAuthorization } from './AbilityAuthorization.vue' export { default as DataAuthorization } from './DataAuthorization.vue' export { default as UserList } from './UserList.vue' export { default as ShareBtn } from './ShareBtn.vue' +export { default as OrderSee } from './OrderSee.vue' +export { default as OrderConfirm } from './OrderConfirm.vue' +export { default as OrderLog } from './OrderLog.vue' +export { default as OrderSetup } from './OrderSetup.vue' export { default as Home } from './menu/Home.vue' diff --git a/src/layout/components/tags.vue b/src/layout/components/tags.vue index 9512026..0a20905 100644 --- a/src/layout/components/tags.vue +++ b/src/layout/components/tags.vue @@ -25,7 +25,7 @@ + + diff --git a/src/views/finance/feesStatistics/index.vue b/src/views/finance/feesStatistics/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/finance/feesStatistics/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/inventory/inoutRecord/index.vue b/src/views/inventory/inoutRecord/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/inventory/inoutRecord/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/order/dataConfirm/index.vue b/src/views/order/dataConfirm/index.vue index e02f7bd..4a232b4 100644 --- a/src/views/order/dataConfirm/index.vue +++ b/src/views/order/dataConfirm/index.vue @@ -170,6 +170,7 @@ import columnSetting from '@/components/scTable/columnSetting' import emailSync from './emailSync' import config from "@/config/table"; +import {eventBus} from "@/utils/eventBus" export default { components: { @@ -397,21 +398,16 @@ export default { }, refreshDom(params){ if(params.type == 16){ - this.refreshShow = params.current == params.limit?false:true; + this.refreshShow = params.current != params.limit && params.status ==0?true:false; this.syncText = params.msg; if(params.status == 1){ - this.$message.success('您已成功同步邮件'); + this.$message.success(params.msg); this.getData(); } } }, seeEmail(){ - this.$router.push({ - path: '/order/view-mail', - query: { - id: this.emailId, - } - }) + eventBus.$emit('tagClose','/order/view-mail',{id:this.emailId}); }, async getSelectData(item) { @@ -475,9 +471,9 @@ export default { }, selectable(row){ if(row.is_confirm){ - return false; //不禁用 + return false; }else { - return true; //禁用 + return true; } }, diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue new file mode 100644 index 0000000..5e2cc40 --- /dev/null +++ b/src/views/order/inventoryList/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/order/inventoryStatistics/index.vue b/src/views/order/inventoryStatistics/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/order/inventoryStatistics/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index dc9fca2..93f46d6 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -49,12 +49,11 @@ - 查看详情 - 编辑公司 - 功能授权 - 数据授权 - 用户列表 - 删除公司 + 编辑工单 + 删除工单 + 工单详情 + 执行维修 + 工单日志 @@ -93,9 +92,9 @@ export default { exportShow:false, searchShow:false, searchList:[ - {name:'生产日期',type:'date',code:'activation_date'}, - {name:'反厂日期',type:'date',code:'activation_date'}, - {name:'处理时间',type:'date',code:'activation_date'}, + {name:'生产日期',type:'date',code:'activation_date',show:true}, + {name:'反厂日期',type:'date',code:'activation_date',show:true}, + {name:'处理时间',type:'date',code:'activation_date',show:true}, {name:'客户名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",show:false}, {name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",show:false}, {name:'工单号',type:'text',code:['mobile'],placeholder:"请输入手机号",isOpen:true,show:false}, diff --git a/src/views/reports/keepRepairReports/index.vue b/src/views/reports/keepRepairReports/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/reports/keepRepairReports/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/reports/shipmentReports/index.vue b/src/views/reports/shipmentReports/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/reports/shipmentReports/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/setting/bom/index.vue b/src/views/setting/bom/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/setting/bom/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/setting/user/view-permission.vue b/src/views/setting/user/view-permission.vue index 3c701c7..5191aad 100644 --- a/src/views/setting/user/view-permission.vue +++ b/src/views/setting/user/view-permission.vue @@ -91,27 +91,29 @@ export default { user_id:this.id } const res = await this.$API.system.user.userPermission.post(params); - this.user_roles = res.data.role; - res.data.menu.forEach(item=>{ - if(item.children){ - item.children.forEach(em=>{ - if(em.meta.data_permission){ - let check = em.meta.data_permission.filter((li)=>li.checked).length; - let ed = em.meta.data_permission.length; - em.isCheck = check>0 && check != ed?true:false; - if(ed>0){ - em.checked = check>0 && check== ed?true:false; + this.user_roles = res.data && res.data.role?res.data.role:[]; + if(res.data && res.data.menu && res.data.menu.length>0){ + res.data.menu.forEach(item=>{ + if(item.children){ + item.children.forEach(em=>{ + if(em.meta.data_permission){ + let check = em.meta.data_permission.filter((li)=>li.checked).length; + let ed = em.meta.data_permission.length; + em.isCheck = check>0 && check != ed?true:false; + if(ed>0){ + em.checked = check>0 && check== ed?true:false; + } } - } - }) - let check = item.children.filter((em)=>em.checked).length; - let isCheck = item.children.filter((em)=>em.isCheck).length; - let ed = item.children.length; - item.isCheck = (check>0 && check != ed) || (isCheck>0 && check !=ed)?true:false; - item.checked = check>0 && check== ed?true:false; - } - }) - this.list = res.data.menu; + }) + let check = item.children.filter((em)=>em.checked).length; + let isCheck = item.children.filter((em)=>em.isCheck).length; + let ed = item.children.length; + item.isCheck = (check>0 && check != ed) || (isCheck>0 && check !=ed)?true:false; + item.checked = check>0 && check== ed?true:false; + } + }) + this.list = res.data.menu; + } }, allCheckChange(){ return diff --git a/src/views/shipment/shipmentDataConfirm/index.vue b/src/views/shipment/shipmentDataConfirm/index.vue new file mode 100644 index 0000000..cf43731 --- /dev/null +++ b/src/views/shipment/shipmentDataConfirm/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/shipment/shipmentList/index.vue b/src/views/shipment/shipmentList/index.vue new file mode 100644 index 0000000..cf43731 --- /dev/null +++ b/src/views/shipment/shipmentList/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + + diff --git a/src/views/shipment/shipmentStatistics/index.vue b/src/views/shipment/shipmentStatistics/index.vue new file mode 100644 index 0000000..ef1806c --- /dev/null +++ b/src/views/shipment/shipmentStatistics/index.vue @@ -0,0 +1,290 @@ + + + + + 新增工单 + + + 批量导入 + + + 下载导入模版 + + + + + + 下载 + + + + + + + + + {{searchShow?'收起':'更多'}} + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 查看详情 + 编辑公司 + 功能授权 + 数据授权 + 用户列表 + 删除公司 + + + + + + + + + + + + + +