From 007029659434d42e119b685cb7b953a8e48fb5db Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 13 Oct 2022 09:50:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.json | 8 +- src/api/purchase/purApply.js | 72 +++++ src/main.js | 5 + src/router/index.js | 85 ++++++ src/utils/ruoyi.js | 237 +++++++++++++++ src/views/purchase/purApply.vue | 383 ++++++++++++++++++++++++ src/views/purchase/purPlan.vue | 13 + src/views/purchase/pureApplyEdit.vue | 431 +++++++++++++++++++++++++++ 8 files changed, 1230 insertions(+), 4 deletions(-) create mode 100644 src/api/purchase/purApply.js create mode 100644 src/utils/ruoyi.js create mode 100644 src/views/purchase/purApply.vue create mode 100644 src/views/purchase/purPlan.vue create mode 100644 src/views/purchase/pureApplyEdit.vue diff --git a/public/config.json b/public/config.json index 4fa0fa2..d9a83eb 100644 --- a/public/config.json +++ b/public/config.json @@ -1,7 +1,7 @@ { - "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9991/", - "BASE_URL": "http://192.168.0.109:9991", - "SERVER_IP": "http://192.168.0.109:9991", - "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", + "UDI_SYNC_SERVER_IP": "http://192.168.1.18:9991/", + "BASE_URL": "http://192.168.1.18:9991", + "SERVER_IP": "http://192.168.1.18:9991", + "WEBSOCKET_URL": "ws://192.168.1.18:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "平和县医院" } diff --git a/src/api/purchase/purApply.js b/src/api/purchase/purApply.js new file mode 100644 index 0000000..033fa4f --- /dev/null +++ b/src/api/purchase/purApply.js @@ -0,0 +1,72 @@ +import request from '@/utils/axios' +import axios from "@/utils/axios"; + +// 查询pur列表 +export function listApply(query) { + return request({ + url: '/purchase/apply/list', + method: 'get', + params: query + }) +} + +// 查询详情列表 +export function listApplyDetail(query) { + return request({ + url: '/purchase/apply/list/detail', + method: 'get', + params: query + }) +} + +// 查询pur详细 +export function getApply(id) { + return request({ + url: '/purchase/apply/' + id, + method: 'get' + }) +} + +// 新增pur +export function addApply(data) { + return request({ + url: '/purchase/apply', + method: 'post', + data: data + }) +} + +// 修改pur +export function updateApply(data) { + return request({ + url: '/purchase/apply', + method: 'put', + data: data + }) +} + +// 删除pur +export function delApply(id) { + return request({ + url: '/purchase/apply/' + id, + method: 'delete' + }) +} + +export function inserThrOrderWeb(query) { + return axios({ + url: "/purchase/apply/postOrder", + method: "post", + data: query + }); +} + + +// 删除pur +export function delApplyDetail(id) { + return request({ + url: '/purchase/apply/detail/' + id, + method: 'delete' + }) +} + diff --git a/src/main.js b/src/main.js index c8a8321..93373ea 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,11 @@ import axios from "axios"; import "../public/config.json"; import myReq from "./utils/axios"; import myReq2 from "./utils/axios2"; + +import {parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree} from "@/utils/ruoyi"; + +Vue.prototype.parseTime = parseTime +Vue.prototype.resetForm = resetForm // 注册全局组件(register global) Vue.component("icon-svg", IconSvg); Vue.use(allTools); diff --git a/src/router/index.js b/src/router/index.js index ac8ca9f..17c5fd1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -124,6 +124,13 @@ import BasicEntrutsRece from "../views/basic/BasicEntrutsRece.vue"; //同步管理 import sysUdimsDownloadData from "../views/thrsys/SysUdimsDownloadData"; + +//采购管理 + +import purApply from "../views/purchase/purApply"; +import purPlan from "../views/purchase/purPlan"; + + // Vue.use(VueRouter); const err401 = r => @@ -799,6 +806,84 @@ export const asyncRouterMap = [ ] }, + + + { + path: "/purchase", + component: Home, + redirect: "/purchase/apply", + icon: "tongyong", + name: "采购管理", + noDropdown: false, + meta: { + authRule: ["purchase"] + }, + children: [ + + { + path: "/apply", + component: Empty, + name: "产品申购管理", + redirect: "/apply/applyAdd", + meta: { + authRule: ["purchase/apply"] + }, + children: [ + { + path: "applyAdd", + component: purApply, + name: "新增申购单据", + meta: { + authRule: ["purchase/apply/add"] + } + }, + { + path: "applySearch", + component: purApply, + name: "申购单据查询", + meta: { + authRule: ["purchase/apply/search"] + } + }, + + ] + }, + + { + path: "/plan", + component: Empty, + name: "采购计划管理", + redirect: "/plan/planAdd", + meta: { + authRule: ["plan/planAdd"] + }, + children: [ + { + path: "planAdd", + component: purPlan, + name: "新增采购计划", + meta: { + authRule: ["purchase/plan/planAdd"] + } + }, + { + path: "planSearch", + component: purPlan, + name: "采购计划查询", + meta: { + authRule: ["purchase/plan/planSearch"] + } + }, + + ] + }, + + + + ] + }, + + { path: "/warehouse", redirect: "/warehouse/product", diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js new file mode 100644 index 0000000..b80c9ba --- /dev/null +++ b/src/utils/ruoyi.js @@ -0,0 +1,237 @@ +/** + * 通用js方法封装处理 + * Copyright (c) 2019 ruoyi + */ + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange[0]; + search.params['endTime'] = dateRange[1]; + } else { + search.params['begin' + propName] = dateRange[0]; + search.params['end' + propName] = dateRange[1]; + } + return search; +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + if (value === undefined) { + return ""; + } + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label); + return true; + } + }) + if (actions.length === 0) { + actions.push(value); + } + return actions.join(''); +} + +// 回显数据字典(字符串数组) +export function selectDictLabels(datas, value, separator) { + if (value === undefined) { + return ""; + } + var actions = []; + var currentSeparator = undefined === separator ? "," : separator; + var temp = value.split(currentSeparator); + Object.keys(value.split(currentSeparator)).some((val) => { + var match = false; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + temp[val])) { + actions.push(datas[key].label + currentSeparator); + match = true; + } + }) + if (!match) { + actions.push(temp[val] + currentSeparator); + } + }) + return actions.join('').substring(0, actions.join('').length - 1); +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; +} + +// 转换字符串,undefined,null等转化为"" +export function parseStrEmpty(str) { + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; +} + +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]); + } else { + source[p] = target[p]; + } + } catch (e) { + source[p] = target[p]; + } + } + return source; +}; + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ +export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + + return tree; +} + +/** + * 参数处理 + * @param {*} params 参数 + */ +export function tansParams(params) { + let result = '' + for (const propName of Object.keys(params)) { + const value = params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && value !== "" && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + result += subPart + encodeURIComponent(value[key]) + "&"; + } + } + } else { + result += part + encodeURIComponent(value) + "&"; + } + } + } + return result +} + +// 验证是否为blob格式 +export async function blobValidate(data) { + try { + const text = await data.text(); + JSON.parse(text); + return false; + } catch (error) { + return true; + } +} diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue new file mode 100644 index 0000000..eb68fa3 --- /dev/null +++ b/src/views/purchase/purApply.vue @@ -0,0 +1,383 @@ + + + + diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue new file mode 100644 index 0000000..01676bd --- /dev/null +++ b/src/views/purchase/purPlan.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/views/purchase/pureApplyEdit.vue b/src/views/purchase/pureApplyEdit.vue new file mode 100644 index 0000000..227d759 --- /dev/null +++ b/src/views/purchase/pureApplyEdit.vue @@ -0,0 +1,431 @@ + + + + + + +