diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 4be51b10..d6df2e3d 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -88,6 +88,10 @@ module.exports = { limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } + }, + { + test: /\.txt$/, + use: 'raw-loader' } ] }, diff --git a/config/index.js b/config/index.js index 7609b831..6427159f 100644 --- a/config/index.js +++ b/config/index.js @@ -7,8 +7,8 @@ const os = require('os') const networkInterfaces = os.networkInterfaces() -const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address -// const ip = '127.0.0.1' +// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address +const ip = '127.0.0.1' module.exports = { dev: { // Paths diff --git a/dist.zip b/dist.zip deleted file mode 100644 index b150b81d..00000000 Binary files a/dist.zip and /dev/null differ diff --git a/favicon.ico b/favicon.ico index 8ec6528d..790c0575 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/index.html b/index.html index 0af1515e..5ff6939e 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,11 @@ - 高精工业互联网平台 + 景耀工业互联网平台 + + + + diff --git a/package.json b/package.json index f82fa40f..1ab9dbc4 100644 --- a/package.json +++ b/package.json @@ -15,22 +15,29 @@ "dependencies": { "@xkeshi/vue-barcode": "^1.0.0", "axios": "0.18.0", + "docxtemplater": "^3.19.7", "echarts": "^4.2.0-rc.2", - "element-ui": "2.8.2", + "element-ui": "^2.13.0", "file-saver": "^1.3.8", "html2canvas": "^1.0.0-alpha.12", - "jquery": "^3.3.1", + "jquery": "^3.5.1", "js-cookie": "2.2.0", "jspdf": "^1.5.2", - "node-sass": "^4.10.0", + "jszip-utils": "^0.1.0", + "node-sass": "^6.0.1", "normalize.css": "7.0.0", + "npm": "^7.20.5", "nprogress": "0.2.0", "qrcode": "^1.3.2", + "stylus": "0.52.4", + "stylus-loader": "^3.0.1", + "three-freeform-controls": "^0.1.12", "time-formater": "^1.0.3", "v-viewer": "^1.3.1", "vue": "2.5.17", "vue-count-to": "^1.0.13", "vue-direction-key": "^1.0.5", + "vue-i18n": "^8.26.8", "vue-router": "^3.0.7", "vuex": "3.0.1", "xlsx": "^0.14.0", @@ -66,6 +73,7 @@ "postcss-import": "12.0.0", "postcss-loader": "2.1.6", "postcss-url": "7.3.2", + "raw-loader": "^4.0.2", "rimraf": "2.6.2", "sass-loader": "7.0.3", "script-ext-html-webpack-plugin": "2.0.1", diff --git a/src/api/ManufacturingCenter/EquipmentMonitoringNew.js b/src/api/BasicData/EquipmentMonitoringNew.js similarity index 97% rename from src/api/ManufacturingCenter/EquipmentMonitoringNew.js rename to src/api/BasicData/EquipmentMonitoringNew.js index 8ba0a6c7..8654c1e4 100644 --- a/src/api/ManufacturingCenter/EquipmentMonitoringNew.js +++ b/src/api/BasicData/EquipmentMonitoringNew.js @@ -37,7 +37,7 @@ export function getData3(num, num1, num2) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理_设备运行情况_查询数据_状态分布图', + name: '车间生产管理_设备运行情况_查询数据_状态分布图_新', param: '工位号=' + num + '&开始时间=' + num1 + '&结束时间=' + num2 } }) diff --git a/src/api/BasicData/MenuManagement.js b/src/api/BasicData/MenuManagement.js index 31ec416b..a9fe02e8 100644 --- a/src/api/BasicData/MenuManagement.js +++ b/src/api/BasicData/MenuManagement.js @@ -24,7 +24,7 @@ export function getModule(role) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '3', - name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${role} order by 模块顺序` + name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${role} order by 角色模块顺序` } }) } @@ -68,6 +68,62 @@ export function returnModule(id, num) { } }) } +// 上移模块 +export function upModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_上移数据`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 上移模块验证 +export function searchUpModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `菜单管理_角色模块_上移数据_验证`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 下移模块 +export function downModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_下移数据`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 下移模块验证 +export function searchDownModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `菜单管理_角色模块_下移数据_验证`, + param: `id=${id}&角色编号=${num}` + } + }) +} // 分配一级模块 export function giveFirstLevel(idGroup, num) { return request({ diff --git a/src/api/BasicData/PartsNumberMaintenance.js b/src/api/BasicData/PartsNumberMaintenance.js index e9a0bb44..d3e09877 100644 --- a/src/api/BasicData/PartsNumberMaintenance.js +++ b/src/api/BasicData/PartsNumberMaintenance.js @@ -41,7 +41,7 @@ export function groupSelect(machineValue) { } }) } -export function searchTable5(machineCheck, machine, groupCheck, group) { +export function searchTable5(machineCheck, machine, groupCheck, group, part_check, part) { return request({ url: '', method: 'post', @@ -50,11 +50,11 @@ export function searchTable5(machineCheck, machine, groupCheck, group) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_临时表数据查询', - param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}&物料名称_check=${part_check}&物料名称=${part}` } }) } -export function searchTable6(machineCheck, machine, groupCheck, group) { +export function searchTable6(machineCheck, machine, groupCheck, group, part_check, part) { return request({ url: '', method: 'post', @@ -63,7 +63,7 @@ export function searchTable6(machineCheck, machine, groupCheck, group) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_基本件_临时表数据查询', - param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}&零件图号_check=${part_check}&零件图号=${part}` } }) } @@ -80,7 +80,7 @@ export function basicPartsData(machine_check, machine, group_check, group, part_ } }) } -export function purchasePartsData(num, part_check, part) { +export function purchasePartsData(machine_check, machine, group_check, num, part_check, part) { return request({ url: '', method: 'post', @@ -89,7 +89,7 @@ export function purchasePartsData(num, part_check, part) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_标准件和外购件_查询数据_数量维护', - param: `组件流水号=${num}&物料名称_check=${part_check}&物料名称=${part}` + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${num}&物料名称_check=${part_check}&物料名称=${part}` } }) } @@ -197,7 +197,7 @@ export function alldeleteWB(num) { } }) } -export function editPurchaseData(num, num1) { +export function editPurchaseData(num, num1, people) { return request({ url: '', method: 'post', @@ -206,11 +206,11 @@ export function editPurchaseData(num, num1) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_标准件和外购件_修改数据', - param: '标准件和外购件流水号=' + num + '&零件数量=' + num1 + param: '标准件和外购件流水号=' + num + '&零件数量=' + num1 + '&修改人员=' + people } }) } -export function editBasicParts(num, num1, num2, num3, num4) { +export function editBasicParts(num, num1, num2, num3, num4, people) { return request({ url: '', method: 'post', @@ -219,7 +219,20 @@ export function editBasicParts(num, num1, num2, num3, num4) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_基本件_编辑数据', - param: '基本件流水号=' + num + '&零件数量=' + num1 + '&零件名称=' + num2 + '&零件图号=' + num3 + '&材料=' + num4 + param: '基本件流水号=' + num + '&零件数量=' + num1 + '&零件名称=' + num2 + '&零件图号=' + num3 + '&材料=' + num4 + '&修改人员=' + people + } + }) +} +export function isExitBasicParts(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_基本件_编辑数据_验证图号', + param: '基本件流水号=' + num + '&零件图号=' + num1 } }) } @@ -369,3 +382,17 @@ export function materialChange(num1, num2, num3, num4, person) { } }) } +// 修改组件数量 +export function editgroupNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_组件流水号_组件数量_修改数据', + param: '组件流水号=' + num + '&数量=' + num1 + } + }) +} diff --git a/src/api/BasicData/ProjectManagementDisplay.js b/src/api/BasicData/ProjectManagementDisplay.js new file mode 100644 index 00000000..6ec9b3ff --- /dev/null +++ b/src/api/BasicData/ProjectManagementDisplay.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 项目 +export function getProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示_初始化', + param: '项目流水号_check=0=int&项目流水号=0' + } + }) +} +// 机床 +export function getToolNum(check, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示_初始化', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +export function searchTable(check, num, check1, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床流水号_check=' + check1 + '=int&机床流水号=' + num1 + } + }) +} +export function upData(num, show) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_项目名称_查询数据_是否显示_更改状态', + param: '机床流水号=' + num + '&是否显示=' + show + } + }) +} diff --git a/src/api/ManufacturingCenter/MonthEndHourAccounting.js b/src/api/ManufacturingCenter/MonthEndHourAccounting.js deleted file mode 100644 index b66afd92..00000000 --- a/src/api/ManufacturingCenter/MonthEndHourAccounting.js +++ /dev/null @@ -1,18 +0,0 @@ -import request from '@/utils/request' -import state from '@/store' -import router from '@/router' - -export function searchTable(num, time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '工艺月底工时核算_查询数据_最新', - param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber, - Pagination: pageCurrent + '&' + pageSize - } - }) -} diff --git a/src/api/ManufacturingCenter/ProductionPlanQuery.js b/src/api/ManufacturingCenter/ProductionPlanQuery.js deleted file mode 100644 index 168c1295..00000000 --- a/src/api/ManufacturingCenter/ProductionPlanQuery.js +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/utils/request' -import state from '@/store' -import router from '@/router' - -// 获取机床 -export function searchMachine() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_项目名称_查询数据' - } - }) -} -// 查询以投产零件 -export function searchtable() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间生产管理工艺_生产计划_查询零件', - param: `机床流水号_check=${arguments[0]}&机床流水号=${arguments[1]}&零件图号_check=${arguments[2]}&零件图号=${arguments[3]}&投产时间_check=${arguments[4]}&开始时间=${arguments[5]}&结束时间=${arguments[6]}&加急_check=${arguments[7]}`, - pagination: arguments[8] + '&' + arguments[9] - } - }) -} -export function repulse(num) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '车间生产管理工艺_生产计划_打回零件', - param: `工艺计划流水号=${num}` - } - }) -} diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js deleted file mode 100644 index 940bef99..00000000 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ /dev/null @@ -1,90 +0,0 @@ -import request from '@/utils/request' -import state from '@/store' -import router from '@/router' - -// 初始化机床项目 -export function initMachineProject() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_项目名称_查询数据' - } - }) -} -// 组件查询 -export function searchgroup(num) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_组件名称_查询数据', - param: '机床流水号=' + num - } - }) -} -// 查询表1标准件和外购件 -export function searchTable1(...params) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[18]}&排序名称=${params[19]}&PageCount=1=int=output&ItemCount=1=int=output` - // Pagination: params[4] + '&' + params[5] - } - }) -} -// 查询表1基本件 -export function searchTable2(...params) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[17]}&排序名称=${params[18]}&PageCount=1=int=output&ItemCount=1=int=output` - // Pagination: params[4] + '&' + params[5] - } - }) -} -// 查询表1标准件和外购件无分页 -export function searchTable1Export(...params) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购部采购_查询物料_分配后_加供应商', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}&时间_check=${params[5]}&开始时间=${params[6]}&结束时间=${params[7]}` - } - }) -} -// 查询表1基本件无分页 -export function searchTable2Export(...params) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&时间_check=${params[4]}&开始时间=${params[5]}&结束时间=${params[6]}` - } - }) -} - diff --git a/src/api/SalesManagement/ContractSearch.js b/src/api/SalesManagement/ContractSearch.js new file mode 100644 index 00000000..8d10cc29 --- /dev/null +++ b/src/api/SalesManagement/ContractSearch.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化客户信息 +export function getCustomer() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_客户信息_查询数据' + } + }) +} +// 合同信息 +export function searchContract(customerNameValue_check, customerNameValue, dateRange_check, startTime, endTime, contractStateValue_check, contractStateValue, orderName, order, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_全部_查询数据', + param: '客户流水号_check=' + customerNameValue_check + '&客户流水号=' + customerNameValue + '&时间_check=' + dateRange_check + '&开始时间=' + startTime + '&结束时间=' + endTime + '&合同状态_check=' + contractStateValue_check + '&合同状态=' + contractStateValue + '&排序名称=' + orderName + '&排序方式=' + order, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/SalesManagement/SalesContract.js b/src/api/SalesManagement/SalesContract.js new file mode 100644 index 00000000..67c74f80 --- /dev/null +++ b/src/api/SalesManagement/SalesContract.js @@ -0,0 +1,195 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化客户信息 +export function getCustomer() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_客户信息_查询数据' + } + }) +} +// 合同编号 +export function searchContract() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 付款方式 +export function getPaymentMethod() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_付款方式_查询数据' + } + }) +} +// 人员信息 +export function searchPeople() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人员名单_查询数据' + } + }) +} +// 创建合同 +export function createContract(contractType, role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_项目名称_增加数据', + param: '合同类型=' + contractType + '&操作者=' + role + } + }) +} +// 合同详情 +export function selectContract(contractValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_详情_查询数据', + param: '项目流水号=' + contractValue + } + }) +} +// 编辑合同 +export function editContract(contractValue, customerNameValue, signingDate, paymentMethodValue, taxRate, deliveryDate, customerRequirements, contractRemarks, role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_项目名称_编辑数据', + param: '项目流水号=' + contractValue + '&操作者=' + role + '&客户流水号=' + customerNameValue + '&签订日期=' + signingDate + '&付款方式流水号=' + paymentMethodValue + '&税率=' + taxRate + '&交货日期=' + deliveryDate + '&客户要求=' + customerRequirements + '&合同备注=' + contractRemarks + } + }) +} +// 组件信息 +export function searchProduct(contractValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + contractValue + } + }) +} +// 增加组件信息 +export function createProduct(contractValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_组件名称_增加数据', + param: '机床流水号=' + contractValue + } + }) +} +// 编辑组件信息 +export function editProduct(productValue, productName, details, Company, number, unitPrice, value) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_组件名称_编辑数据', + param: '组件流水号=' + productValue + '&产品名称=' + productName + '&产品详情=' + details + '&单位=' + Company + '&数量=' + number + '&单价=' + unitPrice + '&产品流水号=' + value + } + }) +} +// 删除组件信息 +export function deleteProduct(productValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_组件名称_删除数据', + param: '组件流水号=' + productValue + } + }) +} +// 提交合同 +export function submitContract(contractValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_项目名称_提交数据', + param: '项目流水号=' + contractValue + } + }) +} +// 产品信息 +export function productList() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '产品信息_基础表_查询数据' + } + }) +} +// 产品详情 +export function searchProductName(productValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '产品信息_查询数据', + param: '产品流水号=' + productValue + } + }) +} diff --git a/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js b/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js deleted file mode 100644 index 5608e148..00000000 --- a/src/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js +++ /dev/null @@ -1,19 +0,0 @@ -import request from '@/utils/request' -import state from '@/store' -import router from '@/router' - -// 初始化合同 -export function searchdata(check1, partDrawing, check2, daterange0, daterange1, partName, order, pageCurrent, pageSize) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '车间管理_车间采购_采购件查询', - param: `零件图号_check=${check1}&零件图号=${partDrawing}&时间段_check=${check2}&开始时间=${daterange0}&结束时间=${daterange1}&排序名称=${partName}&排序方式=${order}`, - Pagination: pageCurrent + '&' + pageSize - } - }) -} diff --git a/src/assets/img/CompanyIcon.png b/src/assets/img/CompanyIcon.png new file mode 100644 index 00000000..1c323f7d Binary files /dev/null and b/src/assets/img/CompanyIcon.png differ diff --git a/src/assets/img/CompanyQRCode.jpg b/src/assets/img/CompanyQRCode.jpg new file mode 100644 index 00000000..527bf7a9 Binary files /dev/null and b/src/assets/img/CompanyQRCode.jpg differ diff --git a/src/assets/img/JYLogo.png b/src/assets/img/JYLogo.png new file mode 100644 index 00000000..15865b53 Binary files /dev/null and b/src/assets/img/JYLogo.png differ diff --git a/src/assets/img/JYuser.png b/src/assets/img/JYuser.png new file mode 100644 index 00000000..790c0575 Binary files /dev/null and b/src/assets/img/JYuser.png differ diff --git a/src/assets/img/StationLayoutNew.jpg b/src/assets/img/StationLayoutNew.jpg new file mode 100644 index 00000000..adba71ab Binary files /dev/null and b/src/assets/img/StationLayoutNew.jpg differ diff --git a/src/assets/img/StationLayoutNew1.jpg b/src/assets/img/StationLayoutNew1.jpg new file mode 100644 index 00000000..b01be627 Binary files /dev/null and b/src/assets/img/StationLayoutNew1.jpg differ diff --git a/src/api/Assembly/AssemblyExecution.js b/src/assets/img/api/Assembly/AssemblyExecution.js similarity index 100% rename from src/api/Assembly/AssemblyExecution.js rename to src/assets/img/api/Assembly/AssemblyExecution.js diff --git a/src/api/Assembly/AssemblyInformationInput.js b/src/assets/img/api/Assembly/AssemblyInformationInput.js similarity index 100% rename from src/api/Assembly/AssemblyInformationInput.js rename to src/assets/img/api/Assembly/AssemblyInformationInput.js diff --git a/src/api/Assembly/AssemblyMes.js b/src/assets/img/api/Assembly/AssemblyMes.js similarity index 65% rename from src/api/Assembly/AssemblyMes.js rename to src/assets/img/api/Assembly/AssemblyMes.js index 92173f17..7b806f80 100644 --- a/src/api/Assembly/AssemblyMes.js +++ b/src/assets/img/api/Assembly/AssemblyMes.js @@ -14,6 +14,19 @@ export function initProject() { } }) } +export function initProjectNew(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} export function searchTable(check, machineNumberValue, check1, startTime, endTime, check2, stateValue, check3, workerValue) { return request({ url: '', @@ -27,6 +40,19 @@ export function searchTable(check, machineNumberValue, check1, startTime, endTim } }) } +export function searchTableALL(check, machineNumberValue, check1, startTime, endTime, check2, stateValue, check3, workerValue, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_装配任务_MES_查询数据_全部', + param: '机床流水号_check=' + check + '&机床流水号=' + machineNumberValue + '&时间段_check=' + check1 + '&开始时间=' + startTime + '&结束时间=' + endTime + '&状态_check=' + check2 + '&状态=' + stateValue + '&人员_check=' + check3 + '&人员=' + workerValue + '&角色编号=' + role + '&人员编号=' + personnel + } + }) +} // 获取分配后装配人员 export function searchName(num) { return request({ @@ -103,3 +129,25 @@ export function searchReworkMX(num) { } }) } +export function searchProcess(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_装配工艺_查询', + param: '计划流水号=' + num + } + }) +} +export function submitRemark(num, remark) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_装配工艺_备注编辑', + param: '计划流水号=' + num + '&备注=' + remark + } + }) +} diff --git a/src/api/Assembly/AssemblyPlan.js b/src/assets/img/api/Assembly/AssemblyPlan.js similarity index 100% rename from src/api/Assembly/AssemblyPlan.js rename to src/assets/img/api/Assembly/AssemblyPlan.js diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/assets/img/api/Assembly/AssemblyProcessAssignment.js similarity index 100% rename from src/api/Assembly/AssemblyProcessAssignment.js rename to src/assets/img/api/Assembly/AssemblyProcessAssignment.js diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/assets/img/api/Assembly/AssemblyProcessPlanning.js similarity index 100% rename from src/api/Assembly/AssemblyProcessPlanning.js rename to src/assets/img/api/Assembly/AssemblyProcessPlanning.js diff --git a/src/api/Assembly/AssemblyQualityInspection.js b/src/assets/img/api/Assembly/AssemblyQualityInspection.js similarity index 100% rename from src/api/Assembly/AssemblyQualityInspection.js rename to src/assets/img/api/Assembly/AssemblyQualityInspection.js diff --git a/src/api/Assembly/AssemblyQuotaSetting.js b/src/assets/img/api/Assembly/AssemblyQuotaSetting.js similarity index 100% rename from src/api/Assembly/AssemblyQuotaSetting.js rename to src/assets/img/api/Assembly/AssemblyQuotaSetting.js diff --git a/src/api/Assembly/AssemblyTaskAssignment.js b/src/assets/img/api/Assembly/AssemblyTaskAssignment.js similarity index 81% rename from src/api/Assembly/AssemblyTaskAssignment.js rename to src/assets/img/api/Assembly/AssemblyTaskAssignment.js index d998d7e6..b65477a6 100644 --- a/src/api/Assembly/AssemblyTaskAssignment.js +++ b/src/assets/img/api/Assembly/AssemblyTaskAssignment.js @@ -121,7 +121,7 @@ export function selectParts(check1, stepNumber, check2, num) { } }) } -export function addData(num, name, type, num1, num2) { +export function addData(num, name, type, num1, num2, process, quota) { return request({ url: '', method: 'post', @@ -130,7 +130,7 @@ export function addData(num, name, type, num1, num2) { ModularID: router.currentRoute.path, type: '2', name: '车间管理_工作计划_增加数据', - param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + '&组件流水号=' + num1 + '&组号=' + num2 + param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + '&组件流水号=' + num1 + '&组号=' + num2 + '&装配工艺=' + process + '&装配工时=' + quota } }) } @@ -143,7 +143,7 @@ export function searchPeople() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号_装配', param: '考核部门编号=11' } }) @@ -175,6 +175,19 @@ export function submitPeople(num, people) { } }) } +export function submitTime(num, time) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_装配任务_设置计划完成时间', + param: '计划流水号=' + num + '&计划完成时间=' + time + } + }) +} export function submitOutPeople(num, people) { return request({ url: '', @@ -201,3 +214,29 @@ export function submitEdit(num, num1) { } }) } +export function submitProcess(num, process, quota) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_工作计划_编辑工艺定额', + param: '计划流水号=' + num + '&装配工艺=' + process + '&装配工时=' + quota + } + }) +} +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} diff --git a/src/api/Assembly/DeliveryApplication.js b/src/assets/img/api/Assembly/DeliveryApplication.js similarity index 100% rename from src/api/Assembly/DeliveryApplication.js rename to src/assets/img/api/Assembly/DeliveryApplication.js diff --git a/src/api/Assembly/DeliveryConfirmation.js b/src/assets/img/api/Assembly/DeliveryConfirmation.js similarity index 100% rename from src/api/Assembly/DeliveryConfirmation.js rename to src/assets/img/api/Assembly/DeliveryConfirmation.js diff --git a/src/api/Assembly/ElectricalAssembly.js b/src/assets/img/api/Assembly/ElectricalAssembly.js similarity index 98% rename from src/api/Assembly/ElectricalAssembly.js rename to src/assets/img/api/Assembly/ElectricalAssembly.js index 3ac6a55c..eb9aebe5 100644 --- a/src/api/Assembly/ElectricalAssembly.js +++ b/src/assets/img/api/Assembly/ElectricalAssembly.js @@ -51,7 +51,7 @@ export function searchTable2() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间管理_工作计划_查询', + name: '电气管理_工作计划_查询', param: '机床流水号=' + arguments[0] + '&计划类型=' + arguments[1] } }) diff --git a/src/api/Assembly/InstallationAndMonitoring.js b/src/assets/img/api/Assembly/InstallationAndMonitoring.js similarity index 100% rename from src/api/Assembly/InstallationAndMonitoring.js rename to src/assets/img/api/Assembly/InstallationAndMonitoring.js diff --git a/src/api/Assembly/MakeAssemblyPlan.js b/src/assets/img/api/Assembly/MakeAssemblyPlan.js similarity index 72% rename from src/api/Assembly/MakeAssemblyPlan.js rename to src/assets/img/api/Assembly/MakeAssemblyPlan.js index 934c65b6..163ca509 100644 --- a/src/api/Assembly/MakeAssemblyPlan.js +++ b/src/assets/img/api/Assembly/MakeAssemblyPlan.js @@ -77,7 +77,7 @@ export function searchTable2(machineNumberValue, type) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间管理_工作计划_查询数据', + name: '电气管理_工作计划_查询数据', param: '机床流水号=' + machineNumberValue + '&计划类型=' + type } }) @@ -90,7 +90,7 @@ export function deletedata(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '2', - name: '车间管理_工作计划_删除数据', + name: '电气管理_工作计划_删除数据', param: '计划流水号=' + num } }) @@ -121,3 +121,44 @@ export function addData(num, type) { } }) } +// 获取装配人员 +export function searchPeople() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号_装配', + param: '考核部门编号=16' + } + }) +} +// 获取分配后装配人员 +export function searchName(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '电气管理_装配计划_装配工_查询数据', + param: '计划流水号=' + num + } + }) +} +export function submitPeople(num, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '电气装配管理_分配任务_循环执行', + param: '计划流水号=' + num + '&人员编号组=' + people + } + }) +} diff --git a/src/api/Assembly/PlanExecution.js b/src/assets/img/api/Assembly/PlanExecution.js similarity index 100% rename from src/api/Assembly/PlanExecution.js rename to src/assets/img/api/Assembly/PlanExecution.js diff --git a/src/api/Assembly/PrintingAssemblyProcessCard.js b/src/assets/img/api/Assembly/PrintingAssemblyProcessCard.js similarity index 100% rename from src/api/Assembly/PrintingAssemblyProcessCard.js rename to src/assets/img/api/Assembly/PrintingAssemblyProcessCard.js diff --git a/src/api/Assembly/QualityBasicData.js b/src/assets/img/api/Assembly/QualityBasicData.js similarity index 100% rename from src/api/Assembly/QualityBasicData.js rename to src/assets/img/api/Assembly/QualityBasicData.js diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/assets/img/api/Assembly/QualityInspectionInformationInquiry.js similarity index 74% rename from src/api/Assembly/QualityInspectionInformationInquiry.js rename to src/assets/img/api/Assembly/QualityInspectionInformationInquiry.js index c0ee14fc..28fa9134 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/assets/img/api/Assembly/QualityInspectionInformationInquiry.js @@ -180,7 +180,7 @@ export function deleterow(...param) { }) } // 质检管理_质量情况_查询数据 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, pageCurrent, pageSize) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -190,12 +190,42 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec type: '1', name: '质检管理_质量情况_查询数据', param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + - '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + '&不合格原因_check=' + check9 + '&不合格原因=' + value9 + '&处理结果_check=' + check10 + '&处理结果=' + value10 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +// 质检管理_质量情况_查询合格数量 +export function selecttableCount(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '质检管理_质量情况_查询数据_合格数', + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + '&不合格原因_check=' + check9 + '&不合格原因=' + value9 + '&处理结果_check=' + check10 + '&处理结果=' + value10 + } + }) +} +// 质检管理_质量情况_查询废品数量 +export function selecttableCount1(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '质检管理_质量情况_查询数据_废品数', + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + '&不合格原因_check=' + check9 + '&不合格原因=' + value9 + '&处理结果_check=' + check10 + '&处理结果=' + value10 } }) } // 质检管理_质量情况_查询数据 -export function selecttable22(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8) { +export function selecttable22(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10) { return request({ url: '', method: 'post', @@ -205,7 +235,7 @@ export function selecttable22(check1, value1, check2, value2, check3, value3, ch type: '1', name: '质检管理_质量情况_查询数据', param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + - '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + '&不合格原因_check=' + check9 + '&不合格原因=' + value9 + '&处理结果_check=' + check10 + '&处理结果=' + value10 } }) } diff --git a/src/api/Assembly/ShipmentApproval.js b/src/assets/img/api/Assembly/ShipmentApproval.js similarity index 100% rename from src/api/Assembly/ShipmentApproval.js rename to src/assets/img/api/Assembly/ShipmentApproval.js diff --git a/src/api/Assembly/SparePartsOutStockRecord.js b/src/assets/img/api/Assembly/SparePartsOutStockRecord.js similarity index 100% rename from src/api/Assembly/SparePartsOutStockRecord.js rename to src/assets/img/api/Assembly/SparePartsOutStockRecord.js diff --git a/src/api/Assembly/TypicalAssemblyMaintenance.js b/src/assets/img/api/Assembly/TypicalAssemblyMaintenance.js similarity index 100% rename from src/api/Assembly/TypicalAssemblyMaintenance.js rename to src/assets/img/api/Assembly/TypicalAssemblyMaintenance.js diff --git a/src/assets/img/api/BasicData/EquipmentCapabilitySetting.js b/src/assets/img/api/BasicData/EquipmentCapabilitySetting.js new file mode 100644 index 00000000..c63fb7dd --- /dev/null +++ b/src/assets/img/api/BasicData/EquipmentCapabilitySetting.js @@ -0,0 +1,75 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化获取工艺 +export function getTechnology() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_工艺名称_查询数据', + param: '工艺分类流水号_check=0' + } + }) +} +// 查询表格数据 +export function searchtable(pageCurrent, pageSize, num1, ManufacturerNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_设备加工能力_查询数据_设备维护', + param: '设备名称_check=' + num1 + '&设备名称=' + ManufacturerNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 增加 +export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备加工能力_增加数据_设备维护New', + param: '设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺编号=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition + } + }) +} +// 编辑 +export function handlechange(num, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, phNumber, Fax, Remarks, category, attention, EquipmentCondition) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备加工能力_修改数据_设备维护New', + param: '设备流水号=' + num + '&设备名称=' + ManufacturerNumber + '&设备型号=' + ManufacturerName + '&设备性能指标=' + ManufacturerAbbreviation + '&设备工时系数=' + address + '&工艺属性代码=' + phNumber + '&班次类型=' + Fax + '&设备加工能力工时=' + Remarks + '&整改工时系数=' + category + '&设备编号=' + attention + '&预留工时系数=' + EquipmentCondition + } + }) +} +// 删除 +export function handledelete(CoManufacturerFlowNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备加工能力_删除数据_设备维护', + param: '设备流水号=' + CoManufacturerFlowNumber + } + }) +} diff --git a/src/assets/img/api/BasicData/FactoryCalendar.js b/src/assets/img/api/BasicData/FactoryCalendar.js new file mode 100644 index 00000000..7bbe3834 --- /dev/null +++ b/src/assets/img/api/BasicData/FactoryCalendar.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' +// 初始化日历 +export function initClendar(year, month) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_工作日历_获得状态', + param: '工作年=' + year + '&工作月=' + month + } + }) +} +// 修改工作状态 +export function changeState(time, code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工作日历_设置状态', + param: '工作日期=' + time + '&工作日状态=' + code + } + }) +} diff --git a/src/assets/img/api/BasicData/Materialmaintenance.js b/src/assets/img/api/BasicData/Materialmaintenance.js new file mode 100644 index 00000000..f123e14c --- /dev/null +++ b/src/assets/img/api/BasicData/Materialmaintenance.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function featchMaterial(num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_材质表_查询数据_根据材料名称', + param: '材料名称=' + num1, + pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addMaterial(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_材质表_增加数据', + param: '材料=' + num1 + } + }) +} +export function delMaterial(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_材质表_删除数据', + param: '材料流水号=' + num1 + } + }) +} +export function editMaterial(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_材质表_修改数据', + param: '材料流水号=' + num1 + '=int&材料=' + num2 + } + }) +} diff --git a/src/assets/img/api/BasicData/MenuManagement.js b/src/assets/img/api/BasicData/MenuManagement.js new file mode 100644 index 00000000..a9fe02e8 --- /dev/null +++ b/src/assets/img/api/BasicData/MenuManagement.js @@ -0,0 +1,199 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化角色 +export function getRole() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色_查询数据_new' + } + }) +} +// 根据角色查模块 +export function getModule(role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: `select * from 基础表_角色模块信息 inner join 基础表_模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id where 角色编号=${role} order by 角色模块顺序` + } + }) +} +// 初始化一级菜单 +export function initFisrtLevel() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: `select id,title from 基础表_模块信息 where [path] = '/'` + } + }) +} +// 初始化二级菜单 +export function initSecondLevel() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: `select id,title from 基础表_模块信息 where [path] <> '/'` + } + }) +} +// 撤回分配模块 +export function returnModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_删除数据`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 上移模块 +export function upModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_上移数据`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 上移模块验证 +export function searchUpModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `菜单管理_角色模块_上移数据_验证`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 下移模块 +export function downModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_下移数据`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 下移模块验证 +export function searchDownModule(id, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `菜单管理_角色模块_下移数据_验证`, + param: `id=${id}&角色编号=${num}` + } + }) +} +// 分配一级模块 +export function giveFirstLevel(idGroup, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_一级_增加数据`, + param: `一级模块id组=${idGroup}&角色编号=${num}` + } + }) +} +// 分配一级模块 +export function giveSecondLevel(idGroup, num, pid) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_角色模块_二级_增加数据`, + param: `二级模块id组=${idGroup}&角色编号=${num}&pid=${pid}` + } + }) +} +// 新增一级菜单 +export function submitAdd(name) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `菜单管理_模块_一级_增加数据`, + param: `模块名称=${name}` + } + }) +} +// 查询二级模块分给那些角色 +export function getRoleTitle() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: ` select distinct title from + 基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id + inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号 + order by title` + } + }) +} +export function getRoleNameasd(name) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '3', + name: ` select distinct 角色功能 from + 基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id + inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号 + where title=\'${name}\'` + } + }) +} diff --git a/src/assets/img/api/BasicData/PartsNumberMaintenance.js b/src/assets/img/api/BasicData/PartsNumberMaintenance.js new file mode 100644 index 00000000..d3e09877 --- /dev/null +++ b/src/assets/img/api/BasicData/PartsNumberMaintenance.js @@ -0,0 +1,398 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function projectSelect() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} + +export function machineSelect() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} + +export function groupSelect(machineValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_组件流水号_查询数据_根据机床', + param: `机床流水号=${machineValue}` + } + }) +} +export function searchTable5(machineCheck, machine, groupCheck, group, part_check, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_外购件和标准件_临时表数据查询', + param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}&物料名称_check=${part_check}&物料名称=${part}` + } + }) +} +export function searchTable6(machineCheck, machine, groupCheck, group, part_check, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_基本件_临时表数据查询', + param: `机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}&零件图号_check=${part_check}&零件图号=${part}` + } + }) +} +export function basicPartsData(machine_check, machine, group_check, group, part_check, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_基本件_查询数据_综合gj_数量维护', + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&零件图号_check=${part_check}&零件图号=${part}` + } + }) +} +export function purchasePartsData(machine_check, machine, group_check, num, part_check, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_标准件和外购件_查询数据_数量维护', + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${num}&物料名称_check=${part_check}&物料名称=${part}` + } + }) +} +export function deleteBasicParts(basicNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_基本件_删除数据', + param: `基本件流水号=${basicNum}` + } + }) +} +export function alldelete(basicNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_基本件_删除数据_根据组件流水号', + param: `基本件流水号组=${basicNum}` + } + }) +} +export function deleteBasicParts5(basicNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_外购件和标准件_临时表_删除', + param: `id=${basicNum}` + } + }) +} +export function alldeleteBasicParts5(machine, group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_外购件和标准件_临时表_全部删除', + param: `机床=${machine}&组号=${group}` + } + }) +} +export function deleteBasicParts6(basicNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_基本件_临时表_删除', + param: `id=${basicNum}` + } + }) +} +export function alldeleteBasicParts6(machine, group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_基本件_临时表_全部删除', + param: `机床=${machine}&组号=${group}` + } + }) +} +export function deletePurchaseData(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_标准件和外购件_删除数据', + param: '标准件和外购件流水号=' + num + '=int' + } + }) +} +export function alldeleteWB(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_标准件和外购件_删除数据_根据组件流水号', + param: '标准件和外购件流水号组=' + num + } + }) +} +export function editPurchaseData(num, num1, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_标准件和外购件_修改数据', + param: '标准件和外购件流水号=' + num + '&零件数量=' + num1 + '&修改人员=' + people + } + }) +} +export function editBasicParts(num, num1, num2, num3, num4, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_基本件_编辑数据', + param: '基本件流水号=' + num + '&零件数量=' + num1 + '&零件名称=' + num2 + '&零件图号=' + num3 + '&材料=' + num4 + '&修改人员=' + people + } + }) +} +export function isExitBasicParts(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_零件明细表_基本件_编辑数据_验证图号', + param: '基本件流水号=' + num + '&零件图号=' + num1 + } + }) +} +export function getTable(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_零件工艺计划_已投产_按组查', + param: '组件流水号=' + num + '=int' + } + }) +} +export function editProductNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'MRP_计划订单_组件零件清单_基本件_编辑数据', + param: '组件零件基本件流水号=' + num + '&数量=' + num1 + } + }) +} +export function getTable1(num, a, b, c, d, e, f, g) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_新排产算法_能力平衡_查询数据_要平衡的零件_数量维护', + param: '机床流水号_check=' + b + '=string&机床流水号=' + c + '=int&组件流水号_check=' + d + '=string&组件流水号=' + e + '=int&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=1=int&考核状态=5=int' + } + }) +} +export function editProduceNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_零件工艺计划_修改数据', + param: '工艺计划流水号=' + num + '&零件数量=' + num1 + } + }) +} +// 查询表1标准件和外购件 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_数量维护', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料状态=1` + } + }) +} +// 查询表1基本件 +export function searchTable2(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_数量维护', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料状态=1` + } + }) +} +export function editGroupPartNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'MRP_计划订单_组件零件清单_编辑数据', + param: '组件零件流水号=' + num + '&零件数量=' + num1 + } + }) +} +export function editGroupBasicPartNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'MRP_计划订单_组件零件清单_基本件_采购_编辑数据', + param: '组件零件基本件流水号=' + num + '&零件数量=' + num1 + } + }) +} +export function getmaterial() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '零件明细表_材料_查询' + } + }) +} +// 查询物料 +export function searchAllMaterial(check1, MaterialName, check2, MaterialSpec, check3, MaterialModel, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '库存管理_物料主文件_基本_查询数据_分页', + param: `物料名称_check=${check1}&物料名称=${MaterialName}&物料规格_check=${check2}&物料规格=${MaterialSpec}&物料型号_check=${check3}&物料型号=${MaterialModel}&PageCurrent=${pageCurrent}=int&PageSize=${pageSize}=int&PageCount=1=int=output&ItemCount=1=int=output` + } + }) +} +// 物料变更 +export function materialChange(num1, num2, num3, num4, person) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_采购物料修改_零件数量维护_修改数据', + param: `组件零件流水号=${num1}&标准件和外购件流水号=${num2}&原物料流水号=${num3}&新物料流水号=${num4}&申请人=${person}` + } + }) +} +// 修改组件数量 +export function editgroupNum(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_零件明细表_组件流水号_组件数量_修改数据', + param: '组件流水号=' + num + '&数量=' + num1 + } + }) +} diff --git a/src/assets/img/api/BasicData/PersonnelManagement.js b/src/assets/img/api/BasicData/PersonnelManagement.js new file mode 100644 index 00000000..4c438ac3 --- /dev/null +++ b/src/assets/img/api/BasicData/PersonnelManagement.js @@ -0,0 +1,430 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' +export function getTree() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0=int' + } + }) +} +export function tree(data, pid) { + const result = [] + let temp + for (let i = 0; i < data.length; i++) { + if (data[i].父节点 === pid) { + const obj = { label: data[i].节点名称, id: data[i].子节点 } + temp = tree(data, data[i].子节点) + if (temp.length > 0) { + obj.children = temp + } + result.push(obj) + } + } + return result +} +export function getTablePeople(code, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + code + '=int', + pagination: pageCurrent + '&' + pageSize + } + }) +} +export function getTablePeopleForName(name) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_人员名单_查询数据_根据姓名_MESWORK', + param: '姓名=' + name + '=string' + } + }) +} +// 新增部门 +export function addDepartmentName(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_部门关系_增加节点', + param: '父节点=' + num1 + '=int&节点名称=' + num2 + '=string&子节点=' + num3 + } + }) +} +// 删除部门 +export function delList(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_部门关系_删除节点', + param: '子节点=' + num1 + '=int' + } + }) +} +// 编辑部门 +export function editList(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_部门关系_修改节点', + param: '子节点=' + num1 + '=int&节点名称=' + num2 + '=string' + } + }) +} +export function delPeopleList(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_人员名单_删除数据_MESWORK', + param: '人员编号=' + num1 + '=int' + } + }) +} +export function initUniversity() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_毕业院校_查询数据' + } + }) +} +export function fetchEducationData() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_学历_查询数据' + } + }) +} +export function initMajor() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_所学专业_查询数据' + } + }) +} +export function fetchForeignLanguageLevelDate() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_外语及熟练程度_查询数据' + } + }) +} +export function fetchTitleData() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_职称_查询数据' + } + }) +} +export function fetchPostData() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_人员岗位_查询数据' + } + }) +} +export function fetchPositionStatusData() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_岗位状态_查询数据' + } + }) +} +export function addPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation, TeamValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_人员名单_增加数据_MESWORK', + param: '考核部门编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string&班组=' + TeamValue + } + }) +} +export function editPeople(id, Sex, Education, Address, Nation, Post, AccountNumber, Password, Name, IDcard, TimeOfEntry, Birthday, ContactInformation, TeamValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_人员名单_修改数据_MESWORK', + param: '人员编号=' + id + '=int&性别编号=' + Sex + '=int&学历编号=' + Education + '=int&家庭住址=' + Address + '&民族=' + Nation + '&岗位编号=' + Post + '=int&考勤编号=' + AccountNumber + '=string&密码=' + Password + '=string&姓名=' + Name + '=string&身份证号=' + IDcard + '=string&入公司时间=' + TimeOfEntry + '=string&出生日期=' + Birthday + '=string&联系电话=' + ContactInformation + '=string&班组=' + TeamValue + } + }) +} +export function moveGroups(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_人员名单_移动数据_MESWORK', + param: '人员编号=' + num1 + '=int&考核部门编号=' + num2 + '=int' + } + }) +} +export function feacthUniversity(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_毕业院校_查询数据_根据学校名_MESWORK', + param: '毕业院校名称=' + num1 + '=string' + } + }) +} +export function addUniversity(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_毕业院校_增加数据', + param: '毕业院校名称=' + num1 + '=string' + } + }) +} +export function editUniversity(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_毕业院校_修改数据', + param: '毕业院校编号=' + num1 + '=int&毕业院校名称=' + num2 + '=string' + } + }) +} +export function delUniversity(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_毕业院校_删除数据', + param: '毕业院校编号=' + num1 + '=int' + } + }) +} +export function fetchMajor(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_所学专业_查询数据_根据专业名_MESWORK', + param: '专业名称=' + num1 + '=string' + } + }) +} +export function addMajor(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_所学专业_增加数据', + param: '专业名称=' + num1 + '=string' + } + }) +} +export function editMajor(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_所学专业_修改数据', + param: '专业编号=' + num1 + '=int&专业名称=' + num2 + '=string' + } + }) +} +export function delMajor(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_所学专业_删除数据', + param: '专业编号=' + num1 + '=int' + } + }) +} +export function fetchPost(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_基础表_人员岗位_查询数据_根据岗位名_MESWORK', + param: '岗位名称=' + num1 + '=string' + } + }) +} +export function addPost(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_人员岗位_增加数据', + param: '岗位名称=' + num1 + '=string' + } + }) +} +export function editPost(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_人员岗位_修改数据', + param: '岗位编号=' + num1 + '=int&岗位名称=' + num2 + '=string' + } + }) +} +export function delPost(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_基础表_人员岗位_删除数据', + param: '岗位编号=' + num1 + '=int' + } + }) +} +export function quit(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '人事档案管理_人员_离职操作', + param: '人员编号=' + num1 + '=int' + } + }) +} +export function searchLeavingList(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_人员_离职人员查询', + pagination: pageCurrent + '&' + pageSize + } + }) +} +export function fetchteamviwer() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '班组管理_班组查询' + } + }) +} diff --git a/src/assets/img/api/BasicData/ProjectManagementDisplay.js b/src/assets/img/api/BasicData/ProjectManagementDisplay.js new file mode 100644 index 00000000..6ec9b3ff --- /dev/null +++ b/src/assets/img/api/BasicData/ProjectManagementDisplay.js @@ -0,0 +1,58 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 项目 +export function getProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示_初始化', + param: '项目流水号_check=0=int&项目流水号=0' + } + }) +} +// 机床 +export function getToolNum(check, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示_初始化', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +export function searchTable(check, num, check1, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床流水号_check=' + check1 + '=int&机床流水号=' + num1 + } + }) +} +export function upData(num, show) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_项目名称_查询数据_是否显示_更改状态', + param: '机床流水号=' + num + '&是否显示=' + show + } + }) +} diff --git a/src/assets/img/api/BasicData/ShiftManagement.js b/src/assets/img/api/BasicData/ShiftManagement.js new file mode 100644 index 00000000..21381c41 --- /dev/null +++ b/src/assets/img/api/BasicData/ShiftManagement.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询班次 +export function getScheduling(SchedulingType) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_基础表_班次表_查询数据', + param: '班次类型=' + SchedulingType + } + }) +} +// 查询班次 +export function searchProgramme() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_基础表_班次表_查询班次' + } + }) +} + +// 新增班次 +export function addShift(starttime, endtime, shifttype, shiftnumber, nightwork, work, temporary, difficult, note) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_基础表_班次表_增加数据', + param: '开始工作时间=' + starttime + '&结束工作时间=' + endtime + '&班次类型=' + shifttype + '&班次代码=' + shiftnumber + '&是否夜班=' + nightwork + '&是否工作=' + work + '=int&是否可以安排临时件=' + temporary + '=int&是否可以安排高难度件=' + difficult + '=int&备注=' + note + } + }) +} +// 编辑班次 +export function editShift(shiftCode, starttime, endtime, shifttype, shiftnumber, nightwork, work, temporary, difficult, note) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_基础表_班次表_修改数据', + param: '序号=' + shiftCode + '=int&开始工作时间=' + starttime + '=datetime&结束工作时间=' + endtime + '=datetime&班次类型=' + shifttype + '=int&班次代码=' + shiftnumber + '=int&是否夜班=' + nightwork + '=int&是否工作=' + work + '=int&是否可以安排临时件=' + temporary + '=int&是否可以安排高难度件=' + difficult + '=int&备注=' + note + } + }) +} +// 删除班次 +export function deleteShift(shiftCode) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_基础表_班次表_删除数据', + param: '序号=' + shiftCode + } + }) +} +// 班次类型与工作时间增加 +export function addShiftType() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_基础表_班次表_班次类型与工作时间_增加' + } + }) +} + diff --git a/src/assets/img/api/BasicData/SystemRrolemaintenance.js b/src/assets/img/api/BasicData/SystemRrolemaintenance.js new file mode 100644 index 00000000..06ea0f60 --- /dev/null +++ b/src/assets/img/api/BasicData/SystemRrolemaintenance.js @@ -0,0 +1,69 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function InitRolefunction() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色_查询数据_MESWORK' + } + }) +} +export function deleteData(code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色_删除_MESWORK', + param: '角色编号=' + code + '=int' + } + }) +} +export function searchTable(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色_查询数据_MESWORK', + param: '角色功能=' + num + '=string' + } + }) +} +export function addData(code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色_增加_MESWORK', + param: '角色功能=' + code + '=string' + } + }) +} +export function addData2(code1, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色_修改数据_MESWORK', + param: '角色功能=' + code1 + '&角色编号=' + num1 + } + }) +} + diff --git a/src/assets/img/api/BasicData/UserRightsManagement.js b/src/assets/img/api/BasicData/UserRightsManagement.js new file mode 100644 index 00000000..f2fba4f2 --- /dev/null +++ b/src/assets/img/api/BasicData/UserRightsManagement.js @@ -0,0 +1,98 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function getRole() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色_查询数据_new' + } + }) +} + +export function getModule(role_check, role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目主模块列表_查询数据_gj', + param: `角色编号_check=${role_check}&角色编号=${role}=int` + } + }) +} +export function addModule(module, role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '菜单系统模块_项目角色模块列表_增加数据_gj', + param: `角色编号=${role}=int&主模块编号=${module}=int` + } + }) +} +export function deleteModule(module, role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '菜单系统模块_项目角色模块列表_删除数据_gj', + param: `角色编号=${role}=int&主模块编号=${module}=int` + } + }) +} + +export function getModelData(role) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目主模块列表_查询单个模块_gj', + param: `主模块编号=${role}=int` + } + }) +} + +export function addModelData(component, title, icons) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '菜单系统模块_项目主模块列表_增加单个模块_gj', + param: `父路径=/${icons}&子名称=${icons}&子组件=${component}&标题=${title}&图标=${icons}` + } + }) +} + +export function editModelData(modelNum, component, title, icons) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '菜单系统模块_项目主模块列表_修改单个模块_gj', + param: `主模块编号=${modelNum}&父路径=/${icons}&子名称=${icons}&子组件=${component}&标题=${title}&图标=${icons}` + } + }) +} diff --git a/src/assets/img/api/BasicData/WorkshopPersonnelRoleMana.js b/src/assets/img/api/BasicData/WorkshopPersonnelRoleMana.js new file mode 100644 index 00000000..16eaea68 --- /dev/null +++ b/src/assets/img/api/BasicData/WorkshopPersonnelRoleMana.js @@ -0,0 +1,176 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询项目名称 +export function dialogtablevisible() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0' + } + }) +} +export function dialogtablevisible1() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0' + } + }) +} +export function addData1(code, groupNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色员工综合_增加数据', + param: '人员编号=' + code + '=int&角色编号=' + groupNum + '=int&项目编号=10=int' + } + }) +} +export function addData2(lsh, code, groupNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色员工综合_修改数据', + param: '人员角色流水号=' + lsh + '&人员编号=' + code + '&角色编号=' + groupNum + } + }) +} +// 初始化科室 +export function initDepartment() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_部门关系_查询节点' + } + }) +} +// 初始化人员信息 弹出框 +export function getTree() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0=int' + } + }) +} +export function fn(data, pid) { + const result = [] + let temp + for (let i = 0; i < data.length; i++) { + if (data[i].父节点 === pid) { + const obj = { label: data[i].节点名称, id: data[i].子节点 } + temp = fn(data, data[i].子节点) + if (temp.length > 0) { + obj.children = temp + } + result.push(obj) + } + } + return result +} +export function getTable8(code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + code + '=int' + } + }) +} +export function handledelete(ryjslsh) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 2, + name: '菜单系统模块_项目角色员工综合_删除数据', + param: '人员角色流水号=' + ryjslsh + '=string' + } + }) +} +export function deleteData(Number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '菜单系统模块_项目角色员工综合_删除数据', + param: '人员角色流水号=' + Number + '=int' + } + }) +} +export function searchdesigner(num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + num2 + '=int' + } + }) +} +export function initOrderType() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色_查询数据_new' + } + }) +} +export function searchTable(check1, staffName, check2, systemAdministrator) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '菜单系统模块_项目角色员工综合_查询数据', + param: '姓名_check=' + check1 + '=int&姓名=' + staffName + '=string&角色编号_check=' + check2 + ' =int&角色编号=' + systemAdministrator + '=int' + } + }) +} diff --git a/src/assets/img/api/BasicData/WorkshopProcessMaintenance.js b/src/assets/img/api/BasicData/WorkshopProcessMaintenance.js new file mode 100644 index 00000000..4c6fdcf4 --- /dev/null +++ b/src/assets/img/api/BasicData/WorkshopProcessMaintenance.js @@ -0,0 +1,184 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' +// 查工艺分类名称 +export function searchProcessClassification() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据' + } + }) +} +// 增加工艺分类 +export function addProcessClassification(ProcessClassification) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_增加数据', + param: '工艺分类名称=' + ProcessClassification + } + }) +} +// 编辑工艺分类 +export function editProcessClassification(ProcessClassificationNum, ProcessClassification) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_修改数据', + param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺分类名称=' + ProcessClassification + } + }) +} +// 通过工艺编分类流水号查工艺分类名称 +export function searchProcessClassificationOfProcessClassificationNum(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_工艺分类名称_根据流水号_查询数据_MESWORK', + param: '工艺分类流水号=' + ProcessNum + } + }) +} +// 删除工艺分类 +export function delProcessClassification(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工艺分类名称_删除数据', + param: '工艺分类流水号=' + ProcessClassificationNum + } + }) +} +// 通过工艺分类流水号查工艺名称 +export function searchProcessNameOfProcessClassification(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_工艺名称_查询数据_按工艺分类流水号查_MESWORK', + param: '工艺分类流水号=' + ProcessClassificationNum + } + }) +} +// 通过工艺编号查工艺要求 +export function searchTechnologicalRequirementsOfProcessNum(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_基础表_工艺要求_查询数据', + param: '工艺编号=' + ProcessNum + } + }) +} +// 增加工艺 +export function addProcess(ProcessClassificationNum, ProcessName, ShortName) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'dbo.车间生产管理工艺_基础表_工艺名称_增加数据', + param: '工艺分类流水号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + } + }) +} +// 编辑工艺 +export function editProcess(ProcessClassificationNum, ProcessName, ShortName, Requirement) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工艺名称_修改名称及简称', + param: '工艺编号=' + ProcessClassificationNum + '&工艺名称=' + ProcessName + '&工艺名称简称=' + ShortName + '&工艺要求=' + Requirement + } + }) +} +// 删除工艺 +export function delProcess(ProcessNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_基础表_工艺名称_删除数据', + param: '工艺编号=' + ProcessNum + } + }) +} +// 新增工艺要求 +export function addTechnologicalRequirements(ProcessClassificationNum, ProcessName) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理_基础表_工艺要求_增加数据', + param: '工艺编号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName + } + }) +} +// 编辑工艺要求 +export function editTechnologicalRequirements(ProcessClassificationNum, ProcessName) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理_基础表_工艺要求_修改数据', + param: '工艺要求流水号=' + ProcessClassificationNum + '&工艺要求=' + ProcessName + } + }) +} +// 删除工艺要求 +export function delTechnologicalRequirements(ProcessClassificationNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理_基础表_工艺要求_删除数据', + param: '工艺要求流水号=' + ProcessClassificationNum + } + }) +} diff --git a/src/assets/img/api/BasicData/maintenanceEquipmentPerson.js b/src/assets/img/api/BasicData/maintenanceEquipmentPerson.js new file mode 100644 index 00000000..ee60d7e2 --- /dev/null +++ b/src/assets/img/api/BasicData/maintenanceEquipmentPerson.js @@ -0,0 +1,115 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化设备名称 +export function getEquipment(id, equipmentNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_设备名称与班次关系_查询数据', + param: `查询代码=${id}=int&设备流水号=${equipmentNum}` + } + }) +} + +export function getDepartment() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_部门查询' + } + }) +} + +export function getTablePeople(number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: `考核部门编号=${number}` + } + }) +} + +export function getTableData(equipmentCheck, equipmentNameValue, operatorCheck, operatorNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_设备名称_人员关系_查询数据', + param: `设备流水号_check=${equipmentCheck}&设备流水号=${equipmentNameValue}&操作者编号_check=${operatorCheck}&操作者编号=${operatorNumber}`, + pagination: pageCurrent + '&' + pageSize + } + }) +} + +export function deleteTable(number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备名称_人员关系_删除数据', + param: '设备人员关系流水号=' + number + '=int' + } + }) +} + +export function getStaff() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_基础表_班次表_查询班次' + } + }) +} + +export function addTable(equipmentNumber, shift, operator, operatorNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备名称_人员关系_增加数据', + param: '设备流水号=' + equipmentNumber + '=int&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int' + } + }) +} + +export function editTable(equipmentNumber, shift, operator, operatorNumber, Number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备名称_人员关系_修改数据', + param: '设备流水号=' + equipmentNumber + '=int&班次代码=' + shift + '=int&操作者=' + operator + '=string&操作者编号=' + operatorNumber + '=int&设备人员关系流水号=' + Number + '=int' + } + }) +} diff --git a/src/api/Inventory/CreatePickingList.js b/src/assets/img/api/Inventory/CreatePickingList.js similarity index 88% rename from src/api/Inventory/CreatePickingList.js rename to src/assets/img/api/Inventory/CreatePickingList.js index 6690490c..63f301a7 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/assets/img/api/Inventory/CreatePickingList.js @@ -74,7 +74,7 @@ export function searchPart(...params) { }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) { +export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2, order, partName) { return request({ url: '', method: 'post', @@ -82,8 +82,8 @@ export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间装配管理_领料单_查询数据', - param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2, + name: '车间装配管理_领料单_加排序_查询数据', + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&排序方式=' + order + '&排序名称=' + partName, Pagination: pageCurrent + '&' + pageSize } }) @@ -213,3 +213,18 @@ export function submitApproval(num, num1, num2) { } }) } +// 领料单审批查询 +export function searchListApproval(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间装配管理_领料单审批_查询数据', + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/Inventory/DirectPart.js b/src/assets/img/api/Inventory/DirectPart.js similarity index 100% rename from src/api/Inventory/DirectPart.js rename to src/assets/img/api/Inventory/DirectPart.js diff --git a/src/assets/img/api/Inventory/ErrorInformationQuery.js b/src/assets/img/api/Inventory/ErrorInformationQuery.js new file mode 100644 index 00000000..7124e5cc --- /dev/null +++ b/src/assets/img/api/Inventory/ErrorInformationQuery.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询U8导出错误信息 +export function searchError(check7, time1, time2, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `U8_错误信息查询`, + param: `时间段_check=${check7}&开始日期=${time1}&结束日期=${time2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/Inventory/ExchangeApproval.js b/src/assets/img/api/Inventory/ExchangeApproval.js similarity index 100% rename from src/api/Inventory/ExchangeApproval.js rename to src/assets/img/api/Inventory/ExchangeApproval.js diff --git a/src/api/Inventory/ExchangePart.js b/src/assets/img/api/Inventory/ExchangePart.js similarity index 100% rename from src/api/Inventory/ExchangePart.js rename to src/assets/img/api/Inventory/ExchangePart.js diff --git a/src/api/Inventory/GenneralPart.js b/src/assets/img/api/Inventory/GenneralPart.js similarity index 100% rename from src/api/Inventory/GenneralPart.js rename to src/assets/img/api/Inventory/GenneralPart.js diff --git a/src/api/Inventory/InboundCard.js b/src/assets/img/api/Inventory/InboundCard.js similarity index 100% rename from src/api/Inventory/InboundCard.js rename to src/assets/img/api/Inventory/InboundCard.js diff --git a/src/api/Inventory/Inboundscanning.js b/src/assets/img/api/Inventory/Inboundscanning.js similarity index 88% rename from src/api/Inventory/Inboundscanning.js rename to src/assets/img/api/Inventory/Inboundscanning.js index df23a931..0ac51953 100644 --- a/src/api/Inventory/Inboundscanning.js +++ b/src/assets/img/api/Inventory/Inboundscanning.js @@ -95,3 +95,17 @@ export function FinishPart(num0) { } }) } +// 获取跟单号 +export function searchNumber(part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_自制件跟单号_查询数据', + param: '零件图号=' + part + } + }) +} diff --git a/src/api/Inventory/InventoryCheck.js b/src/assets/img/api/Inventory/InventoryCheck.js similarity index 100% rename from src/api/Inventory/InventoryCheck.js rename to src/assets/img/api/Inventory/InventoryCheck.js diff --git a/src/api/Inventory/InventoryManagement.js b/src/assets/img/api/Inventory/InventoryManagement.js similarity index 100% rename from src/api/Inventory/InventoryManagement.js rename to src/assets/img/api/Inventory/InventoryManagement.js diff --git a/src/api/Inventory/MaterialOut.js b/src/assets/img/api/Inventory/MaterialOut.js similarity index 100% rename from src/api/Inventory/MaterialOut.js rename to src/assets/img/api/Inventory/MaterialOut.js diff --git a/src/api/Inventory/MaterialReturn.js b/src/assets/img/api/Inventory/MaterialReturn.js similarity index 100% rename from src/api/Inventory/MaterialReturn.js rename to src/assets/img/api/Inventory/MaterialReturn.js diff --git a/src/api/Inventory/OfflinePartOut.js b/src/assets/img/api/Inventory/OfflinePartOut.js similarity index 89% rename from src/api/Inventory/OfflinePartOut.js rename to src/assets/img/api/Inventory/OfflinePartOut.js index 9d373c56..252bc36a 100644 --- a/src/api/Inventory/OfflinePartOut.js +++ b/src/assets/img/api/Inventory/OfflinePartOut.js @@ -53,7 +53,7 @@ export function searchPart(...params) { ModularID: router.currentRoute.path, type: '1', name: '库存管理_离线外购件_出库查询', - param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`, + param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}&机床_check=${params[8]}&机床=${params[9]}`, Pagination: params[6] + '&' + params[7] } }) @@ -126,3 +126,16 @@ export function selectleaders(department) { } }) } +export function initMachine(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} diff --git a/src/api/Inventory/OfflinePurchase.js b/src/assets/img/api/Inventory/OfflinePurchase.js similarity index 100% rename from src/api/Inventory/OfflinePurchase.js rename to src/assets/img/api/Inventory/OfflinePurchase.js diff --git a/src/api/Inventory/OutPartSelect.js b/src/assets/img/api/Inventory/OutPartSelect.js similarity index 100% rename from src/api/Inventory/OutPartSelect.js rename to src/assets/img/api/Inventory/OutPartSelect.js diff --git a/src/api/Inventory/PartOut.js b/src/assets/img/api/Inventory/PartOut.js similarity index 100% rename from src/api/Inventory/PartOut.js rename to src/assets/img/api/Inventory/PartOut.js diff --git a/src/api/Inventory/PartsReplacement.js b/src/assets/img/api/Inventory/PartsReplacement.js similarity index 100% rename from src/api/Inventory/PartsReplacement.js rename to src/assets/img/api/Inventory/PartsReplacement.js diff --git a/src/api/Inventory/PickingList.js b/src/assets/img/api/Inventory/PickingList.js similarity index 100% rename from src/api/Inventory/PickingList.js rename to src/assets/img/api/Inventory/PickingList.js diff --git a/src/api/Inventory/PickingListSearch.js b/src/assets/img/api/Inventory/PickingListSearch.js similarity index 96% rename from src/api/Inventory/PickingListSearch.js rename to src/assets/img/api/Inventory/PickingListSearch.js index d03f8241..d39d3a03 100644 --- a/src/api/Inventory/PickingListSearch.js +++ b/src/assets/img/api/Inventory/PickingListSearch.js @@ -74,7 +74,7 @@ export function searchPart(...params) { }) } // 领料单查询 -export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2) { +export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, isElectrical, check1, time1, time2, order, partName) { return request({ url: '', method: 'post', @@ -82,8 +82,8 @@ export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间装配管理_领料单_查询数据', - param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2, + name: '车间装配管理_领料单_加排序_查询数据', + param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&是否电气=' + isElectrical + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&排序方式=' + order + '&排序名称=' + partName, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/assets/img/api/Inventory/PurchaseInRecord.js similarity index 80% rename from src/api/Inventory/PurchaseInRecord.js rename to src/assets/img/api/Inventory/PurchaseInRecord.js index 71c63c80..f3dc6f4f 100644 --- a/src/api/Inventory/PurchaseInRecord.js +++ b/src/assets/img/api/Inventory/PurchaseInRecord.js @@ -44,6 +44,20 @@ export function searchRecord1(check1, project, check2, machine, check3, group, c } }) } +// 查询采购件入库总数量 +export function searchRecord2(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, check8, supplierValue) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `库存管理_入库记录_采购件_查询数据_统计总数量`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&入库时间_check=${check7}&入库开始时间=${time1}&入库结束时间=${time2}` + } + }) +} // 查询供应商 export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { return request({ diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/assets/img/api/Inventory/PurchaseOutRecord.js similarity index 71% rename from src/api/Inventory/PurchaseOutRecord.js rename to src/assets/img/api/Inventory/PurchaseOutRecord.js index 7378ff3d..699a4eff 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/assets/img/api/Inventory/PurchaseOutRecord.js @@ -46,7 +46,21 @@ export function searchRecord(check1, project, check2, machine, check3, group, ch } }) } -export function submitNumber(num, num1, num2, type) { +// 查询总数量 +export function searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: `库存管理_出库记录_查询数据_统计总数量`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&出库时间_check=${check7}&出库开始时间=${time1}&出库结束时间=${time2}` + } + }) +} +export function submitNumber(num, num1, num2, type, num3) { return request({ url: '', method: 'post', @@ -55,7 +69,7 @@ export function submitNumber(num, num1, num2, type) { ModularID: router.currentRoute.path, type: '2', name: '库存管理_出库记录_编辑数据_新', - param: '零件流水号=' + num + '&数量=' + num1 + '&机床流水号=' + num2 + '&出库类型=' + type + param: '零件流水号=' + num + '&数量=' + num1 + '&机床流水号=' + num2 + '&出库类型=' + type + '&领料人=' + num3 } }) } @@ -98,3 +112,15 @@ export function initMachine() { }) } +export function selectleaders() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '出库管理_人员查询1' + } + }) +} diff --git a/src/api/Inventory/SelfMadePartsWarehouseOut.js b/src/assets/img/api/Inventory/SelfMadePartsWarehouseOut.js similarity index 100% rename from src/api/Inventory/SelfMadePartsWarehouseOut.js rename to src/assets/img/api/Inventory/SelfMadePartsWarehouseOut.js diff --git a/src/api/Inventory/StockInquiry.js b/src/assets/img/api/Inventory/StockInquiry.js similarity index 100% rename from src/api/Inventory/StockInquiry.js rename to src/assets/img/api/Inventory/StockInquiry.js diff --git a/src/api/Inventory/SubPartCome.js b/src/assets/img/api/Inventory/SubPartCome.js similarity index 100% rename from src/api/Inventory/SubPartCome.js rename to src/assets/img/api/Inventory/SubPartCome.js diff --git a/src/api/Inventory/SubstitutePart.js b/src/assets/img/api/Inventory/SubstitutePart.js similarity index 100% rename from src/api/Inventory/SubstitutePart.js rename to src/assets/img/api/Inventory/SubstitutePart.js diff --git a/src/api/ManufacturingCenter/ActualTimeSupplement.js b/src/assets/img/api/ManufacturingCenter/ActualTimeSupplement.js similarity index 100% rename from src/api/ManufacturingCenter/ActualTimeSupplement.js rename to src/assets/img/api/ManufacturingCenter/ActualTimeSupplement.js diff --git a/src/api/ManufacturingCenter/ActualWorkQuery.js b/src/assets/img/api/ManufacturingCenter/ActualWorkQuery.js similarity index 100% rename from src/api/ManufacturingCenter/ActualWorkQuery.js rename to src/assets/img/api/ManufacturingCenter/ActualWorkQuery.js diff --git a/src/api/ManufacturingCenter/AddingOrder.js b/src/assets/img/api/ManufacturingCenter/AddingOrder.js similarity index 100% rename from src/api/ManufacturingCenter/AddingOrder.js rename to src/assets/img/api/ManufacturingCenter/AddingOrder.js diff --git a/src/api/ManufacturingCenter/AntonMonitoring.js b/src/assets/img/api/ManufacturingCenter/AntonMonitoring.js similarity index 100% rename from src/api/ManufacturingCenter/AntonMonitoring.js rename to src/assets/img/api/ManufacturingCenter/AntonMonitoring.js diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/assets/img/api/ManufacturingCenter/CompletionOfWorkshopComponents.js similarity index 86% rename from src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js rename to src/assets/img/api/ManufacturingCenter/CompletionOfWorkshopComponents.js index 43645635..462a55fc 100644 --- a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js +++ b/src/assets/img/api/ManufacturingCenter/CompletionOfWorkshopComponents.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 机床名称 -export function getMachines() { +export function getMachines(role, personnel) { return request({ url: '', method: 'post', @@ -11,7 +11,8 @@ export function getMachines() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_机床名称_查询数据_查询全部' + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -44,7 +45,7 @@ export function getGroups(stepNumber) { }) } // 查询零件 -export function selectParts(check1, stepNumber, check2, num) { +export function selectParts(check1, stepNumber, check2, num, check3) { return request({ url: '', method: 'post', @@ -53,7 +54,7 @@ export function selectParts(check1, stepNumber, check2, num) { ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_车间组件完成情况_查询数据', - param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num + param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num + '&显示全部=' + check3 } }) } diff --git a/src/api/ManufacturingCenter/ContractApprovalQuery.js b/src/assets/img/api/ManufacturingCenter/ContractApprovalQuery.js similarity index 100% rename from src/api/ManufacturingCenter/ContractApprovalQuery.js rename to src/assets/img/api/ManufacturingCenter/ContractApprovalQuery.js diff --git a/src/api/ManufacturingCenter/ContractApprovalQuery1.js b/src/assets/img/api/ManufacturingCenter/ContractApprovalQuery1.js similarity index 100% rename from src/api/ManufacturingCenter/ContractApprovalQuery1.js rename to src/assets/img/api/ManufacturingCenter/ContractApprovalQuery1.js diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/assets/img/api/ManufacturingCenter/ContractDetailsInquiry.js similarity index 87% rename from src/api/ManufacturingCenter/ContractDetailsInquiry.js rename to src/assets/img/api/ManufacturingCenter/ContractDetailsInquiry.js index 5bd24d55..d82fe7d2 100644 --- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js +++ b/src/assets/img/api/ManufacturingCenter/ContractDetailsInquiry.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 初始化 项目名称 -export function initProject() { +export function initProject(role, personnel) { return request({ url: '', method: 'post', @@ -11,7 +11,8 @@ export function initProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据_总计划' + name: 'PDM_项目名称_综合查询', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js b/src/assets/img/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js similarity index 100% rename from src/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js rename to src/assets/img/api/ManufacturingCenter/ContractDetailsInquiryMetalworking.js diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/assets/img/api/ManufacturingCenter/CreateIntakeList.js similarity index 100% rename from src/api/ManufacturingCenter/CreateIntakeList.js rename to src/assets/img/api/ManufacturingCenter/CreateIntakeList.js diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/assets/img/api/ManufacturingCenter/CreatePreparationBill.js similarity index 87% rename from src/api/ManufacturingCenter/CreatePreparationBill.js rename to src/assets/img/api/ManufacturingCenter/CreatePreparationBill.js index 724af6f7..abc6462a 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/assets/img/api/ManufacturingCenter/CreatePreparationBill.js @@ -59,6 +59,20 @@ export function edit2(num1, id) { } }) } +// 清除分配 +export function eliminate(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_备料_清除', + param: `工艺计划流水号=${num}` + } + }) +} export function getExport(num1, num2, num3, num4) { return request({ url: '', diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/assets/img/api/ManufacturingCenter/CreateWarehousePurchasing.js similarity index 100% rename from src/api/ManufacturingCenter/CreateWarehousePurchasing.js rename to src/assets/img/api/ManufacturingCenter/CreateWarehousePurchasing.js diff --git a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js b/src/assets/img/api/ManufacturingCenter/DiscardedPartsInquiry.js similarity index 100% rename from src/api/ManufacturingCenter/DiscardedPartsInquiry.js rename to src/assets/img/api/ManufacturingCenter/DiscardedPartsInquiry.js diff --git a/src/api/ManufacturingCenter/Enter0therData.js b/src/assets/img/api/ManufacturingCenter/Enter0therData.js similarity index 100% rename from src/api/ManufacturingCenter/Enter0therData.js rename to src/assets/img/api/ManufacturingCenter/Enter0therData.js diff --git a/src/api/ManufacturingCenter/EquipmentConditionAnalysis.js b/src/assets/img/api/ManufacturingCenter/EquipmentConditionAnalysis.js similarity index 100% rename from src/api/ManufacturingCenter/EquipmentConditionAnalysis.js rename to src/assets/img/api/ManufacturingCenter/EquipmentConditionAnalysis.js diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/assets/img/api/ManufacturingCenter/EquipmentMonitoring.js similarity index 97% rename from src/api/ManufacturingCenter/EquipmentMonitoring.js rename to src/assets/img/api/ManufacturingCenter/EquipmentMonitoring.js index 40faad87..8648516a 100644 --- a/src/api/ManufacturingCenter/EquipmentMonitoring.js +++ b/src/assets/img/api/ManufacturingCenter/EquipmentMonitoring.js @@ -96,7 +96,7 @@ export function getBuzhuang() { 'FROM dbo.车间管理_工作计划 INNER JOIN\n' + ' dbo.PDM_机床名称 ON dbo.车间管理_工作计划.机床流水号 = dbo.PDM_机床名称.机床流水号 INNER JOIN\n' + ' dbo.PDM_项目名称 ON dbo.PDM_机床名称.项目流水号 = dbo.PDM_项目名称.项目流水号\n' + - 'WHERE (dbo.车间管理_工作计划.计划类型 = 1) AND (dbo.车间管理_工作计划.是否工作 = 1) AND (dbo.车间管理_工作计划.组号 <> \'\') AND (dbo.PDM_项目名称.是否启用 = 1)' + 'WHERE (dbo.车间管理_工作计划.计划类型 = 1) AND (dbo.车间管理_工作计划.是否工作 = 1) AND (dbo.PDM_项目名称.是否启用 = 1) and 分配时间 is not null' } }) } diff --git a/src/assets/img/api/ManufacturingCenter/EquipmentMonitoringNew.js b/src/assets/img/api/ManufacturingCenter/EquipmentMonitoringNew.js new file mode 100644 index 00000000..8654c1e4 --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/EquipmentMonitoringNew.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化工位 +export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_加工顺序调整_查询工位及人员' + } + }) +} +// 获取状态 +export function searchState() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'MES_机加工MES_设备状态查询_初始化' + } + }) +} + +export function getData3(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_设备运行情况_查询数据_状态分布图_新', + param: '工位号=' + num + '&开始时间=' + num1 + '&结束时间=' + num2 + } + }) +} diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/assets/img/api/ManufacturingCenter/GroupMatching.js similarity index 64% rename from src/api/ManufacturingCenter/GroupMatching.js rename to src/assets/img/api/ManufacturingCenter/GroupMatching.js index acb2787e..62de18ba 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/assets/img/api/ManufacturingCenter/GroupMatching.js @@ -2,7 +2,7 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -export function searchmachine() { +export function searchmachine(role, personnel) { return request({ url: '', method: 'post', @@ -10,7 +10,8 @@ export function searchmachine() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '机床名称流水号_查询数据' + name: '机床名称流水号_查询数据', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -40,6 +41,19 @@ export function searchTable(check1, machine, check2, groupNum, check3, num, orde } }) } +export function searchNumber(check1, machine, check2, groupNum, check3, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基本件成组配套_查询数据_获取入库数', + param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num + } + }) +} export function getTable(check1, machine, check2, groupNum, pageCurrent, pageSize) { return request({ url: '', @@ -123,3 +137,48 @@ export function searchTable02(...params) { } }) } +// 获取标准件采购完成数量 +export function searchCount(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_完成数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&物料名称_check=${params[4]}&物料名称=${params[5]}&零件类型=${params[8]}`, + Pagination: params[6] + '&' + params[7] + } + }) +} +// 获取已采购基本件数量 +export function searchCount1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套_已采购数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[4]}&零件名称=${params[5]}`, + Pagination: params[6] + '&' + params[7] + } + }) +} +// 获取车间已采购数量 +export function searchCount2(check1, machine, check2, groupNum, check3, num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '库存管理_车间采购出库_零件查询_已采购数量', + param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num, + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/assets/img/api/ManufacturingCenter/InitialProduction.js similarity index 100% rename from src/api/ManufacturingCenter/InitialProduction.js rename to src/assets/img/api/ManufacturingCenter/InitialProduction.js diff --git a/src/assets/img/api/ManufacturingCenter/MachineToolProcessStatistics.js b/src/assets/img/api/ManufacturingCenter/MachineToolProcessStatistics.js new file mode 100644 index 00000000..c33e2458 --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/MachineToolProcessStatistics.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床信息_查询数据' + } + }) +} +export function searchTable(check, startime, endtime, check1, machine, check2, process, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产工艺管理_各工序完成情况_查询数据_机床工序统计_详细', + param: '时间_check=' + check + '&开始时间=' + startime + '&结束时间=' + endtime + '&机床_check=' + check1 + '&机床流水号=' + machine + '&工序_check=' + check2 + '&工序=' + process, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function searchProcess(check, startime, endtime, check1, machine, check2, process) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产工艺管理_各工序完成情况_查询数据_机床工序统计', + param: '时间_check=' + check + '&开始时间=' + startime + '&结束时间=' + endtime + '&机床_check=' + check1 + '&机床流水号=' + machine + '&工序_check=' + check2 + '&工序=' + process + } + }) +} diff --git a/src/api/ManufacturingCenter/MachiningParts.js b/src/assets/img/api/ManufacturingCenter/MachiningParts.js similarity index 100% rename from src/api/ManufacturingCenter/MachiningParts.js rename to src/assets/img/api/ManufacturingCenter/MachiningParts.js diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/assets/img/api/ManufacturingCenter/MachiningSequenceAdjustment.js similarity index 100% rename from src/api/ManufacturingCenter/MachiningSequenceAdjustment.js rename to src/assets/img/api/ManufacturingCenter/MachiningSequenceAdjustment.js diff --git a/src/api/ManufacturingCenter/ManHourAnalysis.js b/src/assets/img/api/ManufacturingCenter/ManHourAnalysis.js similarity index 100% rename from src/api/ManufacturingCenter/ManHourAnalysis.js rename to src/assets/img/api/ManufacturingCenter/ManHourAnalysis.js diff --git a/src/api/ManufacturingCenter/ManHourStatistics.js b/src/assets/img/api/ManufacturingCenter/ManHourStatistics.js similarity index 100% rename from src/api/ManufacturingCenter/ManHourStatistics.js rename to src/assets/img/api/ManufacturingCenter/ManHourStatistics.js diff --git a/src/api/ManufacturingCenter/MaterialAllocation.js b/src/assets/img/api/ManufacturingCenter/MaterialAllocation.js similarity index 82% rename from src/api/ManufacturingCenter/MaterialAllocation.js rename to src/assets/img/api/ManufacturingCenter/MaterialAllocation.js index bc45c822..4e9e098f 100644 --- a/src/api/ManufacturingCenter/MaterialAllocation.js +++ b/src/assets/img/api/ManufacturingCenter/MaterialAllocation.js @@ -54,6 +54,19 @@ export function basicPartsData(machine_check, machine, group_check, group, Model } }) } +export function basicPartsData1(machine_check, machine, group_check, group, Model_check, ModelValue, orderName, order, orderassignmentTypeValue_check, assignmentTypeValue, check_time, outTime1, outTime2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '零件分配查询_查询未分配数量', + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&排序名称=${orderName}&排序顺序=${order}&分配类型_check=${orderassignmentTypeValue_check}&分配类型=${assignmentTypeValue}&分配时间_check=${check_time}&导入开始时间=${outTime1}&导入结束时间=${outTime2}` + } + }) +} // 根据机床和组查询规格型号 LLJ 新增 export function searchModel(machine_check, machine, group_check, group) { return request({ diff --git a/src/api/ManufacturingCenter/MaterialArrival.js b/src/assets/img/api/ManufacturingCenter/MaterialArrival.js similarity index 100% rename from src/api/ManufacturingCenter/MaterialArrival.js rename to src/assets/img/api/ManufacturingCenter/MaterialArrival.js diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/assets/img/api/ManufacturingCenter/MaterialArrivalManagement.js similarity index 100% rename from src/api/ManufacturingCenter/MaterialArrivalManagement.js rename to src/assets/img/api/ManufacturingCenter/MaterialArrivalManagement.js diff --git a/src/assets/img/api/ManufacturingCenter/MonthEndHourAccounting.js b/src/assets/img/api/ManufacturingCenter/MonthEndHourAccounting.js new file mode 100644 index 00000000..4988f92b --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/MonthEndHourAccounting.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function searchTable(num, time, time1, order, orderName, check, name, check1, partNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '工艺月底工时核算_查询数据_最新', + param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&排序名称=' + order + '&排序方式=' + orderName + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function searchCount(num, time, time1, check, name, check1, partNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '工艺月底工时核算_查询数据_统计数据', + param: '筛选=' + num + '&开始时间=' + time + '&结束时间=' + time1 + '&操作工_check=' + check + '&操作工=' + name + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + } + }) +} +export function searchHour(num, order, orderName) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '工艺月底工时核算_查询数据_最新_三表查询', + param: '工艺计划流水号=' + num + '&排序名称=' + order + '&排序方式=' + orderName + } + }) +} +export function searchHourCount(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '工艺月底工时核算_查询数据_统计数据_三表查询', + param: '工艺计划流水号=' + num + } + }) +} diff --git a/src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js b/src/assets/img/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js similarity index 100% rename from src/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js rename to src/assets/img/api/ManufacturingCenter/MonthEndHourAccountingMetalworking.js diff --git a/src/api/ManufacturingCenter/OnlineProcessChange.js b/src/assets/img/api/ManufacturingCenter/OnlineProcessChange.js similarity index 100% rename from src/api/ManufacturingCenter/OnlineProcessChange.js rename to src/assets/img/api/ManufacturingCenter/OnlineProcessChange.js diff --git a/src/api/ManufacturingCenter/OwnTimeStatistics.js b/src/assets/img/api/ManufacturingCenter/OwnTimeStatistics.js similarity index 100% rename from src/api/ManufacturingCenter/OwnTimeStatistics.js rename to src/assets/img/api/ManufacturingCenter/OwnTimeStatistics.js diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/assets/img/api/ManufacturingCenter/ParseQuery.js similarity index 85% rename from src/api/ManufacturingCenter/ParseQuery.js rename to src/assets/img/api/ManufacturingCenter/ParseQuery.js index bfaa181d..d3815f35 100644 --- a/src/api/ManufacturingCenter/ParseQuery.js +++ b/src/assets/img/api/ManufacturingCenter/ParseQuery.js @@ -9,8 +9,8 @@ export function SelectMachine() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '发货管理_发货申请_发货单_机床_查询', - param: '机床图号=' + arguments[0] + name: '综合查询_机床_查询', + param: '机床图号=' + arguments[0] + '&角色编号=' + arguments[1] + '&人员编号=' + arguments[2] } }) } @@ -49,7 +49,7 @@ export function searchMachine() { ModularID: router.currentRoute.path, type: '1', name: '机床总查询', - param: '机床流水号_check=' + arguments[0] + '&机床流水号=' + arguments[1] + param: '机床流水号_check=' + arguments[0] + '&机床流水号=' + arguments[1] + '&角色编号=' + arguments[2] + '&人员编号=' + arguments[3] } }) } diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/assets/img/api/ManufacturingCenter/PartAssignment.js similarity index 100% rename from src/api/ManufacturingCenter/PartAssignment.js rename to src/assets/img/api/ManufacturingCenter/PartAssignment.js diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/assets/img/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js similarity index 71% rename from src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js rename to src/assets/img/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index f41a9bdd..b64de42b 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/assets/img/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 初始化机床项目 -export function initMachineProject() { +export function initMachineProject(role, personnel) { return request({ url: '', method: 'post', @@ -11,7 +11,8 @@ export function initMachineProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -44,7 +45,7 @@ export function initPerson() { }) } // 查询 -export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, val7) { +export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, val7, role, personnel) { return request({ url: '', method: 'post', @@ -53,7 +54,21 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3 ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查', - param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&排序=${val7}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&排序=${val7}&角色编号=${role}&营销经理流水号=${personnel}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +// 查询已编制数量 +export function searchCount(check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查_已编制数量', + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&角色编号=${role}&营销经理流水号=${personnel}` } }) } diff --git a/src/api/ManufacturingCenter/ProcessAdjustQuery.js b/src/assets/img/api/ManufacturingCenter/ProcessAdjustQuery.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessAdjustQuery.js rename to src/assets/img/api/ManufacturingCenter/ProcessAdjustQuery.js diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/assets/img/api/ManufacturingCenter/ProcessPlanning.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessPlanning.js rename to src/assets/img/api/ManufacturingCenter/ProcessPlanning.js diff --git a/src/api/ManufacturingCenter/ProcessPlanningNew.js b/src/assets/img/api/ManufacturingCenter/ProcessPlanningNew.js similarity index 99% rename from src/api/ManufacturingCenter/ProcessPlanningNew.js rename to src/assets/img/api/ManufacturingCenter/ProcessPlanningNew.js index a08b6816..371547d2 100644 --- a/src/api/ManufacturingCenter/ProcessPlanningNew.js +++ b/src/assets/img/api/ManufacturingCenter/ProcessPlanningNew.js @@ -604,7 +604,7 @@ export function TableAddLi2(a) { }) } // 已编制定额保存 -export function TableAddLi(a, b, c, num0, num1, num2) { +export function TableAddLi(a, b, c, num0, num1, num2, people) { return request({ url: '', method: 'post', @@ -613,7 +613,7 @@ export function TableAddLi(a, b, c, num0, num1, num2) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_零件工序_增加数据_修改数据', - param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int&是否加序=' + num2 + '=int' + param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int&是否加序=' + num2 + '=int&人员编号=' + people } }) } @@ -657,3 +657,4 @@ export function dropGongyi(num, num1) { } }) } + diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/assets/img/api/ManufacturingCenter/ProcessQuotaEstablishment.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessQuotaEstablishment.js rename to src/assets/img/api/ManufacturingCenter/ProcessQuotaEstablishment.js diff --git a/src/assets/img/api/ManufacturingCenter/ProcessQuotaStatistics.js b/src/assets/img/api/ManufacturingCenter/ProcessQuotaStatistics.js new file mode 100644 index 00000000..6697074b --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/ProcessQuotaStatistics.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化机床项目 +export function initMachineProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 查询 +export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_定额统计', + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +// 查询总定额 +export function searchTotal(check1, val1, check2, val2, check3, val3) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_定额统计_总和', + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}` + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/assets/img/api/ManufacturingCenter/ProcessTaskAssignment.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessTaskAssignment.js rename to src/assets/img/api/ManufacturingCenter/ProcessTaskAssignment.js diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/assets/img/api/ManufacturingCenter/ProcessingStatus.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessingStatus.js rename to src/assets/img/api/ManufacturingCenter/ProcessingStatus.js diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/assets/img/api/ManufacturingCenter/ProcessingStatusEdit.js similarity index 100% rename from src/api/ManufacturingCenter/ProcessingStatusEdit.js rename to src/assets/img/api/ManufacturingCenter/ProcessingStatusEdit.js diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/assets/img/api/ManufacturingCenter/ProcessingStatusNew.js similarity index 85% rename from src/api/ManufacturingCenter/ProcessingStatusNew.js rename to src/assets/img/api/ManufacturingCenter/ProcessingStatusNew.js index b00f4fe8..7bc8e5b7 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusNew.js +++ b/src/assets/img/api/ManufacturingCenter/ProcessingStatusNew.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 机床名称 -export function getMachines() { +export function getMachines(role, personnel) { return request({ url: '', method: 'post', @@ -11,8 +11,8 @@ export function getMachines() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_传递后_机床名称_根据机床查询', - param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -30,7 +30,7 @@ export function getGroups(stepNumber) { } }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, pageCurrent, pageSize) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, pageCurrent, pageSize, order, orderName, role, personnel) { return request({ url: '', method: 'post', @@ -38,8 +38,8 @@ export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, check UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_追溯加工过程_查询', - param: `机床流水号_check=${checkbox_Machine}&机床流水号=${Machine}&组件流水号_check=${checkbox_Group}&组件流水号=${Group}&零件图号_check=${checkbox_number}&零件图号=${number}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + name: '车间生产管理工艺_追溯加工过程_带排序_查询', + param: `机床流水号_check=${checkbox_Machine}&机床流水号=${Machine}&组件流水号_check=${checkbox_Group}&组件流水号=${Group}&零件图号_check=${checkbox_number}&零件图号=${number}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&排序方式=${order}&排序名称=${orderName}&角色编号=${role}&人员编号=${personnel}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } @@ -255,3 +255,29 @@ export function isDeleteProcess(NUM) { } }) } +export function revoke(num, num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生成管理_完成状态_修改数据', + param: `工艺计划流水号=${num}&工序流水号=${num1}&完成数量=${num2}&完成过程流水号=${num3}&是否加序=${num4}` + } + }) +} +export function searchTableDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_追溯加工过程_查询_合并情况', + param: `工艺计划流水号=${num}` + } + }) +} diff --git a/src/api/ManufacturingCenter/ProductionCapacityBalance.js b/src/assets/img/api/ManufacturingCenter/ProductionCapacityBalance.js similarity index 100% rename from src/api/ManufacturingCenter/ProductionCapacityBalance.js rename to src/assets/img/api/ManufacturingCenter/ProductionCapacityBalance.js diff --git a/src/assets/img/api/ManufacturingCenter/ProductionPlanQuery.js b/src/assets/img/api/ManufacturingCenter/ProductionPlanQuery.js new file mode 100644 index 00000000..4753a294 --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/ProductionPlanQuery.js @@ -0,0 +1,100 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 获取机床 +export function searchMachine(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 查询以投产零件 +export function searchtable() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_生产计划_查询零件', + param: `机床流水号_check=${arguments[0]}&机床流水号=${arguments[1]}&组件流水号_check=${arguments[10]}&组件流水号=${arguments[11]}&零件图号_check=${arguments[2]}&零件图号=${arguments[3]}&投产时间_check=${arguments[4]}&开始时间=${arguments[5]}&结束时间=${arguments[6]}&加急_check=${arguments[7]}`, + pagination: arguments[8] + '&' + arguments[9] + } + }) +} +export function repulse(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_生产计划_打回零件', + param: `工艺计划流水号=${num}` + } + }) +} +export function editNumber(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理_生产计划_编辑数据', + param: '工艺计划流水号=' + num + '&零件数量=' + num1 + } + }) +} +// 获取组号 +export function gettabledata1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_追溯加工过程_查询工序', + param: '工艺计划流水号=' + num + '=int' + } + }) +} +export function searchTableDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_追溯加工过程_查询_合并情况', + param: `工艺计划流水号=${num}` + } + }) +} diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagement.js similarity index 77% rename from src/api/ManufacturingCenter/ProjectPlanningManagement.js rename to src/assets/img/api/ManufacturingCenter/ProjectPlanningManagement.js index 198614b0..eedf9b7b 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js +++ b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagement.js @@ -67,7 +67,7 @@ export function getCustomerName() { } }) } -export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) { +export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, role, personnel, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -76,7 +76,7 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9 ModularID: router.currentRoute.path, type: '1', name: '项目计划管理_项目总计划_查询数据', - param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12 + '&角色编号=' + role + '&人员编号=' + personnel, Pagination: pageCurrent + '&' + pageSize } }) @@ -159,3 +159,44 @@ export function personalNumber(num) { } }) } +// 查询表2 +export function searchTable3(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '项目计划管理_项目详细计划_查询数据11', + param: `机床流水号=` + num1 + } + }) +} +// 更改发布状态 +export function changerelease(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '项目计划管理_修改发布状态', + param: `项目流水号=` + num1 + } + }) +} +export function editTable21(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '项目计划管理_项目详细计划_编辑数据_发布后', + param: `组件计划流水号=` + num1 + '&组件流水号=' + num2 + '&任务名称=' + num3 + '&负责人=' + num4 + '&接收任务时间=' + num5 + '&任务开始时间=' + num6 + '&计划完成时间=' + num7 + '&货期=' + num8 + '&实际完成时间=' + num9 + '&备注=' + num10 + '&修改原因=' + num11 + } + }) +} diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagementNew.js b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementNew.js similarity index 97% rename from src/api/ManufacturingCenter/ProjectPlanningManagementNew.js rename to src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementNew.js index 4d76db03..2ed1f662 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningManagementNew.js +++ b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementNew.js @@ -71,7 +71,7 @@ export function getCustomerName() { }) } // 查询表1 -export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) { +export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, role, personnel) { return request({ url: '', method: 'post', @@ -80,8 +80,7 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9 ModularID: router.currentRoute.path, type: '1', name: '项目计划管理_项目总计划_查询数据', - param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, - Pagination: pageCurrent + '&' + pageSize + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12 + '&角色编号=' + role + '&人员编号=' + personnel } }) } diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagementQuery.js b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementQuery.js similarity index 82% rename from src/api/ManufacturingCenter/ProjectPlanningManagementQuery.js rename to src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementQuery.js index aeb0d4fe..bb14eef4 100644 --- a/src/api/ManufacturingCenter/ProjectPlanningManagementQuery.js +++ b/src/assets/img/api/ManufacturingCenter/ProjectPlanningManagementQuery.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 项目 -export function getProject() { +export function getProject(role, personnel) { return request({ url: '', method: 'post', @@ -11,7 +11,8 @@ export function getProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据_总计划' + name: 'PDM_项目名称_综合查询', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -71,7 +72,7 @@ export function getCustomerName() { }) } // 查询表1 -export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) { +export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, role, personnel, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -80,7 +81,7 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9 ModularID: router.currentRoute.path, type: '1', name: '项目计划管理_项目总计划_查询数据', - param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12, + param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12 + '&角色编号=' + role + '&人员编号=' + personnel, Pagination: pageCurrent + '&' + pageSize } }) @@ -99,6 +100,20 @@ export function editTable(num1, num2, num3, num5, num13, num14, num15, num6, num } }) } +// 查询时间 +export function searchTime(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '项目计划管理_项目计划查询_查询项目时间节点_查询数据', + param: `机床流水号=` + num + } + }) +} // 查询表2 export function searchTable2(num1) { return request({ @@ -155,3 +170,17 @@ export function addTable(num1, num2) { } }) } +// 查询表4 +export function searchtable4(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '项目计划管理_项目计划查询_修改记录_查询数据', + param: `组件计划流水号=` + num1 + } + }) +} diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/assets/img/api/ManufacturingCenter/ProjectPlanningQuery.js similarity index 100% rename from src/api/ManufacturingCenter/ProjectPlanningQuery.js rename to src/assets/img/api/ManufacturingCenter/ProjectPlanningQuery.js diff --git a/src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js b/src/assets/img/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js similarity index 100% rename from src/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js rename to src/assets/img/api/ManufacturingCenter/QualityInspectionQueryMetalworking.js diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/assets/img/api/ManufacturingCenter/QuotaFormulation.js similarity index 100% rename from src/api/ManufacturingCenter/QuotaFormulation.js rename to src/assets/img/api/ManufacturingCenter/QuotaFormulation.js diff --git a/src/api/ManufacturingCenter/RawMaterialsMaintenance.js b/src/assets/img/api/ManufacturingCenter/RawMaterialsMaintenance.js similarity index 100% rename from src/api/ManufacturingCenter/RawMaterialsMaintenance.js rename to src/assets/img/api/ManufacturingCenter/RawMaterialsMaintenance.js diff --git a/src/api/ManufacturingCenter/RepairTimeEntry.js b/src/assets/img/api/ManufacturingCenter/RepairTimeEntry.js similarity index 100% rename from src/api/ManufacturingCenter/RepairTimeEntry.js rename to src/assets/img/api/ManufacturingCenter/RepairTimeEntry.js diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/assets/img/api/ManufacturingCenter/RequestApprovalQuery.js similarity index 100% rename from src/api/ManufacturingCenter/RequestApprovalQuery.js rename to src/assets/img/api/ManufacturingCenter/RequestApprovalQuery.js diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery1.js b/src/assets/img/api/ManufacturingCenter/RequestApprovalQuery1.js similarity index 100% rename from src/api/ManufacturingCenter/RequestApprovalQuery1.js rename to src/assets/img/api/ManufacturingCenter/RequestApprovalQuery1.js diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/assets/img/api/ManufacturingCenter/ScheduleCompletionDetails.js similarity index 76% rename from src/api/ManufacturingCenter/ScheduleCompletionDetails.js rename to src/assets/img/api/ManufacturingCenter/ScheduleCompletionDetails.js index b11ce6ae..c80a7877 100644 --- a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js +++ b/src/assets/img/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -45,3 +45,17 @@ export function searchoperator() { } }) } +// 查询所有候补工时 +export function searchtableAlternateHours(time1, time2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_工时统计_设备工时_Vue_详细_候补工时', + param: '开始时间=' + time1 + '&结束时间=' + time2 + } + }) +} diff --git a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js b/src/assets/img/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js similarity index 100% rename from src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js rename to src/assets/img/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/assets/img/api/ManufacturingCenter/ShopScheduling.js similarity index 80% rename from src/api/ManufacturingCenter/ShopScheduling.js rename to src/assets/img/api/ManufacturingCenter/ShopScheduling.js index 4e6b12b2..b6acc316 100644 --- a/src/api/ManufacturingCenter/ShopScheduling.js +++ b/src/assets/img/api/ManufacturingCenter/ShopScheduling.js @@ -36,10 +36,10 @@ export function getGongxu(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '3', - name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from -(select 姓名,排产时间,convert(nvarchar(10),工序流水号) as 工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} + name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,外协数量 from +(select 姓名,排产时间,convert(nvarchar(10),工序流水号) as 工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,isnull(外协数量,0) as 外协数量 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 >= 6 and 工艺计划流水号=${num} union -select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_加序_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num}) as a +select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,0 as 外协数量 from dbo.车间生产管理工艺_插件排产查询_加序_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 >= 6 and 工艺计划流水号=${num}) as a order by a.工序顺序` } }) @@ -52,10 +52,10 @@ export function searchTableData2(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '3', - name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from -(select 工艺计划流水号,姓名,零件图号,零件名称,convert(nvarchar(10),工序流水号) as 工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and (工序状态<>4 or 工序状态 is null) + name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,外协数量 from +(select 工艺计划流水号,姓名,零件图号,零件名称,convert(nvarchar(10),工序流水号) as 工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,isnull(外协数量,0) as 外协数量 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and (工序状态<>4 or 工序状态 is null) union -select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_加序_视图 where 排产人员=${num} and (工序状态<>4 or 工序状态 is null)) as a +select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态,0 as 外协数量 from dbo.车间生产管理工艺_插件排产查询_加序_视图 where 排产人员=${num} and (工序状态<>4 or 工序状态 is null)) as a order by a.工序顺序` } }) @@ -101,7 +101,7 @@ export function panDuan(num) { (case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态 from dbo.车间生产管理工艺_插件排产查询_视图 - where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6 + where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 >=6 group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间 ) as a where 工艺计划流水号=${num} diff --git a/src/api/ManufacturingCenter/SparePartsForScrap.js b/src/assets/img/api/ManufacturingCenter/SparePartsForScrap.js similarity index 100% rename from src/api/ManufacturingCenter/SparePartsForScrap.js rename to src/assets/img/api/ManufacturingCenter/SparePartsForScrap.js diff --git a/src/api/ManufacturingCenter/SparePartsOut.js b/src/assets/img/api/ManufacturingCenter/SparePartsOut.js similarity index 100% rename from src/api/ManufacturingCenter/SparePartsOut.js rename to src/assets/img/api/ManufacturingCenter/SparePartsOut.js diff --git a/src/api/ManufacturingCenter/SparePartsPurchase.js b/src/assets/img/api/ManufacturingCenter/SparePartsPurchase.js similarity index 100% rename from src/api/ManufacturingCenter/SparePartsPurchase.js rename to src/assets/img/api/ManufacturingCenter/SparePartsPurchase.js diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/assets/img/api/ManufacturingCenter/StatusQuery.js similarity index 93% rename from src/api/ManufacturingCenter/StatusQuery.js rename to src/assets/img/api/ManufacturingCenter/StatusQuery.js index 531229f9..8591146b 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/assets/img/api/ManufacturingCenter/StatusQuery.js @@ -14,7 +14,7 @@ export function intPartState() { } }) } -export function searchmachine() { +export function searchmachine(role, personnel) { return request({ url: '', method: 'post', @@ -22,7 +22,8 @@ export function searchmachine() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } diff --git a/src/api/ManufacturingCenter/TraceabilityOfParts.js b/src/assets/img/api/ManufacturingCenter/TraceabilityOfParts.js similarity index 100% rename from src/api/ManufacturingCenter/TraceabilityOfParts.js rename to src/assets/img/api/ManufacturingCenter/TraceabilityOfParts.js diff --git a/src/api/ManufacturingCenter/TypicalProcessMaintenance.js b/src/assets/img/api/ManufacturingCenter/TypicalProcessMaintenance.js similarity index 100% rename from src/api/ManufacturingCenter/TypicalProcessMaintenance.js rename to src/assets/img/api/ManufacturingCenter/TypicalProcessMaintenance.js diff --git a/src/assets/img/api/ManufacturingCenter/WorkingHours.js b/src/assets/img/api/ManufacturingCenter/WorkingHours.js new file mode 100644 index 00000000..b3a6728c --- /dev/null +++ b/src/assets/img/api/ManufacturingCenter/WorkingHours.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function searchTable(check, process) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产工艺管理_工序能力_查询数据', + param: '工序名称_check=' + check + '&工序名称=' + process + } + }) +} +export function searchProcess(startime, endtime) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产工艺管理_各工序完成情况_查询数据', + param: '开始时间=' + startime + '&结束时间=' + endtime + } + }) +} diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/assets/img/api/ManufacturingCenter/WorkshopEquipmentManagement.js similarity index 69% rename from src/api/ManufacturingCenter/WorkshopEquipmentManagement.js rename to src/assets/img/api/ManufacturingCenter/WorkshopEquipmentManagement.js index 26bd12df..13f27744 100644 --- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js +++ b/src/assets/img/api/ManufacturingCenter/WorkshopEquipmentManagement.js @@ -2,7 +2,7 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -export function getData(check, equipmentName, pageCurrent, pageSize) { +export function getData(check, equipmentName, check1, opName, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -11,7 +11,7 @@ export function getData(check, equipmentName, pageCurrent, pageSize) { ModularID: router.currentRoute.path, type: '1', name: '设备管理_设备加工能力_查询数据_设备维护NEW', - param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName + param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName + '&工位_check=' + check1 + '=int&工位=' + opName // pagination: pageCurrent + '&' + pageSize } }) @@ -29,7 +29,33 @@ export function initProcessing(a = '') { } }) } -export function addTable(equipmentName, equipmentModel, performance, processingCapacity, workingTimeFactor, processName, processNumber, shift, reorganizationTimeFactor, equipmentNumber, reservedTimeFactor) { +export function searchProcess(machine) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '设备管理_工艺绑定_查询数据', + param: '设备流水号=' + machine + } + }) +} +export function processAdd(machine, processingName, process, timePrice, ability) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_工艺绑定_增加数据', + param: '设备流水号=' + machine + '&工艺名称简称=' + process + '&工艺编号=' + process + '&工时单价=' + timePrice + '&加工能力=' + ability + } + }) +} +export function addTable(equipmentName, equipmentModel, performance, processingCapacity, workingTimeFactor, processName, processNumber, shift, reorganizationTimeFactor, equipmentNumber, reservedTimeFactor, price, ability, opname) { return request({ url: '', method: 'post', @@ -38,7 +64,7 @@ export function addTable(equipmentName, equipmentModel, performance, processingC ModularID: router.currentRoute.path, type: '2', name: '设备管理_设备加工能力_增加数据_设备维护New', - param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor + param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor + '&工时单价=' + price + '&月设备加工能力=' + ability + '&MES终端号=' + opname + '&已存在=0=int=output' } }) } @@ -55,7 +81,7 @@ export function editTable(equipmentSerialNumber, equipmentName, equipmentModel, } }) } -export function deleteTable(number) { +export function deleteTable(number, num) { return request({ url: '', method: 'post', @@ -64,7 +90,20 @@ export function deleteTable(number) { ModularID: router.currentRoute.path, type: '2', name: '设备管理_设备加工能力_删除数据_设备维护', - param: '设备流水号=' + number + '=int' + param: '设备流水号=' + number + '=int' + '&工位号=' + num + } + }) +} +export function deleteProcess(number, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '设备管理_设备加工能力_删除数据_工艺绑定', + param: '设备流水号=' + number + '=int' + '&工艺属性代码=' + num } }) } diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/assets/img/api/ManufacturingCenter/machiningHoursStatistics.js similarity index 100% rename from src/api/ManufacturingCenter/machiningHoursStatistics.js rename to src/assets/img/api/ManufacturingCenter/machiningHoursStatistics.js diff --git a/src/api/ManufacturingCenter/maintainInformation.js b/src/assets/img/api/ManufacturingCenter/maintainInformation.js similarity index 100% rename from src/api/ManufacturingCenter/maintainInformation.js rename to src/assets/img/api/ManufacturingCenter/maintainInformation.js diff --git a/src/api/MarketingCenter/BidBond.js b/src/assets/img/api/MarketingCenter/BidBond.js similarity index 100% rename from src/api/MarketingCenter/BidBond.js rename to src/assets/img/api/MarketingCenter/BidBond.js diff --git a/src/api/MarketingCenter/CRM.js b/src/assets/img/api/MarketingCenter/CRM.js similarity index 92% rename from src/api/MarketingCenter/CRM.js rename to src/assets/img/api/MarketingCenter/CRM.js index d2644613..b9b04120 100644 --- a/src/api/MarketingCenter/CRM.js +++ b/src/assets/img/api/MarketingCenter/CRM.js @@ -188,7 +188,7 @@ export function editMarketingManager(MarketingManagerId, AdressID) { } }) } -export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, OpeningBank) { +export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, OpeningBank, MarketingManagerValue) { return request({ url: '', method: 'post', @@ -197,7 +197,7 @@ export function addCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, Peo ModularID: router.currentRoute.path, type: '2', name: '客户关系管理系统_客户_增加数据_MESWORK', - param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&开户行=' + OpeningBank + param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&开户行=' + OpeningBank + '&人员编号=' + MarketingManagerValue } }) } @@ -214,7 +214,7 @@ export function selectAdressOfID(AdressID) { } }) } -export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID, OpeningBank) { +export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, People, Email, BankAccount, DutyParagraph, Assessment, Remark, ID, OpeningBank, MarketingManagerValue) { return request({ url: '', method: 'post', @@ -223,8 +223,19 @@ export function editCustomer(AdressID, CustomerName, CallNumber, Fax, Adress, Pe ModularID: router.currentRoute.path, type: '2', name: '客户关系管理系统_客户_修改数据_MESWORK', - param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + '&开户行=' + OpeningBank + param: '省份流水号=' + AdressID + '&客户名称=' + CustomerName + '&电话=' + CallNumber + '&传真=' + Fax + '&地址=' + Adress + '&联系人=' + People + '&电子邮箱=' + Email + '&银行账号=' + BankAccount + '&税号=' + DutyParagraph + '&价值评估流水号=' + Assessment + '&备注=' + Remark + '&客户流水号=' + ID + '&开户行=' + OpeningBank + '&人员编号=' + MarketingManagerValue + } + }) +} +export function searchMarketingManager() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '客户关系管理系统_营销经理' } }) } - diff --git a/src/api/MarketingCenter/ComprehensiveInquiryMS.js b/src/assets/img/api/MarketingCenter/ComprehensiveInquiryMS.js similarity index 92% rename from src/api/MarketingCenter/ComprehensiveInquiryMS.js rename to src/assets/img/api/MarketingCenter/ComprehensiveInquiryMS.js index 70832793..ad64608b 100644 --- a/src/api/MarketingCenter/ComprehensiveInquiryMS.js +++ b/src/assets/img/api/MarketingCenter/ComprehensiveInquiryMS.js @@ -157,3 +157,17 @@ export function searchTableDataDeliveryManagement(num1) { } }) } +// 查询项目执行情况 +export function searchTable2(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '项目计划管理_项目计划查询_查询项目详细_查询数据', + param: `机床流水号=` + num1 + } + }) +} diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/assets/img/api/MarketingCenter/ContractCapitalManagement.js similarity index 98% rename from src/api/MarketingCenter/ContractCapitalManagement.js rename to src/assets/img/api/MarketingCenter/ContractCapitalManagement.js index 0bb44520..b364dc7a 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/assets/img/api/MarketingCenter/ContractCapitalManagement.js @@ -27,7 +27,7 @@ export function initMarketingManager() { }) } // 导出Excel llj -export function downloadexcel(num1, num2, num3, check1, starttime, endtime, ordername, order) { +export function downloadexcel(num1, num2, num3, check1, starttime, endtime, ordername, order, check2, people) { return request({ url: '', method: 'post', @@ -36,11 +36,11 @@ export function downloadexcel(num1, num2, num3, check1, starttime, endtime, orde ModularID: router.currentRoute.path, type: '1', name: '报表_合同收款计划_导出', - param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + '&人员ID_check=' + check2 + '&人员ID=' + people } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order, check2, people) { return request({ url: '', method: 'post', @@ -49,7 +49,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, st ModularID: router.currentRoute.path, type: '1', name: '合同资金管理_资金信息_查询1', - param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order, + param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + '&人员ID_check=' + check2 + '&人员ID=' + people, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/assets/img/api/MarketingCenter/ContractInformationManagement.js similarity index 100% rename from src/api/MarketingCenter/ContractInformationManagement.js rename to src/assets/img/api/MarketingCenter/ContractInformationManagement.js diff --git a/src/api/MarketingCenter/CreateProject.js b/src/assets/img/api/MarketingCenter/CreateProject.js similarity index 100% rename from src/api/MarketingCenter/CreateProject.js rename to src/assets/img/api/MarketingCenter/CreateProject.js diff --git a/src/api/MarketingCenter/DeliveryApplication.js b/src/assets/img/api/MarketingCenter/DeliveryApplication.js similarity index 98% rename from src/api/MarketingCenter/DeliveryApplication.js rename to src/assets/img/api/MarketingCenter/DeliveryApplication.js index 2a422399..f9a59111 100644 --- a/src/api/MarketingCenter/DeliveryApplication.js +++ b/src/assets/img/api/MarketingCenter/DeliveryApplication.js @@ -180,7 +180,7 @@ export function InvoiceDetailsSave() { ModularID: router.currentRoute.path, type: '2', name: '发货管理_发货申请_发货单_发货单明细_循环增加', - param: '货品类别组=' + arguments[0] + '\\&货品编号组=' + arguments[1] + '\\&货品名称组=' + arguments[2] + '\\&货品规格组=' + arguments[3] + '\\&货品型号组=' + arguments[4] + '\\&设计者组=' + arguments[5] + '\\&数量组=' + arguments[6] + '\\&发货单流水号=' + arguments[7] + param: '货品类别组=' + arguments[0] + '\\&货品编号组=' + arguments[1] + '\\&货品名称组=' + arguments[2] + '\\&货品规格组=' + arguments[3] + '\\&货品型号组=' + arguments[4] + '\\&设计者组=' + arguments[5] + '\\&数量组=' + arguments[6] + '\\&机床流水号组=' + arguments[7] + '\\&发货单流水号=' + arguments[8] } }) } diff --git a/src/api/MarketingCenter/DeliveryManagement.js b/src/assets/img/api/MarketingCenter/DeliveryManagement.js similarity index 100% rename from src/api/MarketingCenter/DeliveryManagement.js rename to src/assets/img/api/MarketingCenter/DeliveryManagement.js diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/assets/img/api/MarketingCenter/InvoiceRecord.js similarity index 100% rename from src/api/MarketingCenter/InvoiceRecord.js rename to src/assets/img/api/MarketingCenter/InvoiceRecord.js diff --git a/src/api/MarketingCenter/MarginManagement.js b/src/assets/img/api/MarketingCenter/MarginManagement.js similarity index 100% rename from src/api/MarketingCenter/MarginManagement.js rename to src/assets/img/api/MarketingCenter/MarginManagement.js diff --git a/src/api/MarketingCenter/PerformanceBond.js b/src/assets/img/api/MarketingCenter/PerformanceBond.js similarity index 100% rename from src/api/MarketingCenter/PerformanceBond.js rename to src/assets/img/api/MarketingCenter/PerformanceBond.js diff --git a/src/assets/img/api/MarketingCenter/ProjectFiles.js b/src/assets/img/api/MarketingCenter/ProjectFiles.js new file mode 100644 index 00000000..e331a2e1 --- /dev/null +++ b/src/assets/img/api/MarketingCenter/ProjectFiles.js @@ -0,0 +1,214 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 项目 +export function getProject(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_综合查询', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 机床 +export function getToolNum(check, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据_是否显示_初始化', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +export function searchTotal(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_项目档案_查询数据', + param: '机床流水号=' + num + } + }) +} +export function updateTotal(num, projecValue, projectName, projectNumber, projectTime, delivery, deliverGoods, customerName, customerAddress, customerPeople, projectManager, ManagerMarketing, ProjectDesign, Installation, Mechanical, Electrical, IsItNecessary, RandomReturn, DoNotReturn, SpecimenTime, SpecimenNumber, IsItQualified, PreAcceptanceDate, CustomerPersonnel, OurStaff, PreAcceptanceConclusion, FinalAcceptanceDate, FinalCustomerPersonnel, FinalOurStaff, FinalAcceptanceConclusion, Tabulation, approval, approval1, TabulationDate) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_编辑数据', + param: '机床流水号=' + num + '&项目编号=' + projecValue + '&项目名称=' + projectName + '&数量=' + projectNumber + '&合同签订日期=' + projectTime + '&合同交货期=' + delivery + '&发货日期=' + deliverGoods + '&客户名称=' + customerName + '&客户地址=' + customerAddress + '&客户联系人=' + customerPeople + '&项目经理=' + projectManager + '&营销经理=' + ManagerMarketing + '&项目主设计=' + ProjectDesign + '&安装总负责=' + Installation + '&机械主调试=' + Mechanical + '&电气主调试=' + Electrical + '&是否需要=' + IsItNecessary + '&随机返回=' + RandomReturn + '&不返回=' + DoNotReturn + '&试件提供日期=' + SpecimenTime + '&试件数量=' + SpecimenNumber + '&是否合格=' + IsItQualified + '&预验收日期=' + PreAcceptanceDate + '&预验收客户人员=' + CustomerPersonnel + '&预验收我司人员=' + OurStaff + '&预验收结论=' + PreAcceptanceConclusion + '&终验收日期=' + FinalAcceptanceDate + '&终验收客户人员=' + FinalCustomerPersonnel + '&终验收我司人员=' + FinalOurStaff + '&验收结论=' + FinalAcceptanceConclusion + '&制表=' + Tabulation + '&批准=' + approval + '&批准1=' + approval1 + '&日期=' + TabulationDate + } + }) +} +export function searchTable(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_项目档案_预验收情况_查询数据', + param: '机床流水号=' + num + } + }) +} +export function insertTable(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_预验收情况_增加数据', + param: '机床流水号=' + num + } + }) +} +export function updateTable(num, problem, solve, people, handle, number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_预验收情况_编辑数据', + param: 'ID=' + num + '&问题描述=' + problem + '&解决办法=' + solve + '&负责人=' + people + '&处理结果=' + handle + '&序号=' + number + } + }) +} +export function searchTable1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_项目档案_安装调试情况_查询数据', + param: '机床流水号=' + num + } + }) +} +export function insertTable1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_安装调试情况_增加数据', + param: '机床流水号=' + num + } + }) +} +export function updateTable1(num, time, problem, solve, people, handle, number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_安装调试情况_编辑数据', + param: 'ID=' + num + '&问题提出日期=' + time + '&问题描述=' + problem + '&解决办法=' + solve + '&负责人=' + people + '&处理结果=' + handle + '&序号=' + number + } + }) +} +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_项目档案_终验收情况_查询数据', + param: '机床流水号=' + num + } + }) +} +export function insertTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_终验收情况_增加数据', + param: '机床流水号=' + num + } + }) +} +export function updateTable2(num, problem, solve, people, handle, number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_终验收情况_编辑数据', + param: 'ID=' + num + '&存在问题=' + problem + '&解决办法=' + solve + '&负责人=' + people + '&处理结果=' + handle + '&序号=' + number + } + }) +} +export function deleteTable(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_预验收情况_删除数据', + param: 'ID=' + num + } + }) +} +export function deleteTable1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_安装调试情况_删除数据', + param: 'ID=' + num + } + }) +} +export function deleteTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_项目档案_终验收情况_删除数据', + param: 'ID=' + num + } + }) +} diff --git a/src/api/MarketingCenter/ProjectProgress.js b/src/assets/img/api/MarketingCenter/ProjectProgress.js similarity index 100% rename from src/api/MarketingCenter/ProjectProgress.js rename to src/assets/img/api/MarketingCenter/ProjectProgress.js diff --git a/src/api/MarketingCenter/SafetyMargin.js b/src/assets/img/api/MarketingCenter/SafetyMargin.js similarity index 100% rename from src/api/MarketingCenter/SafetyMargin.js rename to src/assets/img/api/MarketingCenter/SafetyMargin.js diff --git a/src/api/MarketingCenter/ShippingInquiries.js b/src/assets/img/api/MarketingCenter/ShippingInquiries.js similarity index 100% rename from src/api/MarketingCenter/ShippingInquiries.js rename to src/assets/img/api/MarketingCenter/ShippingInquiries.js diff --git a/src/assets/img/api/MarketingCenter/afterSaleService.js b/src/assets/img/api/MarketingCenter/afterSaleService.js new file mode 100644 index 00000000..21aca375 --- /dev/null +++ b/src/assets/img/api/MarketingCenter/afterSaleService.js @@ -0,0 +1,378 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_项目名称_总_查询' + } + }) +} +export function initMarketingManager() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_营销人员_总_查询' + } + }) +} +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_合同信息_查询_分页_售后服务', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +export function fetchExecutionProgress(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_执行进度_通过合同ID查_查询', + param: '合同ID=' + num + '=int' + } + }) +} +export function delList(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同信息管理_合同信息_删除_合同收款计划', + param: '合同ID=' + num + '=int' + } + }) +} +export function addList() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '基础表_合同信息表_增加数据_新_售后服务', + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + '&合同总额=' + arguments[12] + } + }) +} +export function fetchPersonnelID() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_营销人员_查询' + } + }) +} +export function executionProgressID() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_执行进度_查询' + } + }) +} +export function editchar() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同信息管理_合同信息_编辑', + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + '&合同总额=' + arguments[13] + } + }) +} +export function getTree() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_部门关系_查询节点', + param: '子节点=0=int' + } + }) +} +export function tree(data, pid) { + const result = [] + let temp + for (let i = 0; i < data.length; i++) { + if (data[i].父节点 === pid) { + const obj = { label: data[i].节点名称, id: data[i].子节点 } + temp = tree(data, data[i].子节点) + if (temp.length > 0) { + obj.children = temp + } + result.push(obj) + } + } + return result +} +export function getTablePeople(code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + code + '=int' + } + }) +} +export function fetchCustomerData(PageCurrent, PageSize, name) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: 1, + name: '创建合同_客户信息查询', + param: '客户名称=' + name + '=string', + Pagination: PageCurrent + '&' + PageSize + } + }) +} + +export function getFileData(projectNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同管理_文件路径_查询数据', + param: `项目流水号=${projectNum}` + } + }) +} +export function deleteFileData(id) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '合同管理_文件路径_删除数据', + param: `文件标识=${id}` + } + }) +} +export function selectMachine(code) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_机床名称_查询数据_通过项目流水号', + param: '项目流水号=' + code + } + }) +} +export function selectProvince() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '发货管理_省份查询' + } + }) +} +export function SelectMarketingManager() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=7' + } + }) +} +export function submitMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '创建合同_机床名称_增加数据', + param: '项目流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3] + } + }) +} +export function editMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '创建合同_机床名称_修改数据', + param: '机床流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3] + } + }) +} +export function delMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: 'PDM_机床名称_删除数据', + param: '机床流水号=' + arguments[0] + } + }) +} +export function money() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '合同信息管理_付款方式_查询' + } + }) +} +export function changeExecutionProgressID() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '创建合同_改变执行进度', + param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1] + '&进度完成日期=' + arguments[2] + } + }) +} +export function selectBidBond() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '投标保证金管理_投标保证金查询', + param: '保金类型_check=' + arguments[0] + '&保金类型=' + arguments[1] + '&投标人_check=' + arguments[2] + '&投标人=' + arguments[3] + '&招标企业_check=' + arguments[4] + '&招标企业=' + arguments[5] + '&开始日期_check=' + arguments[6] + '&开始日期=' + arguments[7] + '&结束日期_check=' + arguments[8] + '&结束日期=' + arguments[9] + } + }) +} +export function searchTime() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '创建合同_查询执行进度时间', + param: '项目流水号=' + arguments[0] + '&执行进度流水号=' + arguments[1] + } + }) +} +export function searchTimeAll() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '创建合同_查询执行进度时间_总', + param: '项目流水号=' + arguments[0] + } + }) +} +export function SelectPartment() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '选择营销经理_部门查询' + } + }) +} +export function SelectMarketingManager1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=' + num + } + }) +} +export function addMarketingManager(MarketingManagerId, AdressID) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '客户关系管理系统_营销经理_增加数据_MESWORK', + param: '营销经理流水号=' + MarketingManagerId + '&省份流水号=' + AdressID + '&导入类型=0=int=output' + } + }) +} diff --git a/src/assets/img/api/Outsourcing/ApprovalOfOutsourcingArrivalTicket.js b/src/assets/img/api/Outsourcing/ApprovalOfOutsourcingArrivalTicket.js new file mode 100644 index 00000000..7f9256f6 --- /dev/null +++ b/src/assets/img/api/Outsourcing/ApprovalOfOutsourcingArrivalTicket.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单_查询数据', + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&外协厂家_check=${group[6]}&外协厂家流水号=${group[7]}`, + Pagination: group[3] + '&' + group[4] + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 执行审批 +export function excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单_执行审批', + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}` + } + }) +} + diff --git a/src/api/Outsourcing/InterBudgetaryBudgets.js b/src/assets/img/api/Outsourcing/InterBudgetaryBudgets.js similarity index 100% rename from src/api/Outsourcing/InterBudgetaryBudgets.js rename to src/assets/img/api/Outsourcing/InterBudgetaryBudgets.js diff --git a/src/api/Outsourcing/OutFactoryMaintenance.js b/src/assets/img/api/Outsourcing/OutFactoryMaintenance.js similarity index 100% rename from src/api/Outsourcing/OutFactoryMaintenance.js rename to src/assets/img/api/Outsourcing/OutFactoryMaintenance.js diff --git a/src/assets/img/api/Outsourcing/OutsourcingArrivalTicket.js b/src/assets/img/api/Outsourcing/OutsourcingArrivalTicket.js new file mode 100644 index 00000000..08a94eb8 --- /dev/null +++ b/src/assets/img/api/Outsourcing/OutsourcingArrivalTicket.js @@ -0,0 +1,159 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单_增加数据', + param: `发票号=${num2}&发票金额=${num3}&外协厂家流水号=${num4}&已付款项=${num5}&尚欠金额=${num6}&税额=${num7}&是否费用类=${num8}&备注=${num9}` + } + }) +} + +// 初始化 外协厂商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_外协厂家_查询数据' + } + }) +} +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单_查询数据_到票申请', + param: `发票号_check=${group[0]}&发票号=${group[1]}`, + Pagination: group[2] + '&' + group[3] + } + }) +} +// 编辑发票结算申请单 +export function submitEdit(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单_修改数据', + param: `发票号=${group[0]}&发票金额=${group[1]}&已付款项=${group[2]}&尚欠金额=${group[3]}&税额=${group[4]}&是否费用类=${group[5]}&备注=${group[6]}&发票结算申请单流水号=${group[7]}` + } + }) +} +// 删除发票结算申请单 +export function submitDelete(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单_删除数据', + param: `发票结算申请单流水号=${group[0]}` + } + }) +} +// 提交申请 发票结算申请单 +export function submitApply(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单_提交申请', + param: `发票结算申请单流水号=${group[0]}&申请人=${group[1]}` + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 根据供应商查询外协任务 +export function searchPurchase(data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_外协任务_查询数据', + param: '外协厂家流水号_check=1&外协厂家流水号=' + data + } + }) +} +// 查询外协明细 +export function searchPurchaseDetail(data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_外协任务明细_查询数据', + param: '外协加工任务单流水号=' + data + } + }) +} + +// 发票结算申请单明细增加 +export function addTable2(data, group1, group2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单明细_增加数据', + param: '发票结算申请单流水号=' + data + '&外协明细流水号组=' + group1 + '&到票数量组=' + group2 + } + }) +} +// 发票结算申请单明细删除 +export function deleteTable2(data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单明细_删除数据', + param: '发票结算申请单明细流水号=' + data + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingDataMaintenance.js b/src/assets/img/api/Outsourcing/OutsourcingDataMaintenance.js similarity index 100% rename from src/api/Outsourcing/OutsourcingDataMaintenance.js rename to src/assets/img/api/Outsourcing/OutsourcingDataMaintenance.js diff --git a/src/api/Outsourcing/OutsourcingInspectionEntry.js b/src/assets/img/api/Outsourcing/OutsourcingInspectionEntry.js similarity index 100% rename from src/api/Outsourcing/OutsourcingInspectionEntry.js rename to src/assets/img/api/Outsourcing/OutsourcingInspectionEntry.js diff --git a/src/api/Outsourcing/OutsourcingPartsQuery.js b/src/assets/img/api/Outsourcing/OutsourcingPartsQuery.js similarity index 63% rename from src/api/Outsourcing/OutsourcingPartsQuery.js rename to src/assets/img/api/Outsourcing/OutsourcingPartsQuery.js index a3801c2c..7885d964 100644 --- a/src/api/Outsourcing/OutsourcingPartsQuery.js +++ b/src/assets/img/api/Outsourcing/OutsourcingPartsQuery.js @@ -17,7 +17,7 @@ export function getprocedure(processPlan, single) { }) } // 查询外协零件 -export function searchTable(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, pageSize, pageCurrent) { +export function searchTable(check, supplierNameValue, check1, MaterialsValue, check2, time1, time2, check3, Machine, check4, group, token, ID, pageSize, pageCurrent) { return request({ url: '', method: 'post', @@ -25,8 +25,8 @@ export function searchTable(check, supplierNameValue, check1, MaterialsValue, ch UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理_外协零件_查询数据_新', - param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + name: '车间生产管理_外协零件_查询数据_新_单序', + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue + '&时间_check=' + check2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&机床_check=' + check3 + '&机床=' + Machine + '&组号_check=' + check4 + '&组号=' + group + '&角色编号=' + token + '&人员编号=' + ID + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } @@ -56,3 +56,31 @@ export function search1() { } }) } +// 机床名称 +export function getMachines(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + num + '&人员编号=' + num1 + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/assets/img/api/Outsourcing/OutsourcingPaymentPlanManagement.js similarity index 100% rename from src/api/Outsourcing/OutsourcingPaymentPlanManagement.js rename to src/assets/img/api/Outsourcing/OutsourcingPaymentPlanManagement.js diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js b/src/assets/img/api/Outsourcing/OutsourcingPaymentPlanManagement2.js similarity index 100% rename from src/api/Outsourcing/OutsourcingPaymentPlanManagement2.js rename to src/assets/img/api/Outsourcing/OutsourcingPaymentPlanManagement2.js diff --git a/src/assets/img/api/Outsourcing/OutsourcingPaymentRequest.js b/src/assets/img/api/Outsourcing/OutsourcingPaymentRequest.js new file mode 100644 index 00000000..cfe8021d --- /dev/null +++ b/src/assets/img/api/Outsourcing/OutsourcingPaymentRequest.js @@ -0,0 +1,115 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询请款表 +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_请款_查询数据', + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&外协厂家流水号_check=${check2}&外协厂家流水号=${num}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 初始化 外协厂商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_基础表_外协厂家_查询数据' + } + }) +} +export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_请款_增加数据', + param: `外协加工任务单流水号组=${contractGroup}&合同总额组=${sumGroup}&外协厂家流水号=${supplier}&请款金额=${money}&请款人=${person}` + } + }) +} +// 查询离线合同待请款信息 +export function searchRequsetFundDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_外协任务_请款明细_查询数据', + param: `外协任务请款流水号=${num}` + } + }) +} +// 取消请款 +export function cancelRequestFund(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_请款_删除数据', + param: `外协任务请款流水号=${num}` + } + }) +} +// 查询离线合同待请款信息 +export function searchPurchaseContract(check, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_查询数据_请款', + param: `外协厂家流水号_check=${check}&外协厂家流水号=${num}&外协厂家名称_check=0` + } + }) +} +// 采购合同明细查询 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同明细_查询数据NEW', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同明细_成组采购_查询数据', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingPriceBudget.js b/src/assets/img/api/Outsourcing/OutsourcingPriceBudget.js similarity index 100% rename from src/api/Outsourcing/OutsourcingPriceBudget.js rename to src/assets/img/api/Outsourcing/OutsourcingPriceBudget.js diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/assets/img/api/Outsourcing/OutsourcingQCSearch.js similarity index 100% rename from src/api/Outsourcing/OutsourcingQCSearch.js rename to src/assets/img/api/Outsourcing/OutsourcingQCSearch.js diff --git a/src/api/Outsourcing/OutsourcingStatus.js b/src/assets/img/api/Outsourcing/OutsourcingStatus.js similarity index 100% rename from src/api/Outsourcing/OutsourcingStatus.js rename to src/assets/img/api/Outsourcing/OutsourcingStatus.js diff --git a/src/api/Outsourcing/OutsourcingTaskChanges.js b/src/assets/img/api/Outsourcing/OutsourcingTaskChanges.js similarity index 100% rename from src/api/Outsourcing/OutsourcingTaskChanges.js rename to src/assets/img/api/Outsourcing/OutsourcingTaskChanges.js diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/assets/img/api/Outsourcing/OutsourcingTaskExecution.js similarity index 90% rename from src/api/Outsourcing/OutsourcingTaskExecution.js rename to src/assets/img/api/Outsourcing/OutsourcingTaskExecution.js index 47dc8899..212fa132 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/assets/img/api/Outsourcing/OutsourcingTaskExecution.js @@ -59,7 +59,7 @@ export function getParts(Number) { } // 打回 -export function getBack(processPlan) { +export function getBack(processPlan, number) { return request({ url: '', method: 'post', @@ -68,12 +68,12 @@ export function getBack(processPlan) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_外协零件_打回', - param: '工艺计划流水号=' + processPlan + param: '工艺计划流水号=' + processPlan + '&外协数量=' + number } }) } // 选入零件 -export function insertParts(processNum, Number) { +export function insertParts(processNum, Number, outsourcingNumber) { return request({ url: '', method: 'post', @@ -82,7 +82,7 @@ export function insertParts(processNum, Number) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_外协加工任务单_选入_循环执行', - param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum + param: '外协加工任务单流水号=' + Number + '&工艺计划流水号组=' + processNum + '&外协数量组=' + outsourcingNumber } }) } @@ -101,7 +101,7 @@ export function getPrice(Number, money) { }) } // 成交 -export function editData1(Number, manufacturers, freight, Explain) { +export function editData1(Number, manufacturers, Group, money) { return request({ url: '', method: 'post', @@ -110,7 +110,7 @@ export function editData1(Number, manufacturers, freight, Explain) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0' + param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&外协加工任务单明细流水号组=' + Group + '&加工价格_成交组=' + money + '&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0' } }) } diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/assets/img/api/Outsourcing/OutsourcingTaskQuery.js similarity index 90% rename from src/api/Outsourcing/OutsourcingTaskQuery.js rename to src/assets/img/api/Outsourcing/OutsourcingTaskQuery.js index a77cbf97..913c9371 100644 --- a/src/api/Outsourcing/OutsourcingTaskQuery.js +++ b/src/assets/img/api/Outsourcing/OutsourcingTaskQuery.js @@ -17,7 +17,7 @@ export function shouhuo(num) { }) } // 初始化获取已生成的外协加工任务单初始化获取已生成的外协加工任务单 -export function getTable(checked, contractNumber, pageCurrent, pageSize) { +export function getTable(checked, contractNumber, check1, partNumber, pageCurrent, pageSize) { return request({ url: '', method: 'post', @@ -26,7 +26,7 @@ export function getTable(checked, contractNumber, pageCurrent, pageSize) { ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_外协执行_查询外协任务单', - param: '厂家或表单号_check=' + checked + '&厂家或表单号=' + contractNumber, + param: '厂家或表单号_check=' + checked + '&厂家或表单号=' + contractNumber + '&零件图号_check=' + check1 + '&零件图号=' + partNumber, Pagination: pageCurrent + '&' + pageSize } }) @@ -184,7 +184,7 @@ export function deleteData1(Number) { }) } // 零件到货 -export function Arrival(num1, Number, Num) { +export function Arrival(num1, Number, Num, state1) { return request({ url: '', method: 'post', @@ -193,12 +193,12 @@ export function Arrival(num1, Number, Num) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协零件_到货', - param: '外协加工任务单流水号=' + num1 + `&外协加工任务单明细流水号组=${Number}&工艺计划流水号组=${Num}` + param: '外协加工任务单流水号=' + num1 + '&外协加工任务单明细流水号组=' + Number + '&工艺计划流水号组=' + Num + '&分批状态组=' + state1 } }) } // 查询任务单明细 -export function getParts(Number) { +export function getParts(Number, check, part) { return request({ url: '', method: 'post', @@ -207,7 +207,7 @@ export function getParts(Number) { ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_外协加工任务单明细_查询数据', - param: '外协加工任务单流水号=' + Number + '=int' + param: '外协加工任务单流水号=' + Number + '=int' + '&零件图号_check=' + check + '&零件图号=' + part } }) } @@ -252,3 +252,16 @@ export function handlechange(Number, code) { } }) } +export function submitArrival(outsourcingMX, number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理_外协零件_分批到货', + param: '外协加工任务单明细流水号=' + outsourcingMX + '&到货数量=' + number + } + }) +} diff --git a/src/assets/img/api/Outsourcing/OutsourcingTaskQuerySearch.js b/src/assets/img/api/Outsourcing/OutsourcingTaskQuerySearch.js new file mode 100644 index 00000000..8d7d73c0 --- /dev/null +++ b/src/assets/img/api/Outsourcing/OutsourcingTaskQuerySearch.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化获取已生成的外协加工任务单 +export function getTable(checked, contractNumber, check, check1, num, num1, check2, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理_外协加工任务查询_查询数据', + param: '表单号_check=' + checked + '&表单号=' + contractNumber + '&查询历史_check=' + check + '&下达日期_check=' + check1 + '&任务下达开始时间=' + num + '&任务下达结束时间=' + num1 + '&零件图号_check=' + check2 + '&零件图号=' + part + } + }) +} +// 查询任务单明细 +export function getParts(Number, check2, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_外协任务查询_外协加工任务单明细_查询数据', + param: '外协加工任务单流水号=' + Number + '&零件图号_check=' + check2 + '&零件图号=' + part + } + }) +} diff --git a/src/assets/img/api/Outsourcing/OutsourcingTicketArrivalQuery.js b/src/assets/img/api/Outsourcing/OutsourcingTicketArrivalQuery.js new file mode 100644 index 00000000..8a5c8cb2 --- /dev/null +++ b/src/assets/img/api/Outsourcing/OutsourcingTicketArrivalQuery.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单查询_查询数据', + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&外协厂家_check=${group[6]}&外协厂家_流水号=${group[7]}`, + Pagination: group[3] + '&' + group[4] + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 撤回审批 +export function cancel(...data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_发票结算申请单_撤回审批', + param: `发票结算申请单流水号=${data[0]}&审批代号=${data[1]}` + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingTimeBalance.js b/src/assets/img/api/Outsourcing/OutsourcingTimeBalance.js similarity index 100% rename from src/api/Outsourcing/OutsourcingTimeBalance.js rename to src/assets/img/api/Outsourcing/OutsourcingTimeBalance.js diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/assets/img/api/Outsourcing/PreorderAssociation.js similarity index 85% rename from src/api/Outsourcing/PreorderAssociation.js rename to src/assets/img/api/Outsourcing/PreorderAssociation.js index 0d639e96..cfb2ffa0 100644 --- a/src/api/Outsourcing/PreorderAssociation.js +++ b/src/assets/img/api/Outsourcing/PreorderAssociation.js @@ -70,7 +70,7 @@ export function searchTable2(num1) { }) } // 序间外协状态更改 -export function edit(num1, num2) { +export function edit(num1, num2, num3) { return request({ url: '', method: 'post', @@ -79,11 +79,11 @@ export function edit(num1, num2) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_零件工序_修改数据_单序外协', - param: '工序流水号=' + num1 + '&工序间是否外协=' + num2 + param: '工序流水号=' + num1 + '&工序间是否外协=' + num2 + '&外协数量=' + num3 } }) } -export function edit2(num1, num2, num3) { +export function edit2(num1, num2, num3, num4) { return request({ url: '', method: 'post', @@ -92,7 +92,7 @@ export function edit2(num1, num2, num3) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_零件工艺计划_序间外协转换', - param: '工序流水号=' + num1 + '&工艺计划流水号=' + num2 + '&是否外协=' + num3 + param: '工序流水号=' + num1 + '&工艺计划流水号=' + num2 + '&是否外协=' + num3 + '&外协数量=' + num4 } }) } @@ -110,3 +110,17 @@ export function saveRowPrice(num1, price1, num2, price2, id) { } }) } +// 保存每行价格 +export function changeState(num1, procecss) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生成管理_外协状态_修改数据', + param: '工艺计划流水号=' + num1 + '&工序流水号=' + procecss + } + }) +} diff --git a/src/api/Outsourcing/UnqualifiedTreatment.js b/src/assets/img/api/Outsourcing/UnqualifiedTreatment.js similarity index 100% rename from src/api/Outsourcing/UnqualifiedTreatment.js rename to src/assets/img/api/Outsourcing/UnqualifiedTreatment.js diff --git a/src/api/ProjectManagement/progress.js b/src/assets/img/api/ProjectManagement/progress.js similarity index 100% rename from src/api/ProjectManagement/progress.js rename to src/assets/img/api/ProjectManagement/progress.js diff --git a/src/api/ProjectManagement/summarize.js b/src/assets/img/api/ProjectManagement/summarize.js similarity index 100% rename from src/api/ProjectManagement/summarize.js rename to src/assets/img/api/ProjectManagement/summarize.js diff --git a/src/api/PurchasingCenter/ArrivalStateSearch.js b/src/assets/img/api/PurchasingCenter/ArrivalStateSearch.js similarity index 100% rename from src/api/PurchasingCenter/ArrivalStateSearch.js rename to src/assets/img/api/PurchasingCenter/ArrivalStateSearch.js diff --git a/src/api/PurchasingCenter/BacklogGoodsAnalysis.js b/src/assets/img/api/PurchasingCenter/BacklogGoodsAnalysis.js similarity index 100% rename from src/api/PurchasingCenter/BacklogGoodsAnalysis.js rename to src/assets/img/api/PurchasingCenter/BacklogGoodsAnalysis.js diff --git a/src/api/PurchasingCenter/BacklogGoodsPrepare.js b/src/assets/img/api/PurchasingCenter/BacklogGoodsPrepare.js similarity index 100% rename from src/api/PurchasingCenter/BacklogGoodsPrepare.js rename to src/assets/img/api/PurchasingCenter/BacklogGoodsPrepare.js diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/assets/img/api/PurchasingCenter/CreateInquirySheet.js similarity index 82% rename from src/api/PurchasingCenter/CreateInquirySheet.js rename to src/assets/img/api/PurchasingCenter/CreateInquirySheet.js index bbb695a1..b6306d10 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/assets/img/api/PurchasingCenter/CreateInquirySheet.js @@ -323,7 +323,7 @@ export function saveOrder(num1, num2, num3) { ModularID: router.currentRoute.path, type: '2', name: '采购管理_询价单明细_保存数据', - param: `询价单明细流水号=${num1}&数量=${num2}&备注=${num3}` + param: `询价单明细流水号=${num1}&数量=${num2}&单价=${num3}` } }) } @@ -519,3 +519,115 @@ export function timeSearch() { } }) } +// 拆分基本件 +export function summitSplit(basicNumber, basicGroupNumber, id, partNumberGroup, partName1Group, partNumGroup, SpecificationsGroup, remarkGroup) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_基本件_拆分物料', + param: '基本件流水号=' + basicNumber + '&组件零件基本件流水号=' + basicGroupNumber + '&拆分人员=' + id + '&零件图号组=' + partNumberGroup + '&零件名称组=' + partName1Group + '&零件数量组=' + partNumGroup + '&规格组=' + SpecificationsGroup + '&备注组=' + remarkGroup + } + }) +} +// 查询拆分记录 +export function searchSplit(check, name, check1, machine, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_拆分记录_查询数据', + param: '名称_check=' + check + '&名称=' + name + '&机床_check=' + check1 + '&机床流水号=' + machine + '&人员编号=' + people + } + }) +} +// 撤销拆分 +export function submitRevoke(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_拆分记录_撤销拆分', + param: '基本件流水号=' + num + } + }) +} +// 拆分外购件 +export function summitSplit3(standardAndPurchaseValue, groupPartNumValue, id, partNumberGroup, partName1Group, partNumGroup, SpecificationsGroup, remarkGroup) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '采购管理_标准件和外购件_拆分物料', + param: '标准件和外购件流水号=' + standardAndPurchaseValue + '&组件零件流水号=' + groupPartNumValue + '&拆分人员=' + id + '&物料型号组=' + partNumberGroup + '&物料名称组=' + partName1Group + '&零件数量组=' + partNumGroup + '&物料规格组=' + SpecificationsGroup + '&备注组=' + remarkGroup + } + }) +} +// 查询外购件拆分记录 +export function searchSplit3(check, name, check1, machine, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_拆分记录_标准件和外购件_查询数据', + param: '名称_check=' + check + '&名称=' + name + '&机床_check=' + check1 + '&机床流水号=' + machine + '&人员编号=' + people + } + }) +} +// 撤销外购件拆分 +export function submitRevoke3(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_拆分记录_标准件和外购件_撤销拆分', + param: '标准件和外购件流水号=' + num + } + }) +} +// 查询外购件拆分记录详情 +export function searchPurchaseMx(number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_拆分记录_标准件和外购件_查询数据_详情', + param: '标准件和外购件流水号=' + number + } + }) +} +// 查询基本件拆分记录详情 +export function searchBasicMx(number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_拆分记录_查询数据_详情', + param: '基本件流水号=' + number + } + }) +} diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/assets/img/api/PurchasingCenter/CreatePurchaseContract.js similarity index 90% rename from src/api/PurchasingCenter/CreatePurchaseContract.js rename to src/assets/img/api/PurchasingCenter/CreatePurchaseContract.js index a32fe149..fcd34b9c 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/assets/img/api/PurchasingCenter/CreatePurchaseContract.js @@ -22,10 +22,9 @@ export function initSupplier11(num) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '3', - name: ` SELECT distinct 供应商流水号,供应商名称 - FROM 采购管理_询价单_视图_新 - where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` + type: '1', + name: '采购管理_采购合同_供应商_查询数据', + param: '采购员流水号=' + num } }) } @@ -98,6 +97,20 @@ export function savePrice(price, num1, num2, num3, num4, num5) { } }) } +// 实时保存单价 +export function pricechange1(price, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: `采购管理_优惠修改单价`, + param: '单价=' + price + '&询价单明细流水号=' + num1 + } + }) +} // 实时保存备注 export function saveRemark(price, num1, num2, num3, num4, num5) { return request({ diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/assets/img/api/PurchasingCenter/FundApproval.js similarity index 100% rename from src/api/PurchasingCenter/FundApproval.js rename to src/assets/img/api/PurchasingCenter/FundApproval.js diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/assets/img/api/PurchasingCenter/InvoiceSettlementApplication.js similarity index 100% rename from src/api/PurchasingCenter/InvoiceSettlementApplication.js rename to src/assets/img/api/PurchasingCenter/InvoiceSettlementApplication.js diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/assets/img/api/PurchasingCenter/InvoiceSettlementApprove.js similarity index 100% rename from src/api/PurchasingCenter/InvoiceSettlementApprove.js rename to src/assets/img/api/PurchasingCenter/InvoiceSettlementApprove.js diff --git a/src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js b/src/assets/img/api/PurchasingCenter/InvoiceSettlementApproveSearch.js similarity index 100% rename from src/api/PurchasingCenter/InvoiceSettlementApproveSearch.js rename to src/assets/img/api/PurchasingCenter/InvoiceSettlementApproveSearch.js diff --git a/src/api/PurchasingCenter/MaterialMProcure.js b/src/assets/img/api/PurchasingCenter/MaterialMProcure.js similarity index 89% rename from src/api/PurchasingCenter/MaterialMProcure.js rename to src/assets/img/api/PurchasingCenter/MaterialMProcure.js index 9d77b58c..05995c38 100644 --- a/src/api/PurchasingCenter/MaterialMProcure.js +++ b/src/assets/img/api/PurchasingCenter/MaterialMProcure.js @@ -258,3 +258,31 @@ export function deleteVariety(MaterialVarietyNum) { } }) } + +export function conform(MaterialVariety, MaterialName, FullNameOfMaterial, MaterialSpecification, MaterialModel, MeasurementUnitValue, MaterialSourceValue, supplierValue1, paerNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '库存管理_物料主文件_基本_采购部_编辑数据', + param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + '&物料流水号=' + paerNumber + } + }) +} + +export function reflesh(paerNumber) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '库存管理_物料主文件_基本_采购部_重新提交', + param: '物料流水号=' + paerNumber + } + }) +} diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/assets/img/api/PurchasingCenter/MaterialManagement.js similarity index 100% rename from src/api/PurchasingCenter/MaterialManagement.js rename to src/assets/img/api/PurchasingCenter/MaterialManagement.js diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/assets/img/api/PurchasingCenter/OfflineContract.js similarity index 100% rename from src/api/PurchasingCenter/OfflineContract.js rename to src/assets/img/api/PurchasingCenter/OfflineContract.js diff --git a/src/api/PurchasingCenter/OfflineContractRequestFund.js b/src/assets/img/api/PurchasingCenter/OfflineContractRequestFund.js similarity index 100% rename from src/api/PurchasingCenter/OfflineContractRequestFund.js rename to src/assets/img/api/PurchasingCenter/OfflineContractRequestFund.js diff --git a/src/api/PurchasingCenter/OfflineContractSearch.js b/src/assets/img/api/PurchasingCenter/OfflineContractSearch.js similarity index 100% rename from src/api/PurchasingCenter/OfflineContractSearch.js rename to src/assets/img/api/PurchasingCenter/OfflineContractSearch.js diff --git a/src/api/PurchasingCenter/OfflinePartsQuery.js b/src/assets/img/api/PurchasingCenter/OfflinePartsQuery.js similarity index 100% rename from src/api/PurchasingCenter/OfflinePartsQuery.js rename to src/assets/img/api/PurchasingCenter/OfflinePartsQuery.js diff --git a/src/api/PurchasingCenter/PayStateSearch.js b/src/assets/img/api/PurchasingCenter/PayStateSearch.js similarity index 100% rename from src/api/PurchasingCenter/PayStateSearch.js rename to src/assets/img/api/PurchasingCenter/PayStateSearch.js diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/assets/img/api/PurchasingCenter/ProjectTotalSearch.js similarity index 90% rename from src/api/PurchasingCenter/ProjectTotalSearch.js rename to src/assets/img/api/PurchasingCenter/ProjectTotalSearch.js index d2320294..78d45f83 100644 --- a/src/api/PurchasingCenter/ProjectTotalSearch.js +++ b/src/assets/img/api/PurchasingCenter/ProjectTotalSearch.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 初始化项目 -export function initProject() { +export function initProject(role, personnel) { return request({ url: '', method: 'post', @@ -11,7 +11,8 @@ export function initProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' + name: 'PDM_项目名称_综合查询', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } diff --git a/src/api/PurchasingCenter/PurchaseContractApproval.js b/src/assets/img/api/PurchasingCenter/PurchaseContractApproval.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseContractApproval.js rename to src/assets/img/api/PurchasingCenter/PurchaseContractApproval.js diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/assets/img/api/PurchasingCenter/PurchaseContractRequestFund.js similarity index 94% rename from src/api/PurchasingCenter/PurchaseContractRequestFund.js rename to src/assets/img/api/PurchasingCenter/PurchaseContractRequestFund.js index 2ba804c3..471440d2 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/assets/img/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -57,6 +57,19 @@ export function searchSupplier() { } }) } +// 查询供应商(请款) +export function searchSupplierRequest() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购合同_查询数据_请款' + } + }) +} // 采购合同请款 export function submitRequestFund(contractGroup, offGroup, sumGroup, supplier, money, person) { return request({ diff --git a/src/api/PurchasingCenter/PurchaseContractReview.js b/src/assets/img/api/PurchasingCenter/PurchaseContractReview.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseContractReview.js rename to src/assets/img/api/PurchasingCenter/PurchaseContractReview.js diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/assets/img/api/PurchasingCenter/PurchaseContractSearch.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseContractSearch.js rename to src/assets/img/api/PurchasingCenter/PurchaseContractSearch.js diff --git a/src/api/PurchasingCenter/PurchaseInvoiceDelivery.js b/src/assets/img/api/PurchasingCenter/PurchaseInvoiceDelivery.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseInvoiceDelivery.js rename to src/assets/img/api/PurchasingCenter/PurchaseInvoiceDelivery.js diff --git a/src/api/PurchasingCenter/PurchaseMaterielModify.js b/src/assets/img/api/PurchasingCenter/PurchaseMaterielModify.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseMaterielModify.js rename to src/assets/img/api/PurchasingCenter/PurchaseMaterielModify.js diff --git a/src/assets/img/api/PurchasingCenter/PurchaseSituationSearch.js b/src/assets/img/api/PurchasingCenter/PurchaseSituationSearch.js new file mode 100644 index 00000000..2dcecc2b --- /dev/null +++ b/src/assets/img/api/PurchasingCenter/PurchaseSituationSearch.js @@ -0,0 +1,216 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化机床项目 +export function initMachineProject(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 查询表1标准件和外购件 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[18]}&排序名称=${params[19]}&角色编号=${params[20]}&营销经理流水号=${params[21]}&PageCount=1=int=output&ItemCount=1=int=output` + // Pagination: params[4] + '&' + params[5] + } + }) +} +// 查询表1标准件和外购件分配数量 +export function searchTable1Count(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ_分配数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&角色编号=${params[18]}&营销经理流水号=${params[19]}` + } + }) +} +// 查询表1标准件和外购件采购数量 +export function searchTable1Count1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ_采购数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&供应商_check=${params[16]}&供应商=${params[17]}&角色编号=${params[18]}&营销经理流水号=${params[19]}` + } + }) +} +// 查询表1基本件 +export function searchTable2(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&排序方式=${params[17]}&排序名称=${params[18]}&角色编号=${params[20]}&营销经理流水号=${params[21]}&PageCount=1=int=output&ItemCount=1=int=output` + // Pagination: params[4] + '&' + params[5] + } + }) +} +// 查询表1基本件 +export function searchTable2Count(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ_分配数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&角色编号=${params[17]}&营销经理流水号=${params[18]}` + } + }) +} +// 查询表1基本件 +export function searchTable2Count1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ_采购数量', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&供应商_check=${params[15]}&供应商=${params[16]}&角色编号=${params[17]}&营销经理流水号=${params[18]}` + } + }) +} +// 查询表1标准件和外购件无分页 +export function searchTable1Export(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}&时间_check=${params[5]}&开始时间=${params[6]}&结束时间=${params[7]}` + } + }) +} +// 查询表1基本件无分页 +export function searchTable2Export(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&时间_check=${params[4]}&开始时间=${params[5]}&结束时间=${params[6]}` + } + }) +} +// 查询入库记录 +export function searchInData(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购件查询_入库_查询数据', + param: `采购合同明细流水号=${params[0]}` + } + }) +} +// 查询入库记录 +export function searchInData1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购件查询_入库_查询数据_离线', + param: `离线合同明细流水号=${params[0]}` + } + }) +} +// 查询出库记录 +export function searchOutData1(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购件查询_出库_查询数据_离线', + param: `离线合同明细流水号=${params[0]}` + } + }) +} +// 查询出库记录 +export function searchOutData(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购件查询_出库_查询数据_外购件', + param: `标准件和外购件流水号=${params[0]}` + } + }) +} +// 查询出库记录 +export function searchOutData2(...params) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购件查询_出库_查询数据_基本件', + param: `组件零件基本件流水号=${params[0]}` + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/assets/img/api/PurchasingCenter/PurchaseTaskAllocate.js similarity index 100% rename from src/api/PurchasingCenter/PurchaseTaskAllocate.js rename to src/assets/img/api/PurchasingCenter/PurchaseTaskAllocate.js diff --git a/src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js b/src/assets/img/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js similarity index 100% rename from src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js rename to src/assets/img/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/assets/img/api/PurchasingCenter/ReceiveCheck.js similarity index 92% rename from src/api/PurchasingCenter/ReceiveCheck.js rename to src/assets/img/api/PurchasingCenter/ReceiveCheck.js index a84e067d..953e899c 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/assets/img/api/PurchasingCenter/ReceiveCheck.js @@ -80,8 +80,7 @@ export function getMachines() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_传递后_机床名称_根据机床查询', - param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + name: 'PDM_机床名称_查询数据_查询全部' } }) } diff --git a/src/api/PurchasingCenter/SetPayPlan.js b/src/assets/img/api/PurchasingCenter/SetPayPlan.js similarity index 100% rename from src/api/PurchasingCenter/SetPayPlan.js rename to src/assets/img/api/PurchasingCenter/SetPayPlan.js diff --git a/src/api/PurchasingCenter/SupplierManagement.js b/src/assets/img/api/PurchasingCenter/SupplierManagement.js similarity index 100% rename from src/api/PurchasingCenter/SupplierManagement.js rename to src/assets/img/api/PurchasingCenter/SupplierManagement.js diff --git a/src/assets/img/api/TechnologyCenter/AllocationOfMachineComponents.js b/src/assets/img/api/TechnologyCenter/AllocationOfMachineComponents.js new file mode 100644 index 00000000..0bd3bfff --- /dev/null +++ b/src/assets/img/api/TechnologyCenter/AllocationOfMachineComponents.js @@ -0,0 +1,95 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床信息_查询数据' + } + }) +} +export function gettable(num, num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床组件_分配情况_查询', + param: '机床流水号=' + num + '&是否分配=' + num1 + } + }) +} + +export function getPerson() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员与角色_查询数据_技术员' + } + }) +} + +export function allocatetask(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '机床组件_分配任务', + param: '组件流水号组=' + num + '&设计员=' + num1 + '&分配人=' + num2 + } + }) +} +export function executereturn(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '机床组件_撤回分配', + param: '组件流水号组=' + num + } + }) +} +export function getMachineTime(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床信息_查询数据_获取审图时间', + param: '机床流水号=' + num + } + }) +} +export function updateMachineTime(num, time1, time2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '机床信息_查询数据_修改审图时间', + param: '机床流水号=' + num + '&审图实际开始时间=' + time1 + '&审图实际完成时间=' + time2 + } + }) +} diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/assets/img/api/TechnologyCenter/CreatePackingList.js similarity index 100% rename from src/api/TechnologyCenter/CreatePackingList.js rename to src/assets/img/api/TechnologyCenter/CreatePackingList.js diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/assets/img/api/TechnologyCenter/ImportParts.js similarity index 75% rename from src/api/TechnologyCenter/ImportParts.js rename to src/assets/img/api/TechnologyCenter/ImportParts.js index e83d9c34..37bde08a 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/assets/img/api/TechnologyCenter/ImportParts.js @@ -44,7 +44,7 @@ export function updateNum(num, id) { }) } // 替换验证 -export function verification(num, project, machine, group) { +export function verification(num, project, label, machine, group) { return request({ url: '', method: 'post', @@ -53,7 +53,7 @@ export function verification(num, project, machine, group) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_数据导入保存_更改物料流水号_验证', - param: `物料流水号=${num}&项目=${project}&机床=${machine}&组号=${group}` + param: `物料流水号=${num}&项目=${project}&项目编号=${label}&机床=${machine}&组号=${group}` } }) } @@ -70,6 +70,45 @@ export function isExit1(projectNum, machineNum, groupNum) { } }) } +export function isExit2(projectNum, machineNum, groupNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '组件明细表_基本件_导入数据_校验部件数量', + param: `项目流水号=${projectNum}&机床图号=${machineNum}&组号=${groupNum}` + } + }) +} +export function isExit3(projectNum, machineNum, groupNum, people) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '组件明细表_基本件_导入数据_校验导入人员', + param: `项目流水号=${projectNum}&机床图号=${machineNum}&组号=${groupNum}&人员编号=${people}` + } + }) +} +export function isExit4(projectNum) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '组件明细表_基本件_导入数据_判断是否自家项目', + param: `项目流水号=${projectNum}` + } + }) +} export function isDrawingNum(projectName, machineNum, groupNum, drawingNum) { return request({ url: '', @@ -83,7 +122,7 @@ export function isDrawingNum(projectName, machineNum, groupNum, drawingNum) { } }) } -export function update(projectName, machineNum, id, type, drawingNum) { +export function update(projectName, label, machineNum, id, type, drawingNum) { return request({ url: '', method: 'post', @@ -92,7 +131,7 @@ export function update(projectName, machineNum, id, type, drawingNum) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_基本件_数据导入保存_编辑整改类型', - param: `项目名称=${projectName}&机床名称=${machineNum}&id=${id}&整改类型=${type}&前图号或者型号=${drawingNum}` + param: `项目名称=${projectName}&项目编号=${label}&机床名称=${machineNum}&id=${id}&整改类型=${type}&前图号或者型号=${drawingNum}` } }) } @@ -109,7 +148,7 @@ export function update1(id, type) { } }) } -export function searchOldParts(projectName, machineNum, drawingNum) { +export function searchOldParts(projectName, label, machineNum, drawingNum) { return request({ url: '', method: 'post', @@ -118,11 +157,11 @@ export function searchOldParts(projectName, machineNum, drawingNum) { ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_整改件_数据关联查询_gj', - param: `项目名称=${projectName}&机床名称=${machineNum}&图号或者型号=${drawingNum}` + param: `项目名称=${projectName}&项目编号=${label}&机床名称=${machineNum}&图号或者型号=${drawingNum}` } }) } -export function importBasics(establishment, proofread, review, date, projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { +export function importBasics(establishment, proofread, review, date, projectName, label, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { return request({ url: '', method: 'post', @@ -131,7 +170,7 @@ export function importBasics(establishment, proofread, review, date, projectName ModularID: router.currentRoute.path, type: '2', name: '组件明细表_基本件_导入数据gj', - param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output` + param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&项目编号=${label}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output` } }) } @@ -148,7 +187,7 @@ export function importTotal(establishment, projectName, machineNum, machineName, } }) } -export function importPurcharse(establishment, proofread, review, date, projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { +export function importPurcharse(establishment, proofread, review, date, projectName, label, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode) { return request({ url: '', method: 'post', @@ -157,12 +196,12 @@ export function importPurcharse(establishment, proofread, review, date, projectN ModularID: router.currentRoute.path, type: '2', name: '零件明细表_外购件和标准件_导入数据gj', - param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output` + param: `编制=${establishment}&校对=${proofread}&审核=${review}&日期=${date}&项目=${projectName}&项目编号=${label}&机床=${machineNum}&设备名称=${machineName}&部件名称=${componentName}&部件数量=${componentNum}&组号=${groupNum}&合同编号=${contractNum}&合计页码=${totalNum}&页码=${pageNum}&图号=${drawingNum}&名称=${name}&规格\\=${type}&材料=${material}&备件数量=${spareNum}&装机数量=${useNum}&制造商=${manufacturer}&备注\\=${remarks}&分类码=${classificationCode}&导入类型=0=int=output` } }) } -export function specificationQuery(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function specificationQuery(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -171,11 +210,11 @@ export function specificationQuery(projectCheck, project, machineCheck, machine, ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_基本件_规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function specificationQuery1(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function specificationQuery1(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -184,11 +223,11 @@ export function specificationQuery1(projectCheck, project, machineCheck, machine ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_整改件_规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function specificationQueryWB(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function specificationQueryWB(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -197,11 +236,11 @@ export function specificationQueryWB(projectCheck, project, machineCheck, machin ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function specificationQueryWB1(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function specificationQueryWB1(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -210,11 +249,11 @@ export function specificationQueryWB1(projectCheck, project, machineCheck, machi ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_整改件_规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function unSpecificationQuery(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function unSpecificationQuery(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -223,11 +262,11 @@ export function unSpecificationQuery(projectCheck, project, machineCheck, machin ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_基本件_不规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function unSpecificationQuery1(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function unSpecificationQuery1(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -236,11 +275,11 @@ export function unSpecificationQuery1(projectCheck, project, machineCheck, machi ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_整改件_不规范数据查询_gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function unSpecificationQueryWB(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function unSpecificationQueryWB(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -249,11 +288,11 @@ export function unSpecificationQueryWB(projectCheck, project, machineCheck, mach ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_不规范数据查询gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } -export function unSpecificationQueryWB1(projectCheck, project, machineCheck, machine, groupCheck, group) { +export function unSpecificationQueryWB1(projectCheck, project, label, machineCheck, machine, groupCheck, group) { return request({ url: '', method: 'post', @@ -262,7 +301,7 @@ export function unSpecificationQueryWB1(projectCheck, project, machineCheck, mac ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_外购件和标准件_整改件_不规范数据查询gj', - param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` + param: `项目名字_check=${projectCheck}&项目名字=${project}&项目编号=${label}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}` } }) } @@ -407,7 +446,7 @@ export function searchGroupNum1(project, name) { }) } // 一键删除 -export function allDelete(project, machine, group) { +export function allDelete(project, label, machine, group) { return request({ url: '', method: 'post', @@ -416,7 +455,7 @@ export function allDelete(project, machine, group) { ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_一键删除', - param: `项目=${project}&机床=${machine}&组号=${group}` + param: `项目=${project}&项目编号=${label}&机床=${machine}&组号=${group}` } }) } diff --git a/src/api/TechnologyCenter/PartDrawingMaintenance.js b/src/assets/img/api/TechnologyCenter/PartDrawingMaintenance.js similarity index 100% rename from src/api/TechnologyCenter/PartDrawingMaintenance.js rename to src/assets/img/api/TechnologyCenter/PartDrawingMaintenance.js diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/assets/img/api/TechnologyCenter/QueryParts.js similarity index 76% rename from src/api/TechnologyCenter/QueryParts.js rename to src/assets/img/api/TechnologyCenter/QueryParts.js index 4b7fd395..671985eb 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/assets/img/api/TechnologyCenter/QueryParts.js @@ -13,7 +13,7 @@ import router from '@/router' // }) // } -export function machineSelect() { +export function machineSelect(role, personnel) { return request({ url: '', method: 'post', @@ -21,7 +21,8 @@ export function machineSelect() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel } }) } @@ -40,7 +41,7 @@ export function groupSelect(machineValue) { }) } -export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) { +export function basicPartsData(machine_check, machine, group_check, group, Model_check, ModelValue, person_check, personValue, time_check, inTime0, inTime1, pageSize, pageCurrent) { return request({ url: '', method: 'post', @@ -49,7 +50,7 @@ export function basicPartsData(machine_check, machine, group_check, group, Model ModularID: router.currentRoute.path, type: '1', name: 'PDM_零件明细表_基本件_查询数据_综合gj', - param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`, + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&导入人_check=${person_check}&导入人=${personValue}&导入日期_check=${time_check}&开始时间=${inTime0}&结束时间=${inTime1}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -68,7 +69,7 @@ export function searchModel(machine_check, machine, group_check, group) { } }) } -export function purchasePartsData(machine_check, machine, group_check, group, Model_check, ModelValue, pageSize, pageCurrent) { +export function purchasePartsData(machine_check, machine, group_check, group, Model_check, ModelValue, person_check, personValue, time_check, inTime0, inTime1, pageSize, pageCurrent) { return request({ url: '', method: 'post', @@ -78,7 +79,7 @@ export function purchasePartsData(machine_check, machine, group_check, group, Mo type: '1', name: 'PDM_零件明细表_标准件和外购件_查询数据', // param: `组件流水号=${num}`, - param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}`, + param: `机床流水号_check=${machine_check}&机床流水号=${machine}&组件流水号_check=${group_check}&组件流水号=${group}&规格_check=${Model_check}&规格=${ModelValue}&导入人_check=${person_check}&导入人=${personValue}&导入日期_check=${time_check}&开始时间=${inTime0}&结束时间=${inTime1}`, pagination: pageCurrent + '&' + pageSize } }) @@ -122,3 +123,15 @@ export function getFileData(MachineDrawValue) { } }) } +export function getperson() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '三表导入_人员查询' + } + }) +} diff --git a/src/assets/img/api/TechnologyCenter/StatisticsOfRectificationItems.js b/src/assets/img/api/TechnologyCenter/StatisticsOfRectificationItems.js new file mode 100644 index 00000000..a2df73ec --- /dev/null +++ b/src/assets/img/api/TechnologyCenter/StatisticsOfRectificationItems.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +export function searchtable(check1, dateRange0, dateRange1, check2, machineValue, check3, partsValue, check4, changeValue, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_整改件合并查询_查询数据', + param: `整改时间_check=${check1}&开始时间=${dateRange0}&结束时间=${dateRange1}&机床流水号_check=${check2}&机床流水号=${machineValue}&零件图号_check=${check3}&零件图号=${partsValue}&整改类型_check=${check4}&整改类型=${changeValue}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function getmachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_整改件合并查询_查询机床' + } + }) +} diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/assets/img/api/WorkshopProcurement/AccountingPrice.js similarity index 56% rename from src/api/WorkshopProcurement/AccountingPrice.js rename to src/assets/img/api/WorkshopProcurement/AccountingPrice.js index 8d681945..ce9ce439 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/assets/img/api/WorkshopProcurement/AccountingPrice.js @@ -3,7 +3,7 @@ import state from '@/store' import router from '@/router' // 初始化合同 -export function initPayState() { +export function initPayState(num) { return request({ url: '', method: 'post', @@ -11,7 +11,21 @@ export function initPayState() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间采购管理_采购合同_查询' + name: '车间采购管理_采购合同_查询_核算价格', + param: '供应商流水号=' + num + } + }) +} +// 初始化供应商 +export function initSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同_供应商查询' } }) } @@ -30,6 +44,20 @@ export function searchParts(pageCurrent, pageSize, check1, num) { } }) } +// 查询总额 +export function searchMoney(check1, num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_核算价格_查询数据_获取总价', + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}` + } + }) +} // 保存 export function Preservation(id, num) { return request({ diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/assets/img/api/WorkshopProcurement/ArrivalStateSearch.js similarity index 100% rename from src/api/WorkshopProcurement/ArrivalStateSearch.js rename to src/assets/img/api/WorkshopProcurement/ArrivalStateSearch.js diff --git a/src/api/WorkshopProcurement/ContractApprovalQuery2.js b/src/assets/img/api/WorkshopProcurement/ContractApprovalQuery2.js similarity index 80% rename from src/api/WorkshopProcurement/ContractApprovalQuery2.js rename to src/assets/img/api/WorkshopProcurement/ContractApprovalQuery2.js index 49f9bfd2..f2cea718 100644 --- a/src/api/WorkshopProcurement/ContractApprovalQuery2.js +++ b/src/assets/img/api/WorkshopProcurement/ContractApprovalQuery2.js @@ -44,3 +44,18 @@ export function searchTable2(num) { } }) } + +// 合同审批撤回 +export function cancelapproval(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_合同审批撤回', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingProcurementContracts.js b/src/assets/img/api/WorkshopProcurement/CreatingProcurementContracts.js similarity index 89% rename from src/api/WorkshopProcurement/CreatingProcurementContracts.js rename to src/assets/img/api/WorkshopProcurement/CreatingProcurementContracts.js index 1b2e261b..d74d242d 100644 --- a/src/api/WorkshopProcurement/CreatingProcurementContracts.js +++ b/src/assets/img/api/WorkshopProcurement/CreatingProcurementContracts.js @@ -28,6 +28,19 @@ export function initPurchaseOrder() { } }) } +export function searchContract(check, part) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_基本件采购_请购单_通过零件查询数据', + param: '零件图号_check=' + check + '&零件图号=' + part + } + }) +} export function initGroupNum(machineValue) { return request({ url: '', @@ -173,3 +186,16 @@ export function unLinkGroup(num) { } }) } +export function changeTime(num, time) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间管理_基本件采购_请购单明细_编辑数据_整体', + param: '请购单流水号=' + num + '&物料计划到货时间=' + time + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/assets/img/api/WorkshopProcurement/CreatingPurchasingMaterials.js similarity index 92% rename from src/api/WorkshopProcurement/CreatingPurchasingMaterials.js rename to src/assets/img/api/WorkshopProcurement/CreatingPurchasingMaterials.js index ca96b60f..c2c3299e 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/assets/img/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -47,22 +47,8 @@ export function saveWeight(num1, num2, num3, num4, num8) { } // ////////////////////////////////////////////////////////////////////////////////0529新加↑ -// 查询外购备料列表 -export function initPartDrawing(check1, name) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '备料管理_外购备料_查询数据', - param: `零件图号_check=${check1}&零件图号=${name}` - } - }) -} // 查询外购备料 -export function searchPurchasedMaterials(check1, name, order, partName) { +export function searchPurchasedMaterials(check1, name, check2, material, order, partName) { return request({ url: '', method: 'post', @@ -71,7 +57,7 @@ export function searchPurchasedMaterials(check1, name, order, partName) { ModularID: router.currentRoute.path, type: '1', name: '备料管理_外购备料_查询数据', - param: `零件图号_check=${check1}&零件图号=${name}&排序名称=${partName}&排序方式=${order}` + param: `零件图号_check=${check1}&零件图号=${name}&材料_check=${check2}&材料=${material}&排序名称=${partName}&排序方式=${order}` } }) } @@ -91,7 +77,7 @@ export function searchPurchaseOrder(check1, num, check2, name, check3, name2, ch }) } // 创建采购单 -export function addPurchaseOrder(PurchaseOrderName, supplier, person, date) { +export function addPurchaseOrder(PurchaseOrderName, supplier, person, date, money) { return request({ url: '', method: 'post', @@ -100,12 +86,12 @@ export function addPurchaseOrder(PurchaseOrderName, supplier, person, date) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_采购计划_增加数据', - param: `采购单名称=${PurchaseOrderName}&采购员=${person}&供应商=${supplier}&计划完成日期=${date}` + param: `采购单名称=${PurchaseOrderName}&采购员=${person}&供应商=${supplier}&计划完成日期=${date}&预付款=${money}` } }) } // 编辑采购单 -export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier, date) { +export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier, date, money) { return request({ url: '', method: 'post', @@ -114,7 +100,7 @@ export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, sup ModularID: router.currentRoute.path, type: '2', name: '备料管理_采购计划_编辑数据', - param: `采购计划流水号=${PurchaseOrderNameValue}&采购单名称=${PurchaseOrderName}&供应商=${supplier}&计划完成日期=${date}` + param: `采购计划流水号=${PurchaseOrderNameValue}&采购单名称=${PurchaseOrderName}&供应商=${supplier}&计划完成日期=${date}&预付款=${money}` } }) } diff --git a/src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js b/src/assets/img/api/WorkshopProcurement/DepartmentBuyerRequestFund.js similarity index 100% rename from src/api/WorkshopProcurement/DepartmentBuyerRequestFund.js rename to src/assets/img/api/WorkshopProcurement/DepartmentBuyerRequestFund.js diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/assets/img/api/WorkshopProcurement/FundApproval.js similarity index 53% rename from src/api/WorkshopProcurement/FundApproval.js rename to src/assets/img/api/WorkshopProcurement/FundApproval.js index 86f775a7..4100511e 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/assets/img/api/WorkshopProcurement/FundApproval.js @@ -17,6 +17,20 @@ export function initApproval(pageCurrent, pageSize, state2) { } }) } +export function initApprovalOutsourcing(pageCurrent, pageSize, state2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_审批付款_查询数据', + param: `审批_付款状态=${state2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} // 执行审批/付款 export function execApproval(num1, num2, reason, person, state2) { return request({ @@ -59,6 +73,19 @@ export function searchRequsetFundDetail3(num) { } }) } +export function searchRequsetFundDetail4(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '外协管理_外协任务_请款明细_查询数据', + param: `外协任务请款流水号=${num}` + } + }) +} // 执行车间合同审批/付款 export function execApproval1(num1, num2, reason, person, state2) { return request({ @@ -88,7 +115,6 @@ export function initApprovalOffline(pageCurrent, pageSize, state2) { } }) } -// 查询离线合同请款信息明细 export function searchRequsetFundDetail(num) { return request({ url: '', @@ -97,8 +123,8 @@ export function searchRequsetFundDetail(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间采购管理_离线合同_请款明细_查询数据', - param: `离线合同请款流水号=${num}` + name: '车间采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` } }) } @@ -159,3 +185,128 @@ export function execMaterials(num1, num2, reason, person, state2) { } }) } +// 执行审批/付款（外协） +export function execOutsourcing(num1, num2, reason, person, state2) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '外协管理_审批付款_修改数据', + param: `外协任务请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state2}` + } + }) +} +// 采购合同明细查询 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_车间采购_合同请款_采购件查询', + param: '采购合同流水号=' + num + } + }) +} +// 采购合同明细查询 +export function searchTable3(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同明细_成组采购_查询数据', + param: '采购合同流水号=' + num + } + }) +} +// 查询任务单明细 +export function getParts(Number) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_外协任务执行_外协加工任务单明细_查询数据', + param: '外协加工任务单流水号=' + Number + } + }) +} +// 发票明细查询 +export function searchInvoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票明细_查询数据', + param: '发票流水号=' + num + } + }) +} +// 查询采购计划明细 +export function searchTable5(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_到货单明细查询_新', + param: `到货单流水号=${num}` + } + }) +} +export function searchTable6(num1) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_关联材料_查询数据_新', + param: `到货单明细流水号=${num1}` + } + }) +} +// 查询采购计划明细 +export function searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_采购计划明细_查询数据', + param: `采购计划流水号=${num}` + } + }) +} +// 查询材料 +export function searchMX(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_离线采购计划明细_查询数据', + param: '离线采购计划流水号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js b/src/assets/img/api/WorkshopProcurement/InvoiceSettlementApplication1.js similarity index 99% rename from src/api/WorkshopProcurement/InvoiceSettlementApplication1.js rename to src/assets/img/api/WorkshopProcurement/InvoiceSettlementApplication1.js index 4f45b47c..b0278d51 100644 --- a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js +++ b/src/assets/img/api/WorkshopProcurement/InvoiceSettlementApplication1.js @@ -38,7 +38,7 @@ export function searchTable1(...group) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间采购管理_发票结算申请单_查询数据', + name: '车间采购管理_发票结算申请单_查询数据_到票申请', param: `发票号_check=${group[0]}&发票号=${group[1]}`, Pagination: group[2] + '&' + group[3] } diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js b/src/assets/img/api/WorkshopProcurement/InvoiceSettlementApprove1.js similarity index 100% rename from src/api/WorkshopProcurement/InvoiceSettlementApprove1.js rename to src/assets/img/api/WorkshopProcurement/InvoiceSettlementApprove1.js diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js b/src/assets/img/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js similarity index 100% rename from src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js rename to src/assets/img/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js diff --git a/src/api/WorkshopProcurement/InvoiceStateSearch.js b/src/assets/img/api/WorkshopProcurement/InvoiceStateSearch.js similarity index 100% rename from src/api/WorkshopProcurement/InvoiceStateSearch.js rename to src/assets/img/api/WorkshopProcurement/InvoiceStateSearch.js diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/assets/img/api/WorkshopProcurement/MaterialPreparationContractQuery.js similarity index 54% rename from src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js rename to src/assets/img/api/WorkshopProcurement/MaterialPreparationContractQuery.js index b2e2c8e5..af8fc9f8 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js +++ b/src/assets/img/api/WorkshopProcurement/MaterialPreparationContractQuery.js @@ -16,8 +16,8 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c } }) } -// 查询备料 -export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, pageSize, pageCurrent) { +// 查询采购单 +export function searchPurchaseOrder(check1, num, check2, name, check3, name2, checktime, starttime, endtime) { return request({ url: '', method: 'post', @@ -25,14 +25,13 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2 UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + - '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + name: '备料管理_采购计划_查询数据_全', + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}&时间_check=${checktime}&开始时间=${starttime}&结束时间=${endtime}` + // Pagination: pageCurrent + '&' + pageSize } }) } -// 导出 -export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) { +export function searchMateriel(num) { return request({ url: '', method: 'post', @@ -40,21 +39,22 @@ export function searchTablesheet(check, supplierNameValue, check1, partNumber, c UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + - '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + name: '备料管理_采购计划明细_查询数据_新', + param: `采购计划流水号=${num}` } }) } -export function HandleNumber() { +// 查询材料 +export function searchLxMateriel(num) { return request({ url: '', method: 'post', data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '2', - name: '备料管理_外购备料_处理已完成未修改数据' + type: '1', + name: '备料管理_离线采购计划明细_查询数据', + param: '离线采购计划流水号=' + num } }) } diff --git a/src/assets/img/api/WorkshopProcurement/MaterialPreparationReceiptQuery.js b/src/assets/img/api/WorkshopProcurement/MaterialPreparationReceiptQuery.js new file mode 100644 index 00000000..53d487d4 --- /dev/null +++ b/src/assets/img/api/WorkshopProcurement/MaterialPreparationReceiptQuery.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 发票查询 +export function searchInvoice(pageCurrent, pageSize, num2, num3, num4, num5, num6, token) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票审批查询_查询数据', + param: '供应商_check=' + num2 + '&供应商流水号=' + num3 + '&时间段_check=' + num4 + '&开始日期=' + num5 + '&结束日期=' + num6 + '&角色编号=' + token, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 发票明细查询 +export function searchInvoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票明细_查询数据', + param: '发票流水号=' + num + } + }) +} +export function getGongyingshang() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票_初始化获取供应商' + } + }) +} +// 执行审批 +export function cancel(...data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '备料管理_发票_撤销审批', + param: `发票流水号=${data[0]}&审批代号=${data[1]}` + } + }) +} diff --git a/src/assets/img/api/WorkshopProcurement/MaterialsInvoiceApproval.js b/src/assets/img/api/WorkshopProcurement/MaterialsInvoiceApproval.js new file mode 100644 index 00000000..015757af --- /dev/null +++ b/src/assets/img/api/WorkshopProcurement/MaterialsInvoiceApproval.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 发票查询 +export function searchInvoice(pageCurrent, pageSize, num2, num3, num4, num5, num6, token) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票审批_查询数据', + param: '供应商_check=' + num2 + '&供应商流水号=' + num3 + '&时间段_check=' + num4 + '&开始日期=' + num5 + '&结束日期=' + num6 + '&角色编号=' + token, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 发票明细查询 +export function searchInvoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票明细_查询数据', + param: '发票流水号=' + num + } + }) +} +export function getGongyingshang() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_发票_初始化获取供应商' + } + }) +} +// 执行审批 +export function excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '备料管理_发票_执行审批', + param: `发票流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}` + } + }) +} diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/assets/img/api/WorkshopProcurement/NewArrivalList.js similarity index 96% rename from src/api/WorkshopProcurement/NewArrivalList.js rename to src/assets/img/api/WorkshopProcurement/NewArrivalList.js index 8df1851d..baa3c2bf 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/assets/img/api/WorkshopProcurement/NewArrivalList.js @@ -87,7 +87,7 @@ export function searchLxMateriel(num, check, num1) { }) } // 查询到货单 -export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime) { +export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, endtime, check, part) { return request({ url: '', method: 'post', @@ -96,7 +96,7 @@ export function searchArriveOrder(num8, num9, num6, num7, datecheck, starttime, ModularID: router.currentRoute.path, type: '1', name: '备料管理_到货单查询_新', - param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}` + param: `供应商流水号_check=${num8}&供应商流水号=${num9}&是否关联_check=${num6}&是否关联=${num7}&日期check=${datecheck}&开始时间=${starttime}&结束时间=${endtime}&零件图号_check=${check}&零件图号=${part}` } }) } @@ -143,7 +143,7 @@ export function deletePurchaseOrder(PurchaseOrderNameValue, ArrivalOrderGroup, A }) } // 查询采购计划明细 -export function searchTable5(num) { +export function searchTable5(num, check, part) { return request({ url: '', method: 'post', @@ -152,7 +152,7 @@ export function searchTable5(num) { ModularID: router.currentRoute.path, type: '1', name: '备料管理_到货单明细查询', - param: `到货单流水号=${num}` + param: `到货单流水号=${num}&零件图号_check=${check}&零件图号=${part}` } }) } @@ -223,7 +223,7 @@ export function addMateriel(num1, num2, num3, num4, num5, num6, num7, id) { } }) } -export function searchTable6(num1) { +export function searchTable6(num1, check, part) { return request({ url: '', method: 'post', @@ -232,7 +232,7 @@ export function searchTable6(num1) { ModularID: router.currentRoute.path, type: '1', name: '备料管理_关联材料_查询数据', - param: `到货单明细流水号=${num1}` + param: `到货单明细流水号=${num1}&零件图号_check=${check}&零件图号=${part}` } }) } diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/assets/img/api/WorkshopProcurement/OfflineContract1.js similarity index 100% rename from src/api/WorkshopProcurement/OfflineContract1.js rename to src/assets/img/api/WorkshopProcurement/OfflineContract1.js diff --git a/src/api/WorkshopProcurement/OfflineContractRequestFund1.js b/src/assets/img/api/WorkshopProcurement/OfflineContractRequestFund1.js similarity index 100% rename from src/api/WorkshopProcurement/OfflineContractRequestFund1.js rename to src/assets/img/api/WorkshopProcurement/OfflineContractRequestFund1.js diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/assets/img/api/WorkshopProcurement/OfflineProcurement.js similarity index 98% rename from src/api/WorkshopProcurement/OfflineProcurement.js rename to src/assets/img/api/WorkshopProcurement/OfflineProcurement.js index 32e0d989..f4ea8938 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/assets/img/api/WorkshopProcurement/OfflineProcurement.js @@ -17,7 +17,7 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 创建采购单 -export function addPurchaseOrder(PurchaseOrderName, supplier, id) { +export function addPurchaseOrder(PurchaseOrderName, supplier, id, money) { return request({ url: '', method: 'post', @@ -26,12 +26,12 @@ export function addPurchaseOrder(PurchaseOrderName, supplier, id) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_离线采购计划_增加数据', - param: `离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}&采购员=${id}` + param: `离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}&采购员=${id}&预付款=${money}` } }) } // 编辑采购单 -export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier) { +export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier, money) { return request({ url: '', method: 'post', @@ -40,7 +40,7 @@ export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, sup ModularID: router.currentRoute.path, type: '2', name: '备料管理_离线采购计划_编辑数据', - param: `离线采购计划流水号=${PurchaseOrderNameValue}&离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}` + param: `离线采购计划流水号=${PurchaseOrderNameValue}&离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}&预付款=${money}` } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js similarity index 88% rename from src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js rename to src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js index ac6beb11..3f627b1b 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js +++ b/src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js @@ -32,7 +32,7 @@ export function searchInvoiceDetail(num) { }) } // 发票增加 -export function addInvoice(time1, money, send, remark, num3, num4) { +export function addInvoice(time1, money, send, remark, num3, num4, moneyGroup) { return request({ url: '', method: 'post', @@ -41,7 +41,7 @@ export function addInvoice(time1, money, send, remark, num3, num4) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_发票_增加数据', - param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}&到货单流水号组=${num4}` + param: `开票时间=${time1}&开票金额=${money}&发票号=${send}&备注=${remark}&供应商=${num3}&到货单流水号组=${num4}&本次到票金额组=${moneyGroup}` } }) } @@ -170,7 +170,7 @@ export function searchArriveOrder(num, num1, num2, num3, num5) { }) } // 关联到货单 -export function addMateriel(num, num1) { +export function addMateriel(num, num1, num2) { return request({ url: '', method: 'post', @@ -179,7 +179,7 @@ export function addMateriel(num, num1) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_发票明细_增加数据', - param: `发票流水号=${num}&到货单流水号组=${num1}` + param: `发票流水号=${num}&到货单流水号组=${num1}&本次到票金额组=${num2}` } }) } @@ -195,3 +195,31 @@ export function getGongyingshang() { } }) } +// 提交申请 +export function submitApply(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '备料管理_发票_提交申请', + param: `发票流水号=${group[0]}` + } + }) +} +// 查询到货单明细 +export function searchMX(...group) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_到货单明细_查询', + param: `到货单流水号=${group[0]}` + } + }) +} diff --git a/src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsSearch.js new file mode 100644 index 00000000..8963497c --- /dev/null +++ b/src/assets/img/api/WorkshopProcurement/OutsourcingMaterialsSearch.js @@ -0,0 +1,131 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} +// 查询备料 +export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, check4, machineValue, check5, groupValue, role, personnel, pageSize, pageCurrent) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_综合查询数据', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + '&机床图号_check=' + check4 + '&机床图号=' + machineValue + '&组号_check=' + check5 + '&组号=' + groupValue + '&角色编号=' + role + '&人员编号=' + personnel + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +// 导出 +export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_综合查询数据', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + } + }) +} +export function HandleNumber() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '备料管理_外购备料_处理已完成未修改数据' + } + }) +} +// 查询外购备料数量 +export function searchPurchaseCount(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, check4, machineValue, check5, groupValue, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_综合查询数据_查询采购数量', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&机床图号_check=' + check4 + '&机床图号=' + machineValue + '&组号_check=' + check5 + '&组号=' + groupValue + '&角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 查询自家备料数量 +export function searchHomeCount(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, check4, machineValue, check5, groupValue, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_综合查询数据_查询自家数量', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&机床图号_check=' + check4 + '&机床图号=' + machineValue + '&组号_check=' + check5 + '&组号=' + groupValue + '&角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 查询未分配数量 +export function searchUnallocatedCount(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, check4, machineValue, check5, groupValue, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_综合查询数据_查询未分配数量', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&机床图号_check=' + check4 + '&机床图号=' + machineValue + '&组号_check=' + check5 + '&组号=' + groupValue + '&角色编号=' + role + '&人员编号=' + personnel + } + }) +} +export function getMachine(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_查询机床数据', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} +export function getgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '备料管理_外购备料_查询组件数据', + param: '机床图号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/assets/img/api/WorkshopProcurement/OutsourcingProcessPlanning.js similarity index 100% rename from src/api/WorkshopProcurement/OutsourcingProcessPlanning.js rename to src/assets/img/api/WorkshopProcurement/OutsourcingProcessPlanning.js diff --git a/src/api/WorkshopProcurement/OutsourcingQuotaSetting.js b/src/assets/img/api/WorkshopProcurement/OutsourcingQuotaSetting.js similarity index 100% rename from src/api/WorkshopProcurement/OutsourcingQuotaSetting.js rename to src/assets/img/api/WorkshopProcurement/OutsourcingQuotaSetting.js diff --git a/src/api/WorkshopProcurement/OutsourcingStockArrival.js b/src/assets/img/api/WorkshopProcurement/OutsourcingStockArrival.js similarity index 100% rename from src/api/WorkshopProcurement/OutsourcingStockArrival.js rename to src/assets/img/api/WorkshopProcurement/OutsourcingStockArrival.js diff --git a/src/api/WorkshopProcurement/PayStateSearch.js b/src/assets/img/api/WorkshopProcurement/PayStateSearch.js similarity index 100% rename from src/api/WorkshopProcurement/PayStateSearch.js rename to src/assets/img/api/WorkshopProcurement/PayStateSearch.js diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/assets/img/api/WorkshopProcurement/ProcurementContractApproval.js similarity index 100% rename from src/api/WorkshopProcurement/ProcurementContractApproval.js rename to src/assets/img/api/WorkshopProcurement/ProcurementContractApproval.js diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/assets/img/api/WorkshopProcurement/ProcurementContractEnquiry.js similarity index 100% rename from src/api/WorkshopProcurement/ProcurementContractEnquiry.js rename to src/assets/img/api/WorkshopProcurement/ProcurementContractEnquiry.js diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/assets/img/api/WorkshopProcurement/ProjectTotalSearch.js similarity index 100% rename from src/api/WorkshopProcurement/ProjectTotalSearch.js rename to src/assets/img/api/WorkshopProcurement/ProjectTotalSearch.js diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/assets/img/api/WorkshopProcurement/PurchaseContractChange.js similarity index 100% rename from src/api/WorkshopProcurement/PurchaseContractChange.js rename to src/assets/img/api/WorkshopProcurement/PurchaseContractChange.js diff --git a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js b/src/assets/img/api/WorkshopProcurement/PurchaseContractRequestFund1.js similarity index 97% rename from src/api/WorkshopProcurement/PurchaseContractRequestFund1.js rename to src/assets/img/api/WorkshopProcurement/PurchaseContractRequestFund1.js index 2f3339a9..5f032f5f 100644 --- a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js +++ b/src/assets/img/api/WorkshopProcurement/PurchaseContractRequestFund1.js @@ -94,7 +94,7 @@ export function searchTable2(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间采购管理_采购合同明细_查询数据NEW', + name: '车间管理_车间采购_合同请款_采购件查询', param: '采购合同流水号=' + num } }) diff --git a/src/api/WorkshopProcurement/PurchaseInvoiceDelivery.js b/src/assets/img/api/WorkshopProcurement/PurchaseInvoiceDelivery.js similarity index 100% rename from src/api/WorkshopProcurement/PurchaseInvoiceDelivery.js rename to src/assets/img/api/WorkshopProcurement/PurchaseInvoiceDelivery.js diff --git a/src/assets/img/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js b/src/assets/img/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js new file mode 100644 index 00000000..4535ec18 --- /dev/null +++ b/src/assets/img/api/WorkshopProcurement/PurchaseSituationSearchMetalworking.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化合同 +export function searchdata(check1, partDrawing, check2, daterange0, daterange1, check3, machine, check4, group, role, personnel, partName, order, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_车间采购_采购件查询', + param: `零件图号_check=${check1}&零件图号=${partDrawing}&时间段_check=${check2}&开始时间=${daterange0}&结束时间=${daterange1}&机床_check=${check3}&机床=${machine}&组号_check=${check4}&组号=${group}&角色编号=${role}&人员编号=${personnel}&排序名称=${partName}&排序方式=${order}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 总价 +export function searchPrice(check1, partDrawing, check2, daterange0, daterange1, check3, machine, check4, group, role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间管理_车间采购_采购件查询_获取总价', + param: `零件图号_check=${check1}&零件图号=${partDrawing}&时间段_check=${check2}&开始时间=${daterange0}&结束时间=${daterange1}&机床_check=${check3}&机床=${machine}&组号_check=${check4}&组号=${group}&角色编号=${role}&人员编号=${personnel}` + } + }) +} +// 初始化机床项目 +export function initMachineProject(role, personnel) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '机床_查询_营销筛选', + param: '角色编号=' + role + '&人员编号=' + personnel + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/assets/img/api/WorkshopProcurement/PurchasingQualityInspection.js similarity index 100% rename from src/api/WorkshopProcurement/PurchasingQualityInspection.js rename to src/assets/img/api/WorkshopProcurement/PurchasingQualityInspection.js diff --git a/src/api/WorkshopProcurement/QualityInspectionQuery.js b/src/assets/img/api/WorkshopProcurement/QualityInspectionQuery.js similarity index 100% rename from src/api/WorkshopProcurement/QualityInspectionQuery.js rename to src/assets/img/api/WorkshopProcurement/QualityInspectionQuery.js diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/assets/img/api/WorkshopProcurement/ReceiptConnectionSheet.js similarity index 100% rename from src/api/WorkshopProcurement/ReceiptConnectionSheet.js rename to src/assets/img/api/WorkshopProcurement/ReceiptConnectionSheet.js diff --git a/src/api/WorkshopProcurement/RequestApprovalQuery2.js b/src/assets/img/api/WorkshopProcurement/RequestApprovalQuery2.js similarity index 92% rename from src/api/WorkshopProcurement/RequestApprovalQuery2.js rename to src/assets/img/api/WorkshopProcurement/RequestApprovalQuery2.js index dfce4f92..fd172b68 100644 --- a/src/api/WorkshopProcurement/RequestApprovalQuery2.js +++ b/src/assets/img/api/WorkshopProcurement/RequestApprovalQuery2.js @@ -53,12 +53,12 @@ export function searchSupplier() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '采购管理_供应商_查询数据_根据条件' + name: '采购管理_供应商及外协厂家_查询数据' } }) } // 查询供应商 -export function cancel(num, num1) { +export function cancel(num, num1, type) { return request({ url: '', method: 'post', @@ -67,7 +67,7 @@ export function cancel(num, num1) { ModularID: router.currentRoute.path, type: '2', name: '车间采购管理_采购合同_审批撤回_修改数据', - param: '采购合同请款流水号=' + num + '&审批_付款状态=' + num1 + param: '采购合同请款流水号=' + num + '&审批_付款状态=' + num1 + '&请款类型=' + type } }) } diff --git a/src/assets/img/api/WorkshopProcurement/RequestApprovalQuery3.js b/src/assets/img/api/WorkshopProcurement/RequestApprovalQuery3.js new file mode 100644 index 00000000..cbe556a1 --- /dev/null +++ b/src/assets/img/api/WorkshopProcurement/RequestApprovalQuery3.js @@ -0,0 +1,73 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化采购员 +export function initBuyer() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员与角色_查询数据_采购员' + } + }) +} +// 采购合同查询 +export function searchTable1(radio, check1, supplier, check2, start, end, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同_请款审核_查询数据', + param: '查询全部=' + radio + '&供应商流水号_check=' + check1 + '&供应商流水号=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询离线合同请款信息明细 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商及外协厂家_查询数据' + } + }) +} +// 查询供应商 +export function cancel(num, num1, type) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间采购管理_采购合同_审批撤回_修改数据', + param: '采购合同请款流水号=' + num + '&审批_付款状态=' + num1 + '&请款类型=' + type + } + }) +} diff --git a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js b/src/assets/img/api/WorkshopProcurement/RequestOutsourcingMaterials.js similarity index 89% rename from src/api/WorkshopProcurement/RequestOutsourcingMaterials.js rename to src/assets/img/api/WorkshopProcurement/RequestOutsourcingMaterials.js index 501adfe2..524a2d6c 100644 --- a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js +++ b/src/assets/img/api/WorkshopProcurement/RequestOutsourcingMaterials.js @@ -46,7 +46,7 @@ export function searchOfflineContract1(num, num1) { }) } // 增加请款 -export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { +export function submitRequestFund(contractGroup, LXcontractGroup, sumGroup, supplier, money, person) { return request({ url: '', method: 'post', @@ -55,7 +55,7 @@ export function submitRequestFund(contractGroup, sumGroup, supplier, money, pers ModularID: router.currentRoute.path, type: '2', name: '备料管理_请款_增加数据', - param: `发票流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商=${supplier}&请款金额=${money}&请款人=${person}` + param: `采购计划流水号组=${contractGroup}&离线采购计划流水号组=${LXcontractGroup}&请款金额组=${sumGroup}&供应商=${supplier}&请款总金额=${money}&请款人=${person}` } }) } diff --git a/src/api/WorkshopProcurement/ScrappedSupplementaryInvestment1.js b/src/assets/img/api/WorkshopProcurement/ScrappedSupplementaryInvestment1.js similarity index 100% rename from src/api/WorkshopProcurement/ScrappedSupplementaryInvestment1.js rename to src/assets/img/api/WorkshopProcurement/ScrappedSupplementaryInvestment1.js diff --git a/src/api/WorkshopProcurement/StockPreparation.js b/src/assets/img/api/WorkshopProcurement/StockPreparation.js similarity index 100% rename from src/api/WorkshopProcurement/StockPreparation.js rename to src/assets/img/api/WorkshopProcurement/StockPreparation.js diff --git a/src/api/WorkshopProcurement/costStatistics.js b/src/assets/img/api/WorkshopProcurement/costStatistics.js similarity index 100% rename from src/api/WorkshopProcurement/costStatistics.js rename to src/assets/img/api/WorkshopProcurement/costStatistics.js diff --git a/src/assets/img/api/login.js b/src/assets/img/api/login.js new file mode 100644 index 00000000..4f50e18e --- /dev/null +++ b/src/assets/img/api/login.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function login(username, password) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '菜单系统模块_用户名密码_查询数据_new2', + param: `用户名=${username}&密码=${password}` + } + }) +} +export function getInfo(token) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: `菜单系统模块_获取角色模块_查询数据`, + param: `角色编号=${token}` + } + }) +} +// 查询按钮功能实现 +export function editPassword(num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '账号信息_修改密码_MESWORK', + param: '考勤编号=' + num1 + '=int&原始密码=' + num2 + '=string&新密码=' + num3 + '=string&返回=' + num4 + '=string=output' + } + }) +} +export function cloudEditPassword(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '人事档案管理_人员名单_云上改密码', + param: 'id=' + num1 + '=int&新密码=' + num2 + '=string' + } + }) +} diff --git a/src/assets/img/jingyao.jpg b/src/assets/img/jingyao.jpg new file mode 100644 index 00000000..d5b70523 Binary files /dev/null and b/src/assets/img/jingyao.jpg differ diff --git a/src/assets/img/shebei6.png b/src/assets/img/shebei6.png new file mode 100644 index 00000000..7fc50f87 Binary files /dev/null and b/src/assets/img/shebei6.png differ diff --git a/src/assets/img/zhuzhou.png b/src/assets/img/zhuzhou.png new file mode 100644 index 00000000..74ff1f14 Binary files /dev/null and b/src/assets/img/zhuzhou.png differ diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 58dca557..ec295655 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -49,4 +49,7 @@ export default { cursor: text; } } + .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link { + color: #fff!important; + } diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue index f1f9bda1..9a407dc2 100644 --- a/src/components/Hamburger/index.vue +++ b/src/components/Hamburger/index.vue @@ -4,7 +4,7 @@ :class="{'is-active':isActive}" t="1492500959545" class="hamburger" - style="" + style="color: #fff" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" @@ -15,13 +15,16 @@ @click="toggleClick"> + p-id="1692" + style="fill: #fff"/> + p-id="1693" + style="fill: #fff"/> + p-id="1694" + style="fill: #fff"/> @@ -51,8 +54,10 @@ export default { transform: rotate(90deg); transition: .38s; transform-origin: 50% 50%; + color: #fff } .hamburger.is-active { transform: rotate(0deg); + color: #fff } diff --git a/src/icon/demo.css b/src/icon/demo.css index 3d9cbe76..a67054a0 100644 --- a/src/icon/demo.css +++ b/src/icon/demo.css @@ -1,105 +1,151 @@ -*{margin: 0;padding: 0;list-style: none;} -/* -KISSY CSS Reset -理念：1. reset 的目的不是清除浏览器的默认样式，这仅是部分工作。清除和重置是紧密不可分的。 -2. reset 的目的不是让默认样式在所有浏览器下一致，而是减少默认样式有可能带来的问题。 -3. reset 期望提供一套普适通用的基础样式。但没有银弹，推荐根据具体需求，裁剪和修改后再使用。 -特色：1. 适应中文；2. 基于最新主流浏览器。 -维护：玉伯, 正淳 - */ - -/** 清除内外边距 **/ -body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, /* structural elements 结构元素 */ -dl, dt, dd, ul, ol, li, /* list elements 列表元素 */ -pre, /* text formatting elements 文本格式元素 */ -form, fieldset, legend, button, input, textarea, /* form elements 表单元素 */ -th, td /* table elements 表格元素 */ { - margin: 0; - padding: 0; +/* Logo 字体 */ +@font-face { + font-family: "iconfont logo"; + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg'); } -/** 设置默认字体 **/ -body, -button, input, select, textarea /* for ie */ { - font: 12px/1.5 tahoma, arial, \5b8b\4f53, sans-serif; +.logo { + font-family: "iconfont logo"; + font-size: 160px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -h1, h2, h3, h4, h5, h6 { font-size: 100%; } -address, cite, dfn, em, var { font-style: normal; } /* 将斜体扶正 */ -code, kbd, pre, samp { font-family: courier new, courier, monospace; } /* 统一等宽字体 */ -small { font-size: 12px; } /* 小于 12px 的中文很难阅读，让 small 正常化 */ -/** 重置列表元素 **/ -ul, ol { list-style: none; } - -/** 重置文本格式元素 **/ -a { text-decoration: none; } -a:hover { text-decoration: underline; } - - -/** 重置表单元素 **/ -legend { color: #000; } /* for ie6 */ -fieldset, img { border: 0; } /* img 搭车：让链接里的 img 无边框 */ -button, input, select, textarea { font-size: 100%; } /* 使得表单元素在 ie 下能继承字体大小 */ -/* 注：optgroup 无法扶正 */ - -/** 重置表格元素 **/ -table { border-collapse: collapse; border-spacing: 0; } - -/* 清除浮动 */ -.ks-clear:after, .clear:after { - content: '\20'; - display: block; - height: 0; - clear: both; +/* tabs */ +.nav-tabs { + position: relative; } -.ks-clear, .clear { + +.nav-tabs .nav-more { + position: absolute; + right: 0; + bottom: 0; + height: 42px; + line-height: 42px; + color: #666; +} + +#tabs { + border-bottom: 1px solid #eee; +} + +#tabs li { + cursor: pointer; + width: 100px; + height: 40px; + line-height: 40px; + text-align: center; + font-size: 16px; + border-bottom: 2px solid transparent; + position: relative; + z-index: 1; + margin-bottom: -1px; + color: #666; +} + + +#tabs .active { + border-bottom-color: #f00; + color: #222; +} + +.tab-container .content { + display: none; +} + +/* 页面布局 */ +.main { + padding: 30px 100px; + width: 960px; + margin: 0 auto; +} + +.main .logo { + color: #333; + text-align: left; + margin-bottom: 30px; + line-height: 1; + height: 110px; + margin-top: -50px; + overflow: hidden; *zoom: 1; } -.main { - padding: 30px 100px; -width: 960px; -margin: 0 auto; +.main .logo a { + font-size: 160px; + color: #333; } -.main h1{font-size:36px; color:#333; text-align:left;margin-bottom:30px; border-bottom: 1px solid #eee;} -.helps{margin-top:40px;} -.helps pre{ - padding:20px; - margin:10px 0; - border:solid 1px #e7e1cd; +.helps { + margin-top: 40px; +} + +.helps pre { + padding: 20px; + margin: 10px 0; + border: solid 1px #e7e1cd; background-color: #fffdef; overflow: auto; } -.icon_lists{ +.icon_lists { width: 100% !important; - + overflow: hidden; + *zoom: 1; } -.icon_lists li{ - float:left; +.icon_lists li { width: 100px; - height:180px; + margin-bottom: 10px; + margin-right: 20px; text-align: center; list-style: none !important; + cursor: default; } -.icon_lists .icon{ - font-size: 42px; - line-height: 100px; - margin: 10px 0; - color:#333; - -webkit-transition: font-size 0.25s ease-out 0s; - -moz-transition: font-size 0.25s ease-out 0s; - transition: font-size 0.25s ease-out 0s; +.icon_lists li .code-name { + line-height: 1.2; } -.icon_lists .icon:hover{ + +.icon_lists .icon { + display: block; + height: 100px; + line-height: 100px; + font-size: 42px; + margin: 10px auto; + color: #333; + -webkit-transition: font-size 0.25s linear, width 0.25s linear; + -moz-transition: font-size 0.25s linear, width 0.25s linear; + transition: font-size 0.25s linear, width 0.25s linear; +} + +.icon_lists .icon:hover { font-size: 100px; } +.icon_lists .svg-icon { + /* 通过设置 font-size 来改变图标大小 */ + width: 1em; + /* 图标和文字相邻时，垂直对齐 */ + vertical-align: -0.15em; + /* 通过设置 color 来改变 SVG 的颜色/fill */ + fill: currentColor; + /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示 + normalize.css 中也包含这行 */ + overflow: hidden; +} +.icon_lists li .name, +.icon_lists li .code-name { + color: #666; +} +/* markdown 样式 */ .markdown { color: #666; font-size: 14px; @@ -165,40 +211,39 @@ margin: 0 auto; clear: both; } -.markdown p, -.markdown pre { +.markdown p { margin: 1em 0; } -.markdown > p, -.markdown > blockquote, -.markdown > .highlight, -.markdown > ol, -.markdown > ul { +.markdown>p, +.markdown>blockquote, +.markdown>.highlight, +.markdown>ol, +.markdown>ul { width: 80%; } -.markdown ul > li { +.markdown ul>li { list-style: circle; } -.markdown > ul li, -.markdown blockquote ul > li { +.markdown>ul li, +.markdown blockquote ul>li { margin-left: 20px; padding-left: 4px; } -.markdown > ul li p, -.markdown > ol li p { +.markdown>ul li p, +.markdown>ol li p { margin: 0.6em 0; } -.markdown ol > li { +.markdown ol>li { list-style: decimal; } -.markdown > ol li, -.markdown blockquote ol > li { +.markdown>ol li, +.markdown blockquote ol>li { margin-left: 20px; padding-left: 4px; } @@ -210,24 +255,12 @@ margin: 0 auto; border-radius: 3px; } -.markdown pre { - border-radius: 6px; - background: #f7f7f7; - padding: 20px; -} - -.markdown pre code { - border: none; - background: #f7f7f7; - margin: 0; -} - .markdown strong, .markdown b { font-weight: 600; } -.markdown > table { +.markdown>table { border-collapse: collapse; border-spacing: 0px; empty-cells: show; @@ -236,21 +269,20 @@ margin: 0 auto; margin-bottom: 24px; } -.markdown > table th { +.markdown>table th { white-space: nowrap; color: #333; font-weight: 600; - } -.markdown > table th, -.markdown > table td { +.markdown>table th, +.markdown>table td { border: 1px solid #e9e9e9; padding: 8px 16px; text-align: left; } -.markdown > table th { +.markdown>table th { background: #F7F7F7; } @@ -260,7 +292,6 @@ margin: 0 auto; border-left: 4px solid #e9e9e9; padding-left: 0.8em; margin: 1em 0; - font-style: italic; } .markdown blockquote p { @@ -287,8 +318,8 @@ margin: 0 auto; display: inline-block; } -.markdown > br, -.markdown > p > br { +.markdown>br, +.markdown>p>br { clear: both; } @@ -360,11 +391,149 @@ margin: 0 auto; text-decoration: underline; } -pre{ - background: #fff; +/* 代码高亮 */ +/* PrismJS 1.15.0 +https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ +/** + * prism.js default theme for JavaScript, CSS and HTML + * Based on dabblet (http://dabblet.com) + * @author Lea Verou + */ +code[class*="language-"], +pre[class*="language-"] { + color: black; + background: none; + text-shadow: 0 1px white; + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; } +pre[class*="language-"]::-moz-selection, +pre[class*="language-"] ::-moz-selection, +code[class*="language-"]::-moz-selection, +code[class*="language-"] ::-moz-selection { + text-shadow: none; + background: #b3d4fc; +} +pre[class*="language-"]::selection, +pre[class*="language-"] ::selection, +code[class*="language-"]::selection, +code[class*="language-"] ::selection { + text-shadow: none; + background: #b3d4fc; +} +@media print { + code[class*="language-"], + pre[class*="language-"] { + text-shadow: none; + } +} +/* Code blocks */ +pre[class*="language-"] { + padding: 1em; + margin: .5em 0; + overflow: auto; +} + +:not(pre)>code[class*="language-"], +pre[class*="language-"] { + background: #f5f2f0; +} + +/* Inline code */ +:not(pre)>code[class*="language-"] { + padding: .1em; + border-radius: .3em; + white-space: normal; +} + +.token.comment, +.token.prolog, +.token.doctype, +.token.cdata { + color: slategray; +} + +.token.punctuation { + color: #999; +} + +.namespace { + opacity: .7; +} + +.token.property, +.token.tag, +.token.boolean, +.token.number, +.token.constant, +.token.symbol, +.token.deleted { + color: #905; +} + +.token.selector, +.token.attr-name, +.token.string, +.token.char, +.token.builtin, +.token.inserted { + color: #690; +} + +.token.operator, +.token.entity, +.token.url, +.language-css .token.string, +.style .token.string { + color: #9a6e3a; + background: hsla(0, 0%, 100%, .5); +} + +.token.atrule, +.token.attr-value, +.token.keyword { + color: #07a; +} + +.token.function, +.token.class-name { + color: #DD4A68; +} + +.token.regex, +.token.important, +.token.variable { + color: #e90; +} + +.token.important, +.token.bold { + font-weight: bold; +} + +.token.italic { + font-style: italic; +} + +.token.entity { + cursor: help; +} diff --git a/src/icon/demo_index.html b/src/icon/demo_index.html new file mode 100644 index 00000000..91f1b2c6 --- /dev/null +++ b/src/icon/demo_index.html @@ -0,0 +1,303 @@ + + + + + iconfont Demo + + + + + + + + + + + + + +
+

+ + +

+
+
    +
  • Unicode
    • +
  • Font class
    • +
  • Symbol
    • +
+ + 查看项目 + +
+
+
+
    + +
  • + +
    设 置
    +
    &#xe60b;
    +
    • + +
  • + +
    模块
    +
    &#xec07;
    +
    • + +
  • + +
    维修
    +
    &#xe63a;
    +
    • + +
  • + +
    物料
    +
    &#xe6fb;
    +
    • + +
  • + +
    零件
    +
    &#xe679;
    +
    • + +
+
+

Unicode 引用

+
+ +

Unicode 是字体在网页端最原始的应用方式，特点是：

+
    +
  • 支持按字体的方式去动态调整图标大小，颜色等等。
    • +
  • 默认情况下不支持多色，直接添加多色图标会自动去色。
    • +
+
+

注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）

+
+

Unicode 使用步骤如下：

+

第一步：拷贝项目下面生成的 @font-face

+
@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1626138435815') format('woff2'),
+       url('iconfont.woff?t=1626138435815') format('woff'),
+       url('iconfont.ttf?t=1626138435815') format('truetype');
+}
+
+

第二步：定义使用 iconfont 的样式

+
.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+

第三步：挑选相应图标并获取字体编码，应用于页面

+
+<span class="iconfont">&#x33;</span>
+
+
+

"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    + 设 置 +
    +
    .el-icon-cjnshezhi +
    +
    • + +
  • + +
    + 模块 +
    +
    .el-icon-cjnmodule +
    +
    • + +
  • + +
    + 维修 +
    +
    .el-icon-cjnweixiu +
    +
    • + +
  • + +
    + 物料 +
    +
    .el-icon-cjnwuliao +
    +
    • + +
  • + +
    + 零件 +
    +
    .el-icon-cjna50gongyegongcheng_lingjian +
    +
    • + +
+
+

font-class 引用

+
+ +

font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。

+

与 Unicode 使用方式相比，具有如下特点：

+
    +
  • 相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。
    • +
  • 因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。
    • +
+

使用步骤如下：

+

第一步：引入项目下面生成的 fontclass 代码：

+
<link rel="stylesheet" href="./iconfont.css">
+
+

第二步：挑选相应图标并获取类名，应用于页面：

+
<span class="iconfont el-icon-cjnxxx"></span>
+
+
+

" + iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    设 置
    +
    #el-icon-cjnshezhi
    +
    • + +
  • + +
    模块
    +
    #el-icon-cjnmodule
    +
    • + +
  • + +
    维修
    +
    #el-icon-cjnweixiu
    +
    • + +
  • + +
    物料
    +
    #el-icon-cjnwuliao
    +
    • + +
  • + +
    零件
    +
    #el-icon-cjna50gongyegongcheng_lingjian
    +
    • + +
+
+

Symbol 引用

+
+ +

这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇文章 + 这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：

+
    +
  • 支持多色图标了，不再受单色限制。
    • +
  • 通过一些技巧，支持像字体那样，通过 font-size, color 来调整样式。
    • +
  • 兼容性较差，支持 IE9+，及现代浏览器。
    • +
  • 浏览器渲染 SVG 的性能一般，还不如 png。
    • +
+

使用步骤如下：

+

第一步：引入项目下面生成的 symbol 代码：

+
<script src="./iconfont.js"></script>
+
+

第二步：加入通用 CSS 代码（引入一次就行）：

+
<style>
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>
+
+

第三步：挑选相应图标并获取类名，应用于页面：

+
<svg class="icon" aria-hidden="true">
+  <use xlink:href="#icon-xxx"></use>
+</svg>
+
+
+
+ +
+
+ + + diff --git a/src/icon/iconfont.css b/src/icon/iconfont.css index 6cf229f0..006c4413 100644 --- a/src/icon/iconfont.css +++ b/src/icon/iconfont.css @@ -1,30 +1,43 @@ - -@font-face {font-family: "fontFamily"; - src: url('iconfont.eot?t=1527493375212'); /* IE9*/ - src: url('iconfont.eot?t=1527493375212#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAXoAAsAAAAACHwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7kf3Y21hcAAAAYAAAABjAAABnM7GacRnbHlmAAAB5AAAAfsAAAIsdf0weGhlYWQAAAPgAAAALwAAADYRguv+aGhlYQAABBAAAAAcAAAAJAfeA4VobXR4AAAELAAAABAAAAAQD+kAAGxvY2EAAAQ8AAAACgAAAAoBjAC6bWF4cAAABEgAAAAfAAAAIAEaAF1uYW1lAAAEaAAAAVMAAAKFV8s9R3Bvc3QAAAW8AAAAKgAAADsY6RIYeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sU4gYGVgYOpk+kMAwNDP4RmfM1gxMjBwMDEwMrMgBUEpLmmMDgwVDzjZm7438AQw9zA0AAUZgTJAQAk0wx5eJzFkNENgCAMRK+ChIij+GkcyC9HYOKugdfCDxNw5JX2ckkJAHYAgVwkAvJBYHrpivsBh/sRD+fMs/GumrS0NnUm8UT2LlhSEpZJ1q2edXq9x2T/XQd8oqaO+Vo62H4fLw+3AHicLZC/b9NAFMffu6udpM0PbMdx4jQ/LhfXoDRBtpN2IGkXkArNgNQpKkiNYlSBRNd2YKiQEB0YWFDFCkiIiYEfytAJVbDTv6CFjYXSFhbsckE53dP3fZ/e6X3egQRwfkj3aBY0uAgOXIWbACjXsJIkBWR2s0FqqDNJN9JJanObRXilQTtoVOR0xp1rzhhyRE5hEovoMXfObhAbW80FcgXdTAExlzdXVGtapU9xMmsXH4U3yAvUS3w6tVAPr88upt2yFt2Mq2pOVZ9EZUmKEjKRSuJ9IxOTYpNy+EpKmfpe6RIpYTxnm91eopxX+zvNjYJlxBC3t1HLl5OvFxVTEfeBmdHUXORCIpo1E7yaxs3vU1ktXpj5BuJExK7P6A/agwmIQhxyUAAGltiXKUyxmM5GicaF4Yqns5ZnoCjqns5RBK0GlO4Hy7gTbuFRcESKu6vBvdVdAurL4DF2w/cHB1jvdGjvb5uy9Q/B3VFt1E27x8cPw2vtdpt83QIxGc6f0190A6hgmoKU+HsD8lACDpfBg3kAQ4AYo5ljRcFEecuTRG6NeSzeEpj/QTkVfl5EFofh0trp6dpY8RMOBycnwbLrkpLjBIdC3w1+zvaxduez73/x/XUc3jrDjzi8/RtXwiXx7u2Z7zhOmHbq+8JXB3/CN/1+H+AfnVR/vQB4nGNgZGBgAOLuWSW34/ltvjJwszCAwHXDy/8R9P+pLAzMeUAuBwMTSBQAWOoL7AB4nGNgZGBgbvjfwBDDwgACQJKRARWwAABHCgJtBAAAAAPpAAAEAAAABAAAAAAAAAAAdgC6ARYAAHicY2BkYGBgYQhk4GEAASYg5gJCBob/YD4DABGzAXgAeJxtkk1uwjAQhZ/LT9UgddHSdlmvWBQp/CzZooZlJRbsQ3AgKIkjxyDRXQ/Q8/QQPUE3vUHv0EcwQkIk8uibN2/GthIAd/iFwOF54DqwgMfswFe4xrPjGvWO4zq577iBFkaOm9RfHXvo4s1xC/d45wRRv2H2gk/HAm18Ob7CLb4d16j/OK6T/xw38CiE4yba4smxh5noOm6hIz68sVGhVQs538kk0nmsc+vtQxBmSbqbquUmDc1JONFMmTLRuRz4/ZM4Ubkyx3nldjm0Npax0ZkM6FFpqmVh9FpF1l9ZW4x6vdjpfqQzHm8MA4UQlnEBiTl2jAkiaOSIq2jpO1JAb8Z6St+UPUtsyCGnXHJc0mbsMiiZ7WsSA/j8ZJecEzrzyn1+vhJb7jykatkpuQz7M1Lg5ihOSMkSRVVbU4mo+1hVXQV/jR7f+MzvVzfP/gHCFnRdAHicY2BigAAuBuyAhZGJkZmRhZGVgbGCycCSI7WoPDUzN9GQgQEAJkQEKgAA') format('woff'), - url('iconfont.ttf?t=1527493375212') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('iconfont.svg?t=1527493375212#fontFamily') format('svg'); /* iOS 4.1- */ +@font-face { + font-family: "iconfont"; /* Project id 2669478 */ + src: url('iconfont.woff2?t=1626138435815') format('woff2'), + url('iconfont.woff?t=1626138435815') format('woff'), + url('iconfont.ttf?t=1626138435815') format('truetype'); } -.fontFamily { - font-family:"fontFamily" !important; - font-size:16px; - font-style:normal; +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -[class^="el-icon-cjn"], [class*=" el-icon-cjn"] { - font-family:"fontFamily" !important; - /* 以下内容参照第三方图标库本身的规则 */ - font-size: 13px; - font-style:normal; +[class^="el-icon-cjn"], +[class^=" el-icon-cjn"] +{ + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.el-icon-cjnshezhi:before { + content: "\e60b"; +} -.el-icon-cjn-09:before { content: "\e60b"; } +.el-icon-cjnmodule:before { + content: "\ec07"; +} -.el-icon-cjn-erweima1:before { content: "\e606"; } +.el-icon-cjnweixiu:before { + content: "\e63a"; +} + +.el-icon-cjnwuliao:before { + content: "\e6fb"; +} + +.el-icon-cjna50gongyegongcheng_lingjian:before { + content: "\e679"; +} diff --git a/src/icon/iconfont.js b/src/icon/iconfont.js index 0a1c3360..0fc995ee 100644 --- a/src/icon/iconfont.js +++ b/src/icon/iconfont.js @@ -1 +1 @@ -(function(window) { var svgSprite = ''; var script = (function() { var scripts = document.getElementsByTagName('script'); return scripts[scripts.length - 1] }()); var shouldInjectCss = script.getAttribute('data-injectcss'); var ready = function(fn) { if (document.addEventListener) { if (~['complete', 'loaded', 'interactive'].indexOf(document.readyState)) { setTimeout(fn, 0) } else { var loadFn = function() { document.removeEventListener('DOMContentLoaded', loadFn, false); fn() }; document.addEventListener('DOMContentLoaded', loadFn, false) } } else if (document.attachEvent) { IEContentLoaded(window, fn) } function IEContentLoaded(w, fn) { var d = w.document, done = false, init = function() { if (!done) { done = true; fn() } }; var polling = function() { try { d.documentElement.doScroll('left') } catch (e) { setTimeout(polling, 50); return }init() }; polling(); d.onreadystatechange = function() { if (d.readyState == 'complete') { d.onreadystatechange = null; init() } } } }; var before = function(el, target) { target.parentNode.insertBefore(el, target) }; var prepend = function(el, target) { if (target.firstChild) { before(el, target.firstChild) } else { target.appendChild(el) } }; function appendSvg() { var div, svg; div = document.createElement('div'); div.innerHTML = svgSprite; svgSprite = null; svg = div.getElementsByTagName('svg')[0]; if (svg) { svg.setAttribute('aria-hidden', 'true'); svg.style.position = 'absolute'; svg.style.width = 0; svg.style.height = 0; svg.style.overflow = 'hidden'; prepend(svg, document.body) } } if (shouldInjectCss && !window.__iconfont__svg__cssinject__) { window.__iconfont__svg__cssinject__ = true; try { document.write('') } catch (e) { console && console.log(e) } }ready(appendSvg) })(window) +!function(l){var a,t,e,c,n,o,i='',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(l){console&&console.log(l)}}function h(){n||(n=!0,e())}a=function(){var l,a,t;(t=document.createElement("div")).innerHTML=i,i=null,(a=t.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",l=a,(t=document.body).firstChild?(a=t.firstChild).parentNode.insertBefore(l,a):t.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(t=function(){document.removeEventListener("DOMContentLoaded",t,!1),a()},document.addEventListener("DOMContentLoaded",t,!1)):document.attachEvent&&(e=a,c=l.document,n=!1,(o=function(){try{c.documentElement.doScroll("left")}catch(l){return void setTimeout(o,50)}h()})(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,h())})}(window); \ No newline at end of file diff --git a/src/icon/iconfont.json b/src/icon/iconfont.json new file mode 100644 index 00000000..a0730487 --- /dev/null +++ b/src/icon/iconfont.json @@ -0,0 +1,44 @@ +{ + "id": "2669478", + "name": "no name", + "font_family": "iconfont", + "css_prefix_text": "el-icon-cjn", + "description": "", + "glyphs": [ + { + "icon_id": "18309270", + "name": "设 置", + "font_class": "shezhi", + "unicode": "e60b", + "unicode_decimal": 58891 + }, + { + "icon_id": "19729470", + "name": "模块", + "font_class": "module", + "unicode": "ec07", + "unicode_decimal": 60423 + }, + { + "icon_id": "339472", + "name": "维修", + "font_class": "weixiu", + "unicode": "e63a", + "unicode_decimal": 58938 + }, + { + "icon_id": "18298023", + "name": "物料", + "font_class": "wuliao", + "unicode": "e6fb", + "unicode_decimal": 59131 + }, + { + "icon_id": "20852728", + "name": "零件", + "font_class": "a50gongyegongcheng_lingjian", + "unicode": "e679", + "unicode_decimal": 59001 + } + ] +} diff --git a/src/icon/iconfont.ttf b/src/icon/iconfont.ttf index 73ff92a1..507eae12 100644 Binary files a/src/icon/iconfont.ttf and b/src/icon/iconfont.ttf differ diff --git a/src/icon/iconfont.woff b/src/icon/iconfont.woff index c74a2be5..bde79e88 100644 Binary files a/src/icon/iconfont.woff and b/src/icon/iconfont.woff differ diff --git a/src/icon/iconfont.woff2 b/src/icon/iconfont.woff2 new file mode 100644 index 00000000..b24c8536 Binary files /dev/null and b/src/icon/iconfont.woff2 differ diff --git a/src/icons/svg/AfterServiceSearch.svg b/src/icons/svg/AfterServiceSearch.svg new file mode 100644 index 00000000..b791965f --- /dev/null +++ b/src/icons/svg/AfterServiceSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/AssemblyExecution.svg b/src/icons/svg/AssemblyExecution.svg index 25c3e2cb..c7b0de43 100644 --- a/src/icons/svg/AssemblyExecution.svg +++ b/src/icons/svg/AssemblyExecution.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/svg/AssemblyTaskQuery.svg b/src/icons/svg/AssemblyTaskQuery.svg new file mode 100644 index 00000000..a4548fa2 --- /dev/null +++ b/src/icons/svg/AssemblyTaskQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/EquipmentStatus.svg b/src/icons/svg/EquipmentStatus.svg new file mode 100644 index 00000000..76de4d6e --- /dev/null +++ b/src/icons/svg/EquipmentStatus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/LocationManagement.svg b/src/icons/svg/LocationManagement.svg new file mode 100644 index 00000000..1458eac2 --- /dev/null +++ b/src/icons/svg/LocationManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialRequisition.svg b/src/icons/svg/MaterialRequisition.svg new file mode 100644 index 00000000..d3961860 --- /dev/null +++ b/src/icons/svg/MaterialRequisition.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OrderInquiry.svg b/src/icons/svg/OrderInquiry.svg new file mode 100644 index 00000000..7d86079e --- /dev/null +++ b/src/icons/svg/OrderInquiry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OrderRelease.svg b/src/icons/svg/OrderRelease.svg new file mode 100644 index 00000000..241143f4 --- /dev/null +++ b/src/icons/svg/OrderRelease.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OrderTraceability.svg b/src/icons/svg/OrderTraceability.svg new file mode 100644 index 00000000..b6dccfc2 --- /dev/null +++ b/src/icons/svg/OrderTraceability.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProductMaintenance.svg b/src/icons/svg/ProductMaintenance.svg new file mode 100644 index 00000000..795cf257 --- /dev/null +++ b/src/icons/svg/ProductMaintenance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PurchasePartsStorage.svg b/src/icons/svg/PurchasePartsStorage.svg new file mode 100644 index 00000000..cd3ba070 --- /dev/null +++ b/src/icons/svg/PurchasePartsStorage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReceiveAssemblyTask.svg b/src/icons/svg/ReceiveAssemblyTask.svg new file mode 100644 index 00000000..1dc59035 --- /dev/null +++ b/src/icons/svg/ReceiveAssemblyTask.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReplenishmentOrders.svg b/src/icons/svg/ReplenishmentOrders.svg new file mode 100644 index 00000000..ce87f1a8 --- /dev/null +++ b/src/icons/svg/ReplenishmentOrders.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ReplenishmentQuery.svg b/src/icons/svg/ReplenishmentQuery.svg new file mode 100644 index 00000000..3f12ec31 --- /dev/null +++ b/src/icons/svg/ReplenishmentQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/TransferQuery.svg b/src/icons/svg/TransferQuery.svg new file mode 100644 index 00000000..fc3b63ee --- /dev/null +++ b/src/icons/svg/TransferQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/bottom.svg b/src/icons/svg/bottom.svg new file mode 100644 index 00000000..dced782a --- /dev/null +++ b/src/icons/svg/bottom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/expand.svg b/src/icons/svg/expand.svg new file mode 100644 index 00000000..cd1df20b --- /dev/null +++ b/src/icons/svg/expand.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/top.svg b/src/icons/svg/top.svg new file mode 100644 index 00000000..f446731f --- /dev/null +++ b/src/icons/svg/top.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/上传.svg b/src/icons/svg/上传.svg new file mode 100644 index 00000000..a1faf658 --- /dev/null +++ b/src/icons/svg/上传.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/仓储管理.svg b/src/icons/svg/仓储管理.svg new file mode 100644 index 00000000..ffd52c8a --- /dev/null +++ b/src/icons/svg/仓储管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/加号1.svg b/src/icons/svg/加号1.svg new file mode 100644 index 00000000..07481daf --- /dev/null +++ b/src/icons/svg/加号1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/加号2.svg b/src/icons/svg/加号2.svg new file mode 100644 index 00000000..9a998797 --- /dev/null +++ b/src/icons/svg/加号2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/右箭头.svg b/src/icons/svg/右箭头.svg new file mode 100644 index 00000000..11c659aa --- /dev/null +++ b/src/icons/svg/右箭头.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/库存查询.svg b/src/icons/svg/库存查询.svg new file mode 100644 index 00000000..036b1190 --- /dev/null +++ b/src/icons/svg/库存查询.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/技术.svg b/src/icons/svg/技术.svg new file mode 100644 index 00000000..8b24de33 --- /dev/null +++ b/src/icons/svg/技术.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/模块化.svg b/src/icons/svg/模块化.svg new file mode 100644 index 00000000..a03ca29c --- /dev/null +++ b/src/icons/svg/模块化.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/箭头.svg b/src/icons/svg/箭头.svg new file mode 100644 index 00000000..7e4297ef --- /dev/null +++ b/src/icons/svg/箭头.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/箭头2.svg b/src/icons/svg/箭头2.svg new file mode 100644 index 00000000..427c1947 --- /dev/null +++ b/src/icons/svg/箭头2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/系统管理.svg b/src/icons/svg/系统管理.svg new file mode 100644 index 00000000..789ca0cf --- /dev/null +++ b/src/icons/svg/系统管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/系统装配.svg b/src/icons/svg/系统装配.svg new file mode 100644 index 00000000..5569a300 --- /dev/null +++ b/src/icons/svg/系统装配.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/设备管理.svg b/src/icons/svg/设备管理.svg new file mode 100644 index 00000000..3044b7ba --- /dev/null +++ b/src/icons/svg/设备管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/车间.svg b/src/icons/svg/车间.svg new file mode 100644 index 00000000..2dcf3501 --- /dev/null +++ b/src/icons/svg/车间.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/采购管理.svg b/src/icons/svg/采购管理.svg new file mode 100644 index 00000000..2d18d165 --- /dev/null +++ b/src/icons/svg/采购管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/销售管理.svg b/src/icons/svg/销售管理.svg new file mode 100644 index 00000000..c5f0dc4c --- /dev/null +++ b/src/icons/svg/销售管理.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/en.js b/src/lang/en.js new file mode 100644 index 00000000..53f1e6c9 --- /dev/null +++ b/src/lang/en.js @@ -0,0 +1,9 @@ +export default { + m: { + music: 'MUSIC', + friend: 'FRIEND' + }, + placeholder: { + data: 'select date' + } +} diff --git a/src/lang/index.js b/src/lang/index.js new file mode 100644 index 00000000..4d12181a --- /dev/null +++ b/src/lang/index.js @@ -0,0 +1,29 @@ +import Vue from 'vue' +import VueI18n from 'vue-i18n' +import elementEnLocale from 'element-ui/lib/locale/lang/en' +import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN' +import locale from 'element-ui/lib/locale' +import enLocale from './en.js' +import zhLocale from './zh.js' + +Vue.use(VueI18n) + +const messages = { + en: { + ...enLocale, + ...elementEnLocale + }, + zh: { + ...zhLocale, + ...elementZhLocale + } +} + +const i18n = new VueI18n({ + locale: 'zh', + messages +}) + +locale.i18n((key, value) => i18n.t(key, value)) + +export default i18n diff --git a/src/lang/zh.js b/src/lang/zh.js new file mode 100644 index 00000000..aca51204 --- /dev/null +++ b/src/lang/zh.js @@ -0,0 +1,9 @@ +export default { + m: { + music: '音乐', + friend: '朋友' + }, + placeholder: { + data: '选择日期' + } +} diff --git a/src/main.js b/src/main.js index c3796311..088f2e3f 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,7 @@ import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import '@/styles/index.scss' // global css +import '@/icon/iconfont.css' import App from './App' import router from './router' @@ -28,6 +29,11 @@ Vue.use(directive) import axios from 'axios' // 引入axios Vue.prototype.$axios = axios // 修改原型链 +import i18n from './lang/index' +Vue.use(ElementUI, { + i18n: (key, value) => i18n.t(key, value) +}) + // axios.defaults.withCredentials = true Vue.use(elDragDialog) @@ -61,6 +67,7 @@ new Vue({ el: '#app', router, store, + i18n, render: h => h(App) }) diff --git a/src/router/index.js b/src/router/index.js index 124e67c6..96f412b7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -24,33 +24,60 @@ import Layout from '../views/layout/Layout' export const constantRouterMap = [ { path: '/login', component: () => import('@/views/login/index'), hidden: true }, { path: '/404', component: () => import('@/views/404'), hidden: true }, - { + /* { + path: '可视化中心', + component: Layout, + meta: { title: '可视化中心', icon: 'MaterialManagement' }, + children: [ + { + path: 'http://192.168.1.231:8005/#/TVF', + meta: { title: '设备运行监控', icon: 'MaterialManagement' } + }, + { + path: 'http://192.168.1.231:8005/#/TVD', + meta: { title: '设备状态监控', icon: 'MaterialManagement' } + }, + { + path: 'http://192.168.1.231:8005/#/TVG', + meta: { title: '项目进度监控', icon: 'MaterialManagement' } + }, + { + path: 'http://192.168.1.231:8005/#/TVB', + meta: { title: 'ANDON', icon: 'MaterialManagement' } + }, + { + path: 'http://192.168.1.232:8010/webpage/GJLED.html', + meta: { title: 'LED屏幕', icon: 'MaterialManagement' } + } + ] + },*/ + /* { path: '可视化中心', component: Layout, meta: { title: '可视化中心', icon: 'MaterialManagement' }, children: [ { - path: 'http://192.168.1.231:8005/#/TVF', + path: 'http://192.168.1.128:8066/#/TVF', meta: { title: '设备运行监控', icon: 'MaterialManagement' } }, { - path: 'http://192.168.1.231:8005/#/TVD', + path: 'http://192.168.1.128:8066/#/TVD', meta: { title: '设备状态监控', icon: 'MaterialManagement' } }, { - path: 'http://192.168.1.231:8005/#/TVG', + path: 'http://192.168.1.128:8066/#/TVG', meta: { title: '项目进度监控', icon: 'MaterialManagement' } }, { - path: 'http://192.168.1.231:8005/#/TVB', + path: 'http://192.168.1.128:8066/#/TVB', meta: { title: 'ANDON', icon: 'MaterialManagement' } }, { - path: 'http://192.168.1.232:8010/webpage/GJLED.html', + path: 'http://192.168.1.128:8035/webpage/GJLED.html', meta: { title: 'LED屏幕', icon: 'MaterialManagement' } } ] - }, + },*/ { path: '/', component: Layout, diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 2d695d7e..81c2a6a2 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -29,12 +29,14 @@ } //表头全局样式 .el-table th{ - background-color: #7eaced; - color: white;/*修改表格头部背景*/ - line-height: 35px!important; - font-family: YouYuan!important; - font-Size: 14px!important; - font-weight:200!important + color: black;/*修改表格头部背景*/ + line-height: 40px!important; + //font-family: YouYuan!important; + font-Size: 13px!important; + font-weight: 400!important; + } + .el-table__row{ + height: 36px!important; } .el-table__row td{ padding: 3px 0!important; @@ -71,10 +73,10 @@ background-color: rgb(98, 157, 209); } - .el-textarea__inner, +/* .el-textarea__inner, .el-radio__inner, .el-input__inner{ - border: 1px solid rgb(49, 56, 72)!important; - } + border: 1px solid gray!important; + }*/ diff --git a/src/styles/index.scss b/src/styles/index.scss index d89792f5..89c1151e 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -24,7 +24,7 @@ html { #app{ height: 100%; .sidebar-container{ - background-color: #152c7c; + background-color: #2d323c; } } @@ -84,19 +84,20 @@ a:hover { background-color: #fff!important; } .submenu-title-noDropdown{ - background-color: #2e296a!important; + background-color: #383e4b!important; color: #cccccc!important; } .el-menu-item.is-active{ - color:#409EFF!important; + color:#fff582!important; } el-form-item__content{ - background-color: #3d3780!important; + background-color: #383e4b!important; } .el-menu-item:hover{ background-color: #9892E4 !important; } .el-menu-item, .el-submenu__title{ + padding-left: 38px !important; line-height: 42px; height: 42px; //background-color: #2e296a!important; @@ -150,18 +151,6 @@ el-card{ .block{ margin-bottom: 3px; } -.el-button--success{ - background: rgb(45,114,213); - border-color: rgb(45,114,213); - &:hover{ - background: rgb(45,114,213); - border-color: rgb(45,114,213); - } - &:focus{ - background: rgb(45,114,213); - border-color: rgb(45,114,213); - } -} .el-button--baocun{ background: #67C23A; border-color: #67C23A; @@ -192,34 +181,16 @@ el-card{ color: white; } } -.el-button--primary{ - background: #ff9759; - border-color: #ff9759; - &:hover{ - background: #ff9759; - border-color: #ff9759; - } - &:focus{ - background: #ff9759; - border-color: #ff9759; - } -} //登录页login输入框上串所以屏蔽 .el-input__inner:focus { border: 1px solid #2A71CB!important; //height: 29px; } -.el-input__inner{ - border: 1px solid red -} -.el-textarea__inner, .el-radio__inner, .el-input__inner{ - border: 1px solid #676767 !important -} //.el-input--small .el-input__inner { // height: 29px; //} .el-breadcrumb__separator { - color: black; + color: #fff; } .el-table td, .el-table th { padding: 0; @@ -260,18 +231,18 @@ h3 { } //生成 .el-button--shengcheng{ - background: #ffffff; - border-color: rgb(255,151,89); - color: rgb(255,151,89); + background: #ff9759; + border-color: #ff9759; + color: white; &:hover{ - background: #ffffff; - border-color: rgb(255,151,89); - color: rgb(255,151,89); + background: #ff9759; + border-color: #ff9759; + color: white; } &:focus{ - background: #ffffff; - border-color: rgb(255,151,89); - color: rgb(255,151,89); + background: #ff9759; + border-color: #ff9759; + color: white; } } .el-button--baocun.is-disabled{ @@ -292,6 +263,14 @@ h3 { .el-tabs--border-card>.el-tabs__content { padding: 8px 8px 8px 8px!important; } +input[type=number] { + -moz-appearance: textfield; +} +input[type=number]::-webkit-inner-spin-button, +input[type=number]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; +} //.el-table__header-wrapper { // height: 25px!important; //} @@ -340,17 +319,34 @@ h3 { color: white; } } +.el-table__body tr.current-row>td{ + background-color: #9BD7FC!important; +} //统一标准全局class 张丁予20200213 .machineTool { // 机床Select .el-input{ width:180px; } } -.el-select{ - width:150px; - margin-right: 10px; +.el-button--mini, .el-button--small { + font-size: 13px; + border-radius: 3px; +} +.el-button--small, .el-button--small.is-round { + padding: 8px 15px; +} + span{ + font-size: 13px; + } + .menu-wrapper span { + font-size: 16px !important; + } +.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{ + border-color: #DCDFE6!important; +} +.el-table--border::after, .el-table--group::after, .el-table::before{ + background-color: #DCDFE6!important; } - // text 按钮禁用后背景颜色 20200309 //.el-button.is-disabled.is-plain, .el-button.is-disabled.is-plain:focus, .el-button.is-disabled.is-plain:hover { // background-color: rgba(255,255,255,0.0); diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index cde0d301..df2576ae 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -1,16 +1,16 @@ #app { // 主体区域 .main-container { - min-width: 1380px; // div3固定宽度后新增 + min-width: 1360px; // div3固定宽度后新增 min-height: 100%; transition: margin-left .28s; - margin-left: 200px; + margin-left: 220px; position: relative; } // 侧边栏 .sidebar-container { transition: width 0.28s; - width: 200px !important; + width: 220px !important; height: 100%; position: fixed; font-size: 0px; @@ -46,7 +46,7 @@ .el-menu { border: none; height: 100%; - background: #152c7c!important; + background: #2d323c!important; width: 100% !important; } } @@ -67,7 +67,7 @@ .el-submenu { overflow: hidden; &>.el-submenu__title { - padding-left: 10px !important; + padding-left: 12px !important; .el-submenu__icon-arrow { display: none; } @@ -90,7 +90,7 @@ .sidebar-container .nest-menu .el-submenu>.el-submenu__title, .sidebar-container .el-submenu .el-menu-item { min-width: 200px !important; - background-color: $subMenuBg !important; + background-color: #383E4D !important; &:hover { background-color: $menuHover !important; } diff --git a/src/utils/curd.js b/src/utils/curd.js index 56851b61..f4005eb1 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -1,6 +1,6 @@ import { ExcelDownLoad } from '@/utils/request' import request from '@/utils/request' - +import Cookie from 'js-cookie' import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { @@ -50,6 +50,8 @@ export default { obj[0].param = param_Str obj[0].pageSize = pageSize obj[0].pageList = pageList + obj[0].UserID = Cookie.get('jobNumber') + obj[0].ModularID = this.$router.currentRoute.path var numn = JSON.stringify(obj[0]) return numn } @@ -257,7 +259,9 @@ export default { if (response.data[0].result === '1') { this.$message.success('增加成功') callback.call(this) - } else { this.$message.error('增加失败') } + } else { + this.$message.error('增加失败') + } }) } else { console.error('error submit!!') @@ -282,7 +286,9 @@ export default { if (response.data[0].result === '1') { this.$message.success('修改成功') callback.call(this) // 回调函数修正this指向组件本身 - } else { this.$message.error('修改失败') } + } else { + this.$message.error('修改失败') + } }) } else { console.error('error submit!!') @@ -312,7 +318,9 @@ export default { if (response.data[0].result === '1') { this.$message.success('删除成功') callback.call(this) // 回调函数修正this指向组件本身 - } else { this.$message.error('数据占用') } + } else { + this.$message.error('数据占用') + } }) }).catch(() => { this.$message({ @@ -324,8 +332,77 @@ export default { console.error('参数传递错误') } } + // 设置字段宽度 + Vue.prototype.setColumnWidth = function(str) { + let columnWidth = 0 + if (str === '日期') { + columnWidth = 90 + } else if (str === '订单编号' || str === '领料单号' || str === '调拨单号' || str === '订单号' || str === '机床名称') { + columnWidth = 140 + } else if (str === '合同编号' || str === '补货单号') { + columnWidth = 140 + } else if (str === '产品名称' || str === '部件名称') { + columnWidth = 110 + } else if (str === '序号') { + columnWidth = 60 + } else if (str === '单位') { + columnWidth = 60 + } else if (str === '数量' || str === '库存') { + columnWidth = 80 + } else if (str === '单价') { + columnWidth = 90 + } else if (str === '金额') { + columnWidth = 120 + } else if (str === '状态' || str === '类型' || str === '选入' || str === '选出') { + columnWidth = 80 + } else if (str === '付款方式') { + columnWidth = 100 + } else if (str === '买方' || str === '买方名称') { + columnWidth = 150 + } else if (str === '外协厂家' || str === '调入仓库' || str === '调出仓库') { + columnWidth = 150 + } else if (str === '姓名') { + columnWidth = 80 + } else if (str === '日期时间') { + columnWidth = 140 + } else if (str === '工序') { + columnWidth = 80 + } else if (str === '物料名称' || str === '工件名称' || str === '零件名称') { + columnWidth = 140 + } else if (str === '图号或型号' || str === '规格' || str === '零件图号' || str === '图号' || str === '图号/型号') { + columnWidth = 120 + } else if (str === '物料编码' || str === '物料编号') { + columnWidth = 120 + } else if (str === '材料') { + columnWidth = 80 + } else if (str === '仓位' || str === '库位') { + columnWidth = 90 + } else if (str === '品名/规格/型号') { + columnWidth = 140 + } else if (str === '备注') { + columnWidth = 120 + } else if (str === '工序名称') { + columnWidth = 150 + } else if (str === '工序说明') { + columnWidth = 300 + } else if (str === '加工工时M' || str === '加工时长H' || str === '加工时长M') { + columnWidth = 90 + } else if (str === '加工设备') { + columnWidth = 130 + } else if (str === '产品详情' || str === '详情') { + columnWidth = 340 + } else if (str === '最低库存') { + columnWidth = 110 + } else if (str === '本次到货数' || str === '本次入库' || str === '补货数') { + columnWidth = 100 + } else { + columnWidth = 110 + } + return columnWidth + } } } + function download(url) { getBlob(url, function(blob, filename) { console.log(blob, filename, 2) @@ -363,3 +440,4 @@ function saveAs(blob, filename) { window.URL.revokeObjectURL(link.href) } } + diff --git a/src/utils/request.js b/src/utils/request.js index 3260b229..39738c5f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,33 @@ import axios from 'axios' -import { wsuri_config, name_config, name1_config, name3_config, name4_config, readFile_config, readImg_config, upload_config, upload2_config, upload3_config, uploadInvoiceScan_config, uploadInvoiceScan1_config, - download_config, uploadPerson_config, uploadOP_config, url_config, ExcelDownLoad_config, ServerIP_config, uploadFileMachine_config, - downloadFileMachine_config, MESUploadFile_config, MESDownloadFile_config, request_config } from '../../static/config' +import { + download_config, + downloadFileMachine_config, + ExcelDownLoad_config, + MESDownloadFile_config, + MESUploadFile_config, + MESUploadFileProcess_config, + MESUploadFileProduct_config, + MESUploadFileProject_config, + name1_config, + name3_config, + name4_config, + name_config, + readFile_config, + readImg_config, + request_config, + ServerIP_config, + upload2_config, + upload3_config, + upload_config, + uploadFileMachine_config, + uploadInvoiceScan1_config, + uploadInvoiceScan_config, + uploadOP_config, + uploadPerson_config, + uploadPersonWord_config, + url_config, + wsuri_config +} from '../../static/config' import Cookies from 'js-cookie' import store from '@/store' @@ -20,6 +46,7 @@ export const uploadInvoiceScan = uploadInvoiceScan_config // invoice export const uploadInvoiceScan1 = uploadInvoiceScan1_config // invoice(workshop) export const download = download_config // ContractInformationManagement export const uploadPerson = uploadPerson_config +export const uploadPersonWord = uploadPersonWord_config export const uploadOP = uploadOP_config export const url = url_config // 采购件入库、离线件入库 export const ExcelDownLoad = ExcelDownLoad_config // 导出excel @@ -28,7 +55,10 @@ export const ServerIP = ServerIP_config export const uploadFileMachine = uploadFileMachine_config // 机床总图 发布时改成0.231 export const downloadFileMachine = downloadFileMachine_config // 机床总图 发布时改成0.231 export const MESUploadFile = MESUploadFile_config +export const MESUploadFileProduct = MESUploadFileProduct_config export const MESDownloadFile = MESDownloadFile_config +export const MESUploadFileProject = MESUploadFileProject_config +export const MESUploadFileProcess = MESUploadFileProcess_config const service = axios.create({ baseURL: request_config, timeout: 1500000 // 请求超时时间 @@ -39,10 +69,8 @@ service.interceptors.request.use(config => { if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') { const id = Cookies.get('id') if (typeof (id) !== 'undefined') { - console.log(id, 123) console.log(typeof (id)) } else { - console.log(456) store.dispatch('FedLogOut').then(() => { location.reload() // 为了重新实例化vue-router对象 避免bug alert('此账号登录失效，请重新登录') diff --git a/src/utils/tool.js b/src/utils/tool.js index 9aa12052..7c3b66af 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -60,6 +60,14 @@ export function getNowShotTime() { const time = date.getFullYear() + '-' + month + '-' + day return time } +// 获取当前时间(yyyy/mm/dd) +export function getNowShotTime1() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '/' + month + '/' + day + return time +} // 获取当前0晨 export function getNowTime1() { const date = new Date() diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue deleted file mode 100644 index 732f59b6..00000000 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ /dev/null @@ -1,480 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyInformationInput/index.vue b/src/views/Assembly/AssemblyInformationInput/index.vue deleted file mode 100644 index f4e15a1f..00000000 --- a/src/views/Assembly/AssemblyInformationInput/index.vue +++ /dev/null @@ -1,247 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyMes/index.vue b/src/views/Assembly/AssemblyMes/index.vue deleted file mode 100644 index 8ed29279..00000000 --- a/src/views/Assembly/AssemblyMes/index.vue +++ /dev/null @@ -1,768 +0,0 @@ - - - - - - diff --git a/src/views/Assembly/AssemblyPlan/index.vue b/src/views/Assembly/AssemblyPlan/index.vue deleted file mode 100644 index c58cdcb3..00000000 --- a/src/views/Assembly/AssemblyPlan/index.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyProcessAssignment/index.vue b/src/views/Assembly/AssemblyProcessAssignment/index.vue deleted file mode 100644 index a84aaee4..00000000 --- a/src/views/Assembly/AssemblyProcessAssignment/index.vue +++ /dev/null @@ -1,234 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyProcessPlanning/index.vue b/src/views/Assembly/AssemblyProcessPlanning/index.vue deleted file mode 100644 index d74dd51d..00000000 --- a/src/views/Assembly/AssemblyProcessPlanning/index.vue +++ /dev/null @@ -1,852 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue deleted file mode 100644 index 60a2b2e8..00000000 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ /dev/null @@ -1,427 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyQuotaSetting/index.vue b/src/views/Assembly/AssemblyQuotaSetting/index.vue deleted file mode 100644 index 4b4986dc..00000000 --- a/src/views/Assembly/AssemblyQuotaSetting/index.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - diff --git a/src/views/Assembly/AssemblyTaskAssignment/index.vue b/src/views/Assembly/AssemblyTaskAssignment/index.vue deleted file mode 100644 index 62ce1aba..00000000 --- a/src/views/Assembly/AssemblyTaskAssignment/index.vue +++ /dev/null @@ -1,624 +0,0 @@ - - - - - - - - diff --git a/src/views/Assembly/AssemblyWorkQuery/index.vue b/src/views/Assembly/AssemblyWorkQuery/index.vue deleted file mode 100644 index d413f590..00000000 --- a/src/views/Assembly/AssemblyWorkQuery/index.vue +++ /dev/null @@ -1,541 +0,0 @@ - - - - - - - - diff --git a/src/views/Assembly/ColdWorkPlanExecution/index.vue b/src/views/Assembly/ColdWorkPlanExecution/index.vue deleted file mode 100644 index 38442f8f..00000000 --- a/src/views/Assembly/ColdWorkPlanExecution/index.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - - diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue deleted file mode 100644 index 2de8f4b1..00000000 --- a/src/views/Assembly/DeliveryApplication/index.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - - - diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue deleted file mode 100644 index 9d686a44..00000000 --- a/src/views/Assembly/DeliveryConfirmation/index.vue +++ /dev/null @@ -1,674 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/views/Assembly/ElectricalAssembly/index.vue b/src/views/Assembly/ElectricalAssembly/index.vue deleted file mode 100644 index dfca7808..00000000 --- a/src/views/Assembly/ElectricalAssembly/index.vue +++ /dev/null @@ -1,350 +0,0 @@ - - - - - diff --git a/src/views/Assembly/InstallationAndMonitoring/index.vue b/src/views/Assembly/InstallationAndMonitoring/index.vue deleted file mode 100644 index fe67d17d..00000000 --- a/src/views/Assembly/InstallationAndMonitoring/index.vue +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue deleted file mode 100644 index a9e4f0e7..00000000 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue deleted file mode 100644 index ff6f19cd..00000000 --- a/src/views/Assembly/MakeColdWorkPlan/index.vue +++ /dev/null @@ -1,321 +0,0 @@ - - - - - diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue deleted file mode 100644 index 2f8aa9bd..00000000 --- a/src/views/Assembly/MakeElectricalAssembly/index.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue deleted file mode 100644 index 3ac3c793..00000000 --- a/src/views/Assembly/MakePaintPlan/index.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/src/views/Assembly/PaintPlanExecution/index.vue b/src/views/Assembly/PaintPlanExecution/index.vue deleted file mode 100644 index 7d53a4d2..00000000 --- a/src/views/Assembly/PaintPlanExecution/index.vue +++ /dev/null @@ -1,275 +0,0 @@ - - - - - diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue deleted file mode 100644 index 73632667..00000000 --- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue deleted file mode 100644 index 8efc089a..00000000 --- a/src/views/Assembly/QualityBasicData/index.vue +++ /dev/null @@ -1,502 +0,0 @@ - - - - - diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue deleted file mode 100644 index 13ffedf1..00000000 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ /dev/null @@ -1,1103 +0,0 @@ - - - - - diff --git a/src/views/Assembly/ShipmentApproval/index.vue b/src/views/Assembly/ShipmentApproval/index.vue deleted file mode 100644 index 803a607e..00000000 --- a/src/views/Assembly/ShipmentApproval/index.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue deleted file mode 100644 index 95b47a39..00000000 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue deleted file mode 100644 index 90bb5fa6..00000000 --- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue +++ /dev/null @@ -1,475 +0,0 @@ - - - - - diff --git a/src/views/AssemblyManagement/AssemblyExecution/index.vue b/src/views/AssemblyManagement/AssemblyExecution/index.vue new file mode 100644 index 00000000..8b83ee02 --- /dev/null +++ b/src/views/AssemblyManagement/AssemblyExecution/index.vue @@ -0,0 +1,1718 @@ + + + + + + diff --git a/src/views/AssemblyManagement/AssemblyExecutionMachine/index.vue b/src/views/AssemblyManagement/AssemblyExecutionMachine/index.vue new file mode 100644 index 00000000..b42a4477 --- /dev/null +++ b/src/views/AssemblyManagement/AssemblyExecutionMachine/index.vue @@ -0,0 +1,1202 @@ + + + + + + diff --git a/src/views/AssemblyManagement/AssemblyExecutionSliding/index.vue b/src/views/AssemblyManagement/AssemblyExecutionSliding/index.vue new file mode 100644 index 00000000..0a087eee --- /dev/null +++ b/src/views/AssemblyManagement/AssemblyExecutionSliding/index.vue @@ -0,0 +1,1794 @@ + + + + + + diff --git a/src/views/AssemblyManagement/AssemblyTaskQuery/index.vue b/src/views/AssemblyManagement/AssemblyTaskQuery/index.vue new file mode 100644 index 00000000..3588e8de --- /dev/null +++ b/src/views/AssemblyManagement/AssemblyTaskQuery/index.vue @@ -0,0 +1,626 @@ + + + + + diff --git a/src/views/AssemblyManagement/AssemblyTaskQuerySliding/index.vue b/src/views/AssemblyManagement/AssemblyTaskQuerySliding/index.vue new file mode 100644 index 00000000..e3fadf1e --- /dev/null +++ b/src/views/AssemblyManagement/AssemblyTaskQuerySliding/index.vue @@ -0,0 +1,821 @@ + + + + + diff --git a/src/views/AssemblyManagement/ReceiveAssemblyTask/index.vue b/src/views/AssemblyManagement/ReceiveAssemblyTask/index.vue new file mode 100644 index 00000000..2bf9924b --- /dev/null +++ b/src/views/AssemblyManagement/ReceiveAssemblyTask/index.vue @@ -0,0 +1,2039 @@ + + + + + diff --git a/src/views/AssemblyManagement/ReceiveAssemblyTaskSliding/index.vue b/src/views/AssemblyManagement/ReceiveAssemblyTaskSliding/index.vue new file mode 100644 index 00000000..8acab73e --- /dev/null +++ b/src/views/AssemblyManagement/ReceiveAssemblyTaskSliding/index.vue @@ -0,0 +1,1897 @@ + + + + + diff --git a/src/views/AssemblyManagement/ReceiveTask/index.vue b/src/views/AssemblyManagement/ReceiveTask/index.vue new file mode 100644 index 00000000..ceb8d367 --- /dev/null +++ b/src/views/AssemblyManagement/ReceiveTask/index.vue @@ -0,0 +1,442 @@ + + + + + diff --git a/src/views/AssemblyManagement/ReplenishmentOrders/index.vue b/src/views/AssemblyManagement/ReplenishmentOrders/index.vue new file mode 100644 index 00000000..c462e307 --- /dev/null +++ b/src/views/AssemblyManagement/ReplenishmentOrders/index.vue @@ -0,0 +1,634 @@ + + + + diff --git a/src/views/AssemblyManagement/ReplenishmentOrdersSliding/index.vue b/src/views/AssemblyManagement/ReplenishmentOrdersSliding/index.vue new file mode 100644 index 00000000..fdb6060c --- /dev/null +++ b/src/views/AssemblyManagement/ReplenishmentOrdersSliding/index.vue @@ -0,0 +1,635 @@ + + + + diff --git a/src/views/AssemblyManagement/TaskQuery/index.vue b/src/views/AssemblyManagement/TaskQuery/index.vue new file mode 100644 index 00000000..b9c95d9c --- /dev/null +++ b/src/views/AssemblyManagement/TaskQuery/index.vue @@ -0,0 +1,607 @@ + + + + + diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue index 4b409515..3e672a63 100644 --- a/src/views/BasicData/MenuManagement/index.vue +++ b/src/views/BasicData/MenuManagement/index.vue @@ -43,6 +43,18 @@ {{ node.label }} + + 上移 + + + 下移 + + + + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index 1c91676b..c6b962f7 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -1,76 +1,59 @@ - - - 取消 @@ -116,7 +94,7 @@ - + @@ -131,13 +109,13 @@ - + @@ -168,13 +146,13 @@ - + @@ -189,60 +167,54 @@ + + diff --git a/src/views/DeviceManagement/EquipmentEnergy/index.vue b/src/views/DeviceManagement/EquipmentEnergy/index.vue new file mode 100644 index 00000000..cfffc6d4 --- /dev/null +++ b/src/views/DeviceManagement/EquipmentEnergy/index.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/src/views/DeviceManagement/EquipmentInformation/index.vue b/src/views/DeviceManagement/EquipmentInformation/index.vue new file mode 100644 index 00000000..fc44dbaa --- /dev/null +++ b/src/views/DeviceManagement/EquipmentInformation/index.vue @@ -0,0 +1,382 @@ + + + + diff --git a/src/views/DeviceManagement/EquipmentSpotCheck/index.vue b/src/views/DeviceManagement/EquipmentSpotCheck/index.vue new file mode 100644 index 00000000..9f493b9d --- /dev/null +++ b/src/views/DeviceManagement/EquipmentSpotCheck/index.vue @@ -0,0 +1,408 @@ + + + + diff --git a/src/views/DeviceManagement/EquipmentState/index.vue b/src/views/DeviceManagement/EquipmentState/index.vue new file mode 100644 index 00000000..b141275c --- /dev/null +++ b/src/views/DeviceManagement/EquipmentState/index.vue @@ -0,0 +1,183 @@ + + + + diff --git a/src/views/DeviceManagement/EquipmentStatus/index.vue b/src/views/DeviceManagement/EquipmentStatus/index.vue new file mode 100644 index 00000000..f28d2353 --- /dev/null +++ b/src/views/DeviceManagement/EquipmentStatus/index.vue @@ -0,0 +1,423 @@ + + + + + diff --git a/src/views/DeviceManagement/EquipmentStatusMonitoring/index.vue b/src/views/DeviceManagement/EquipmentStatusMonitoring/index.vue new file mode 100644 index 00000000..356417af --- /dev/null +++ b/src/views/DeviceManagement/EquipmentStatusMonitoring/index.vue @@ -0,0 +1,1036 @@ + + + + + diff --git a/src/views/DeviceManagement/ReasonforNonconformity/index.vue b/src/views/DeviceManagement/ReasonforNonconformity/index.vue new file mode 100644 index 00000000..03d074f4 --- /dev/null +++ b/src/views/DeviceManagement/ReasonforNonconformity/index.vue @@ -0,0 +1,176 @@ + + + + diff --git a/src/views/DeviceManagement/SpotCheckRecord/index.vue b/src/views/DeviceManagement/SpotCheckRecord/index.vue new file mode 100644 index 00000000..91d4063e --- /dev/null +++ b/src/views/DeviceManagement/SpotCheckRecord/index.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue deleted file mode 100644 index 96305427..00000000 --- a/src/views/Inventory/CreatePickingList/index.vue +++ /dev/null @@ -1,1314 +0,0 @@ - - - - - - diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue deleted file mode 100644 index b2a12d23..00000000 --- a/src/views/Inventory/DirectPart/index.vue +++ /dev/null @@ -1,459 +0,0 @@ - - - - - diff --git a/src/views/Inventory/ExchangeApproval/index.vue b/src/views/Inventory/ExchangeApproval/index.vue deleted file mode 100644 index 0089d0a4..00000000 --- a/src/views/Inventory/ExchangeApproval/index.vue +++ /dev/null @@ -1,186 +0,0 @@ - - - - - diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue deleted file mode 100644 index c7d97afa..00000000 --- a/src/views/Inventory/ExchangePart/index.vue +++ /dev/null @@ -1,570 +0,0 @@ - - - - - diff --git a/src/views/Inventory/GenneralPart/index.vue b/src/views/Inventory/GenneralPart/index.vue deleted file mode 100644 index b4fa8df1..00000000 --- a/src/views/Inventory/GenneralPart/index.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - - diff --git a/src/views/Inventory/InboundCard/exportExcel.js b/src/views/Inventory/InboundCard/exportExcel.js deleted file mode 100644 index a8efad67..00000000 --- a/src/views/Inventory/InboundCard/exportExcel.js +++ /dev/null @@ -1,19 +0,0 @@ -// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） -export function exportExcelMethod(tableId, fileName, sheetName) { - tableToExcel(tableId, fileName, sheetName) -} -const tableToExcel = (function() { - const uri = 'data:application/vnd.ms-excel;base64,' - // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 - const template = `{worksheet}{table}
` - const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } - const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } - return function(table, filename, sheetname) { - if (!table.nodeType) table = document.getElementById(table) - const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } - const aTag = document.createElement('a') - aTag.href = uri + base64(format(template, ctx)) - aTag.download = filename - aTag.click() - } -})() diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue deleted file mode 100644 index 7d1e941d..00000000 --- a/src/views/Inventory/InboundCard/index.vue +++ /dev/null @@ -1,1066 +0,0 @@ - - - - - diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue deleted file mode 100644 index 325dec4b..00000000 --- a/src/views/Inventory/Inboundscanning/index.vue +++ /dev/null @@ -1,352 +0,0 @@ - - - - - diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue deleted file mode 100644 index eb719232..00000000 --- a/src/views/Inventory/InventoryCheck/index.vue +++ /dev/null @@ -1,404 +0,0 @@ - - - - - diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue deleted file mode 100644 index 78079bc4..00000000 --- a/src/views/Inventory/InventoryManagement/index.vue +++ /dev/null @@ -1,610 +0,0 @@ - - - - - diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue deleted file mode 100644 index 8c2a85ad..00000000 --- a/src/views/Inventory/MaterialOut/index.vue +++ /dev/null @@ -1,756 +0,0 @@ - - - - - - - diff --git a/src/views/Inventory/MaterialOut/index2.vue b/src/views/Inventory/MaterialOut/index2.vue deleted file mode 100644 index 4dd688e4..00000000 --- a/src/views/Inventory/MaterialOut/index2.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - diff --git a/src/views/Inventory/MaterialReturn/index.vue b/src/views/Inventory/MaterialReturn/index.vue deleted file mode 100644 index 8e429894..00000000 --- a/src/views/Inventory/MaterialReturn/index.vue +++ /dev/null @@ -1,434 +0,0 @@ - - - - - diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue deleted file mode 100644 index b32d873e..00000000 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ /dev/null @@ -1,523 +0,0 @@ - - - - - diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue deleted file mode 100644 index 4cf9ca30..00000000 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue deleted file mode 100644 index e1d78972..00000000 --- a/src/views/Inventory/OfflinePurchase/index.vue +++ /dev/null @@ -1,619 +0,0 @@ - - - - - diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue deleted file mode 100644 index 24917a10..00000000 --- a/src/views/Inventory/OutPartSelect/index.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue deleted file mode 100644 index 5394574a..00000000 --- a/src/views/Inventory/PartOut/index.vue +++ /dev/null @@ -1,419 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue deleted file mode 100644 index 99c585ea..00000000 --- a/src/views/Inventory/PartsReplacement/index.vue +++ /dev/null @@ -1,739 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue deleted file mode 100644 index 594fc365..00000000 --- a/src/views/Inventory/PickingList/index.vue +++ /dev/null @@ -1,1151 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue deleted file mode 100644 index fe6e0707..00000000 --- a/src/views/Inventory/PickingListApproval/index.vue +++ /dev/null @@ -1,516 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PickingListSearch/index.vue b/src/views/Inventory/PickingListSearch/index.vue deleted file mode 100644 index 47508b14..00000000 --- a/src/views/Inventory/PickingListSearch/index.vue +++ /dev/null @@ -1,838 +0,0 @@ - - - - - - diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue deleted file mode 100644 index b594a218..00000000 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue deleted file mode 100644 index 6339af8b..00000000 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - - diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue deleted file mode 100644 index 18c64367..00000000 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ /dev/null @@ -1,499 +0,0 @@ - - - - - - diff --git a/src/views/Inventory/PurchasePartsStorage/sadas.vue b/src/views/Inventory/PurchasePartsStorage/sadas.vue deleted file mode 100644 index 388669df..00000000 --- a/src/views/Inventory/PurchasePartsStorage/sadas.vue +++ /dev/null @@ -1,550 +0,0 @@ - - - - - diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue deleted file mode 100644 index b87148bd..00000000 --- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue deleted file mode 100644 index 045b2aa0..00000000 --- a/src/views/Inventory/StockInquiry/index.vue +++ /dev/null @@ -1,266 +0,0 @@ - - - diff --git a/src/views/Inventory/SubPartCome/index.vue b/src/views/Inventory/SubPartCome/index.vue deleted file mode 100644 index 2982689f..00000000 --- a/src/views/Inventory/SubPartCome/index.vue +++ /dev/null @@ -1,123 +0,0 @@ - - - - - diff --git a/src/views/Inventory/SubstitutePart/index.vue b/src/views/Inventory/SubstitutePart/index.vue deleted file mode 100644 index cd20b9c3..00000000 --- a/src/views/Inventory/SubstitutePart/index.vue +++ /dev/null @@ -1,545 +0,0 @@ - - - - - diff --git a/src/views/Inventory/genneralPart/index.vue b/src/views/Inventory/genneralPart/index.vue deleted file mode 100644 index b4fa8df1..00000000 --- a/src/views/Inventory/genneralPart/index.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue deleted file mode 100644 index 8b1aecfe..00000000 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ /dev/null @@ -1,543 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue deleted file mode 100644 index 8984137e..00000000 --- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue deleted file mode 100644 index c4650a3a..00000000 --- a/src/views/ManufacturingCenter/AddingOrder/index.vue +++ /dev/null @@ -1,618 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue deleted file mode 100644 index 40e404b2..00000000 --- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/AutomaticScheduling/index.vue b/src/views/ManufacturingCenter/AutomaticScheduling/index.vue deleted file mode 100644 index 1bee4cab..00000000 --- a/src/views/ManufacturingCenter/AutomaticScheduling/index.vue +++ /dev/null @@ -1,1930 +0,0 @@ - - - - diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue deleted file mode 100644 index d85ed5e2..00000000 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ /dev/null @@ -1,364 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue deleted file mode 100644 index 038934f4..00000000 --- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue deleted file mode 100644 index d297700e..00000000 --- a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue deleted file mode 100644 index f8e528a0..00000000 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ /dev/null @@ -1,242 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue deleted file mode 100644 index c1d2bf3c..00000000 --- a/src/views/ManufacturingCenter/ContractDetailsInquiryMetalworking/index.vue +++ /dev/null @@ -1,283 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue deleted file mode 100644 index d197dce1..00000000 --- a/src/views/ManufacturingCenter/CreateIntakeList/index.vue +++ /dev/null @@ -1,507 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js b/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js deleted file mode 100644 index 22925cee..00000000 --- a/src/views/ManufacturingCenter/CreatePreparationBill/exportExcel.js +++ /dev/null @@ -1,20 +0,0 @@ -// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） -export function exportExcelMethod(tableId, fileName, sheetName) { - tableToExcel(tableId, fileName, sheetName) - return 1 -} -const tableToExcel = (function() { - const uri = 'data:application/vnd.ms-excel;base64,' - // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 - const template = `{worksheet}{table}
` - const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } - const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } - return function(table, filename, sheetname) { - if (!table.nodeType) table = document.getElementById(table) - const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } - const aTag = document.createElement('a') - aTag.href = uri + base64(format(template, ctx)) - aTag.download = filename - aTag.click() - } -})() diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue deleted file mode 100644 index 73a5d01c..00000000 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - - diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue deleted file mode 100644 index 4e97f14e..00000000 --- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue +++ /dev/null @@ -1,525 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue deleted file mode 100644 index 0d865714..00000000 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ /dev/null @@ -1,326 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue deleted file mode 100644 index 555f810e..00000000 --- a/src/views/ManufacturingCenter/Enter0therData/index.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue deleted file mode 100644 index 652355e5..00000000 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ /dev/null @@ -1,549 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue deleted file mode 100644 index 43153eb3..00000000 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ /dev/null @@ -1,1254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue index 3f10273d..47cdd489 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoringNew/index.vue @@ -39,7 +39,7 @@ - - diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue deleted file mode 100644 index 1e4a56b2..00000000 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ /dev/null @@ -1,1420 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue deleted file mode 100644 index 2de862a3..00000000 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/ManufacturingCenter/MachiningParts/index.vue b/src/views/ManufacturingCenter/MachiningParts/index.vue deleted file mode 100644 index 9e29744c..00000000 --- a/src/views/ManufacturingCenter/MachiningParts/index.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue deleted file mode 100644 index 0b272612..00000000 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ /dev/null @@ -1,684 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue deleted file mode 100644 index 7686671e..00000000 --- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue +++ /dev/null @@ -1,628 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js b/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js deleted file mode 100644 index a4a80fd7..00000000 --- a/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js +++ /dev/null @@ -1,224 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -// import XLSX from 'xlsx' -import XLSX from 'xlsx-style' -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - headerGroup, - dataGroup, - sheetGroup, - filename, - autoWidth = true, - bookType= 'xlsx' -} = {}) { - var wb = new Workbook() - for (let i = 0; i < dataGroup.length; i++) { - /* original data */ - let data = dataGroup[i] - filename = filename || 'excel-list' - data = [...data] - data.unshift(headerGroup[i]); - var ws_name = sheetGroup[i]; - var ws = sheet_from_array_of_arrays(data); - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - let R = 0; - data.map(item => { - let C = 0; - item.map(itm => { - var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); - var cell = {v: itm } - cell.s= { - alignment: { - horizontal: "center" - } - } - ws[cell_ref] = cell; - C++; - }) - R++; - }) - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - } - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue deleted file mode 100644 index d582167c..00000000 --- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue +++ /dev/null @@ -1,226 +0,0 @@ - - - - diff --git a/src/views/ManufacturingCenter/MaterialAllocation/Export2Excel.js b/src/views/ManufacturingCenter/MaterialAllocation/Export2Excel.js deleted file mode 100644 index 20784f3a..00000000 --- a/src/views/ManufacturingCenter/MaterialAllocation/Export2Excel.js +++ /dev/null @@ -1,220 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -import XLSX from 'xlsx' - -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - multiHeader = [], - header, - data, - filename, - merges = [], - autoWidth = true, - bookType= 'xlsx' -} = {}) { - /* original data */ - filename = filename || 'excel-list' - data = [...data] - data.unshift(header); - - for (let i = multiHeader.length-1; i > -1; i--) { - data.unshift(multiHeader[i]) - } - - var ws_name = "SheetJS"; - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - if (merges.length > 0) { - if (!ws['!merges']) ws['!merges'] = []; - merges.forEach(item => { - ws['!merges'].push(XLSX.utils.decode_range(item)) - }) - } - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/ManufacturingCenter/MaterialAllocation/index.vue b/src/views/ManufacturingCenter/MaterialAllocation/index.vue deleted file mode 100644 index bba42d63..00000000 --- a/src/views/ManufacturingCenter/MaterialAllocation/index.vue +++ /dev/null @@ -1,648 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue deleted file mode 100644 index fdc401d0..00000000 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ /dev/null @@ -1,368 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue deleted file mode 100644 index c80b5024..00000000 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ /dev/null @@ -1,400 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue deleted file mode 100644 index 59e6e00b..00000000 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ /dev/null @@ -1,240 +0,0 @@ - - diff --git a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue deleted file mode 100644 index a1f25e9c..00000000 --- a/src/views/ManufacturingCenter/MonthEndHourAccountingMetalworking/index.vue +++ /dev/null @@ -1,290 +0,0 @@ - - diff --git a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue b/src/views/ManufacturingCenter/OnlineProcessChange/index.vue deleted file mode 100644 index fc6d4559..00000000 --- a/src/views/ManufacturingCenter/OnlineProcessChange/index.vue +++ /dev/null @@ -1,1658 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue deleted file mode 100644 index 6822792a..00000000 --- a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue +++ /dev/null @@ -1,207 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue deleted file mode 100644 index acd31ace..00000000 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ /dev/null @@ -1,4527 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue deleted file mode 100644 index 66bd0cb3..00000000 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ /dev/null @@ -1,1689 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue deleted file mode 100644 index a8211dea..00000000 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ /dev/null @@ -1,495 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue deleted file mode 100644 index dc5fe119..00000000 --- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue deleted file mode 100644 index 39bc4068..00000000 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ /dev/null @@ -1,1459 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue deleted file mode 100644 index 18378475..00000000 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ /dev/null @@ -1,1705 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue deleted file mode 100644 index 9452dd73..00000000 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ /dev/null @@ -1,1702 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue deleted file mode 100644 index 0ea4125e..00000000 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue deleted file mode 100644 index 6e3f0436..00000000 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ /dev/null @@ -1,655 +0,0 @@ - - - - diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue deleted file mode 100644 index a7fd426f..00000000 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ /dev/null @@ -1,800 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue deleted file mode 100644 index 0c25193e..00000000 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ /dev/null @@ -1,891 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue deleted file mode 100644 index 0f1374da..00000000 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ /dev/null @@ -1,1575 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue deleted file mode 100644 index 07a2d31d..00000000 --- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue deleted file mode 100644 index e4080737..00000000 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ /dev/null @@ -1,795 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue deleted file mode 100644 index 6daa59f1..00000000 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue +++ /dev/null @@ -1,904 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue deleted file mode 100644 index 971015c2..00000000 --- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue +++ /dev/null @@ -1,521 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue deleted file mode 100644 index ca1e26ad..00000000 --- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue +++ /dev/null @@ -1,1163 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue b/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue deleted file mode 100644 index 901e38ac..00000000 --- a/src/views/ManufacturingCenter/QualityInspectionQueryMetalworking/index.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/Querybd/index.vue b/src/views/ManufacturingCenter/Querybd/index.vue deleted file mode 100644 index 01df9f7c..00000000 --- a/src/views/ManufacturingCenter/Querybd/index.vue +++ /dev/null @@ -1,649 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue deleted file mode 100644 index 87caf7a4..00000000 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ /dev/null @@ -1,352 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue deleted file mode 100644 index 198186ba..00000000 --- a/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue deleted file mode 100644 index a2bb1023..00000000 --- a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue +++ /dev/null @@ -1,564 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue deleted file mode 100644 index 86192973..00000000 --- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue deleted file mode 100644 index 68d37ef0..00000000 --- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue +++ /dev/null @@ -1,328 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue deleted file mode 100644 index eae13350..00000000 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ /dev/null @@ -1,406 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue deleted file mode 100644 index ff3dd179..00000000 --- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue +++ /dev/null @@ -1,444 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue deleted file mode 100644 index a83f4d5f..00000000 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ /dev/null @@ -1,310 +0,0 @@ - - - - diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue deleted file mode 100644 index e005f608..00000000 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - diff --git a/src/views/ManufacturingCenter/SparePartsOut/index.vue b/src/views/ManufacturingCenter/SparePartsOut/index.vue deleted file mode 100644 index 8201d649..00000000 --- a/src/views/ManufacturingCenter/SparePartsOut/index.vue +++ /dev/null @@ -1,291 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/SparePartsPurchase/index.vue b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue deleted file mode 100644 index aa335836..00000000 --- a/src/views/ManufacturingCenter/SparePartsPurchase/index.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue deleted file mode 100644 index b9867c48..00000000 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue deleted file mode 100644 index 0bcd4211..00000000 --- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/零件追溯备份.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/零件追溯备份.vue deleted file mode 100644 index 72915b9d..00000000 --- a/src/views/ManufacturingCenter/TraceabilityOfParts/零件追溯备份.vue +++ /dev/null @@ -1,445 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue b/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue deleted file mode 100644 index 6553cfbd..00000000 --- a/src/views/ManufacturingCenter/TypicalProcessMaintenance/index.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue deleted file mode 100644 index 4582acb7..00000000 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ /dev/null @@ -1,377 +0,0 @@ - - - - - diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js b/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js deleted file mode 100644 index a4a80fd7..00000000 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/Export2Excel.js +++ /dev/null @@ -1,224 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -// import XLSX from 'xlsx' -import XLSX from 'xlsx-style' -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - headerGroup, - dataGroup, - sheetGroup, - filename, - autoWidth = true, - bookType= 'xlsx' -} = {}) { - var wb = new Workbook() - for (let i = 0; i < dataGroup.length; i++) { - /* original data */ - let data = dataGroup[i] - filename = filename || 'excel-list' - data = [...data] - data.unshift(headerGroup[i]); - var ws_name = sheetGroup[i]; - var ws = sheet_from_array_of_arrays(data); - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - let R = 0; - data.map(item => { - let C = 0; - item.map(itm => { - var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); - var cell = {v: itm } - cell.s= { - alignment: { - horizontal: "center" - } - } - ws[cell_ref] = cell; - C++; - }) - R++; - }) - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - } - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js b/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js deleted file mode 100644 index c5075de7..00000000 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/exportExcel.js +++ /dev/null @@ -1,24 +0,0 @@ -// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） -export function exportExcelMethod(tableId, fileName, sheetName) { - tableToExcel(tableId, fileName, sheetName) -} -const tableToExcel = (function() { - const uri = 'data:application/vnd.ms-excel;base64,' - // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 - const template = `{worksheet}{table}
` - const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } - const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } - return function(table, filename, sheetname) { - if (!table.nodeType) table = document.getElementById(table) - const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } - const blob = new Blob([format(template, ctx)]) - if ('msSaveOrOpenBlob' in navigator) { - window.navigator.msSaveOrOpenBlob(blob, filename + '.xls') - return - } - const aTag = document.createElement('a') - aTag.href = uri + base64(format(template, ctx)) - aTag.download = filename - aTag.click() - } -})() diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue deleted file mode 100644 index 63398543..00000000 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue deleted file mode 100644 index b16cb4ca..00000000 --- a/src/views/ManufacturingCenter/maintainInformation/index.vue +++ /dev/null @@ -1,772 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue deleted file mode 100644 index 4b8cb494..00000000 --- a/src/views/MarketingCenter/BidBond/index.vue +++ /dev/null @@ -1,993 +0,0 @@ - - - - - - diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue deleted file mode 100644 index 9696ddde..00000000 --- a/src/views/MarketingCenter/CRM/index.vue +++ /dev/null @@ -1,736 +0,0 @@ - - - - - - - diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue deleted file mode 100644 index 70afb035..00000000 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ /dev/null @@ -1,1087 +0,0 @@ - - - - - - diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue deleted file mode 100644 index 257b6fd6..00000000 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ /dev/null @@ -1,642 +0,0 @@ - - - - - - diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue deleted file mode 100644 index d4ca774b..00000000 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ /dev/null @@ -1,1444 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue deleted file mode 100644 index f7f9c966..00000000 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ /dev/null @@ -1,557 +0,0 @@ - - - - - - diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue deleted file mode 100644 index d2b7c8c1..00000000 --- a/src/views/MarketingCenter/DeliveryApplication/index.vue +++ /dev/null @@ -1,1257 +0,0 @@ - - - - - - - diff --git a/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue b/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue deleted file mode 100644 index 41c39e4d..00000000 --- a/src/views/MarketingCenter/DeliveryManagement/UploadExcel/index.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/DeliveryManagement/exportExcel.js b/src/views/MarketingCenter/DeliveryManagement/exportExcel.js deleted file mode 100644 index a8efad67..00000000 --- a/src/views/MarketingCenter/DeliveryManagement/exportExcel.js +++ /dev/null @@ -1,19 +0,0 @@ -// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） -export function exportExcelMethod(tableId, fileName, sheetName) { - tableToExcel(tableId, fileName, sheetName) -} -const tableToExcel = (function() { - const uri = 'data:application/vnd.ms-excel;base64,' - // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 - const template = `{worksheet}{table}
` - const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } - const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } - return function(table, filename, sheetname) { - if (!table.nodeType) table = document.getElementById(table) - const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } - const aTag = document.createElement('a') - aTag.href = uri + base64(format(template, ctx)) - aTag.download = filename - aTag.click() - } -})() diff --git a/src/views/MarketingCenter/DeliveryManagement/htmlToPdf.js b/src/views/MarketingCenter/DeliveryManagement/htmlToPdf.js deleted file mode 100644 index 1db779a7..00000000 --- a/src/views/MarketingCenter/DeliveryManagement/htmlToPdf.js +++ /dev/null @@ -1,38 +0,0 @@ -import html2Canvas from 'html2canvas' -import JsPDF from 'jspdf' -export default { - install(Vue, options) { - Vue.prototype.getPdf = function() { - console.log(document) - var title = '12' // this.htmlTitle - html2Canvas(document.querySelector('#pdfDom'), { - allowTaint: true - }).then(function(canvas) { - const contentWidth = canvas.width - const contentHeight = canvas.height - const pageHeight = contentWidth / 592.28 * 841.89 - let leftHeight = contentHeight - let position = 0 - const imgWidth = 595.28 - const imgHeight = 592.28 / contentWidth * contentHeight - const pageData = canvas.toDataURL('image/jpeg', 1.0) - const PDF = new JsPDF('', 'pt', 'a4') - console.log(PDF, 99) - if (leftHeight < pageHeight) { - PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight) - } else { - while (leftHeight > 0) { - PDF.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight) - leftHeight -= pageHeight - position -= 841.89 - if (leftHeight > 0) { - PDF.addPage() - } - } - } - PDF.save(title + '.pdf') - } - ) - } - } -} diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue deleted file mode 100644 index 379ddb83..00000000 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ /dev/null @@ -1,1385 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue deleted file mode 100644 index db981909..00000000 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ /dev/null @@ -1,901 +0,0 @@ - - - - - - diff --git a/src/views/MarketingCenter/MarginManagement/index.vue b/src/views/MarketingCenter/MarginManagement/index.vue deleted file mode 100644 index 9bd42b0e..00000000 --- a/src/views/MarketingCenter/MarginManagement/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue deleted file mode 100644 index 6095830c..00000000 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ /dev/null @@ -1,1075 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue deleted file mode 100644 index bdabce83..00000000 --- a/src/views/MarketingCenter/ProjectProgress/index.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue deleted file mode 100644 index 3514bf39..00000000 --- a/src/views/MarketingCenter/SafetyMargin/index.vue +++ /dev/null @@ -1,1187 +0,0 @@ - - - - - diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue deleted file mode 100644 index adae1e82..00000000 --- a/src/views/MarketingCenter/ShippingInquiries/index.vue +++ /dev/null @@ -1,242 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue deleted file mode 100644 index 66d17f75..00000000 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ /dev/null @@ -1,403 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue deleted file mode 100644 index 5d598821..00000000 --- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue deleted file mode 100644 index ab434ab5..00000000 --- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue +++ /dev/null @@ -1,380 +0,0 @@ - - - diff --git a/src/views/Outsourcing/OutsourcingInspectionEntry/index.vue b/src/views/Outsourcing/OutsourcingInspectionEntry/index.vue deleted file mode 100644 index 68e70d69..00000000 --- a/src/views/Outsourcing/OutsourcingInspectionEntry/index.vue +++ /dev/null @@ -1,344 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingInspectionEntry2/index.vue b/src/views/Outsourcing/OutsourcingInspectionEntry2/index.vue deleted file mode 100644 index a8efa57f..00000000 --- a/src/views/Outsourcing/OutsourcingInspectionEntry2/index.vue +++ /dev/null @@ -1,405 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue deleted file mode 100644 index bfb12a94..00000000 --- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue +++ /dev/null @@ -1,359 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue deleted file mode 100644 index 2bb93cce..00000000 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue deleted file mode 100644 index 17b4d858..00000000 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement2/index.vue +++ /dev/null @@ -1,668 +0,0 @@ - - - - - - diff --git a/src/views/Outsourcing/OutsourcingPriceBudget/index.vue b/src/views/Outsourcing/OutsourcingPriceBudget/index.vue deleted file mode 100644 index bca49e07..00000000 --- a/src/views/Outsourcing/OutsourcingPriceBudget/index.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue deleted file mode 100644 index dcdc74b9..00000000 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ /dev/null @@ -1,794 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingStatus/index.vue b/src/views/Outsourcing/OutsourcingStatus/index.vue deleted file mode 100644 index 28451ccb..00000000 --- a/src/views/Outsourcing/OutsourcingStatus/index.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue deleted file mode 100644 index 21f1cd88..00000000 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ /dev/null @@ -1,739 +0,0 @@ - - - - - diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue deleted file mode 100644 index 100a28aa..00000000 --- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue deleted file mode 100644 index 7582786c..00000000 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ /dev/null @@ -1,339 +0,0 @@ - - - - - - diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue deleted file mode 100644 index 74f89877..00000000 --- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - diff --git a/src/views/ProjectManagement/assess.vue b/src/views/ProjectManagement/assess.vue deleted file mode 100644 index fb37a0a8..00000000 --- a/src/views/ProjectManagement/assess.vue +++ /dev/null @@ -1,405 +0,0 @@ - - - - - diff --git a/src/views/ProjectManagement/change.vue b/src/views/ProjectManagement/change.vue deleted file mode 100644 index fc8d2a6e..00000000 --- a/src/views/ProjectManagement/change.vue +++ /dev/null @@ -1,249 +0,0 @@ - - - - - diff --git a/src/views/ProjectManagement/progress.vue b/src/views/ProjectManagement/progress.vue deleted file mode 100644 index 2b160785..00000000 --- a/src/views/ProjectManagement/progress.vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - diff --git a/src/views/ProjectManagement/summarize.vue b/src/views/ProjectManagement/summarize.vue deleted file mode 100644 index 50c93864..00000000 --- a/src/views/ProjectManagement/summarize.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue deleted file mode 100644 index 00f6d427..00000000 --- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue deleted file mode 100644 index c7da031a..00000000 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ /dev/null @@ -1,205 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue deleted file mode 100644 index e40a22e8..00000000 --- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue deleted file mode 100644 index e0b38077..00000000 --- a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js deleted file mode 100644 index 99c32e72..00000000 --- a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js +++ /dev/null @@ -1,323 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -import XLSX from 'xlsx' - -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - multiHeader = [], - header, - data, - filename, - merges = [], - autoWidth = true, - bookType= 'xlsx' -} = {}) { - console.log(header,111) - /* original data */ - filename = filename || 'excel-list' - data = [...data] - data.unshift(header); - - for (let i = multiHeader.length-1; i > -1; i--) { - data.unshift(multiHeader[i]) - } - - var ws_name = "SheetJS"; - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - if (merges.length > 0) { - if (!ws['!merges']) ws['!merges'] = []; - merges.forEach(item => { - ws['!merges'].push(XLSX.utils.decode_range(item)) - }) - } - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} -export function export_json_to_excel2({ - multiHeader = [], - header, - data, - sheetname, - filename, - merges = [], - autoWidth = true, - bookType = 'xlsx' - } = {}) { - /* original data */ - filename = filename || 'excel-list' - data = [...data] - - for (var i = 0; i < header.length; i++) { - data[i].unshift(header[i]) - } - - // data.unshift(header) - - for (let i = multiHeader.length - 1; i > -1; i--) { - data.unshift(multiHeader[i]) - } - - var ws_name = sheetname - var wb = new Workbook(), - ws = [] - for (var j = 0; j < header.length; j++) { - ws.push(sheet_from_array_of_arrays(data[j])) - } - - if (merges.length > 0) { - if (!ws['!merges']) ws['!merges'] = [] - merges.forEach(item => { - ws['!merges'].push(XLSX.utils.decode_range(item)) - }) - } - // console.log("width", autoWidth) - if (autoWidth) { - /* 设置worksheet每列的最大宽度*/ - var colWidth = [] - for (var k = 0; k < header.length; k++) { - colWidth.push( - data[k].map(row => - row.map(val => { - /* 先判断是否为null/undefined*/ - if (val == null) { - return { - wch: 10 - } - } else if (val.toString().charCodeAt(0) > 255) { - /* 再判断是否为中文*/ - return { - wch: val.toString().length * 2 - } - } else { - return { - wch: val.toString().length - } - } - }) - ) - ) - } - - /* 以第一行为初始值*/ - const result = [] - for (var k = 0; k < colWidth.length; k++) { - result[k] = colWidth[k][0] - for (let i = 1; i < colWidth[k].length; i++) { - for (let j = 0; j < colWidth[k][i].length; j++) { - if (result[k][j]['wch'] < colWidth[k][i][j]['wch']) { - result[k][j]['wch'] = colWidth[k][i][j]['wch'] - } - } - } - } - // 分别给sheet表设置宽度 - for (var l = 0; l < result.length; l++) { - ws[l]['!cols'] = result[l] - } - } - - /* add worksheet to workbook */ - for (var k = 0; k < header.length; k++) { - wb.SheetNames.push(ws_name[k]) - wb.Sheets[ws_name[k]] = ws[k] - } - - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }) - saveAs( - new Blob([s2ab(wbout)], { - type: 'application/octet-stream' - }), - `${filename}.${bookType}` - ) -} - diff --git a/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js b/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js deleted file mode 100644 index c5075de7..00000000 --- a/src/views/PurchasingCenter/CreateInquirySheet/exportExcel.js +++ /dev/null @@ -1,24 +0,0 @@ -// 导出Excel方法（表格id，不加扩展名的文件名，sheet名） -export function exportExcelMethod(tableId, fileName, sheetName) { - tableToExcel(tableId, fileName, sheetName) -} -const tableToExcel = (function() { - const uri = 'data:application/vnd.ms-excel;base64,' - // 设置导出表格的单元格默认高度/宽度/边框样式/字体颜色/背景颜色/居中，网页显示表格宽度建议1240，tr/td视情况而定 - const template = `{worksheet}{table}
` - const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) } - const format = function(s, c) { return s.replace(/{(\w+)}/g, function(m, p) { return c[p] }) } - return function(table, filename, sheetname) { - if (!table.nodeType) table = document.getElementById(table) - const ctx = { worksheet: sheetname || 'Worksheet', table: table.innerHTML } - const blob = new Blob([format(template, ctx)]) - if ('msSaveOrOpenBlob' in navigator) { - window.navigator.msSaveOrOpenBlob(blob, filename + '.xls') - return - } - const aTag = document.createElement('a') - aTag.href = uri + base64(format(template, ctx)) - aTag.download = filename - aTag.click() - } -})() diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue deleted file mode 100644 index f000b7b2..00000000 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ /dev/null @@ -1,2382 +0,0 @@ - - - - - - - diff --git a/src/views/PurchasingCenter/CreateInquirySheet/setMethods.js b/src/views/PurchasingCenter/CreateInquirySheet/setMethods.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue deleted file mode 100644 index 206531e8..00000000 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ /dev/null @@ -1,955 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue deleted file mode 100644 index a0d578c3..00000000 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ /dev/null @@ -1,455 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue deleted file mode 100644 index 735cbb05..00000000 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ /dev/null @@ -1,473 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue deleted file mode 100644 index dc41d754..00000000 --- a/src/views/PurchasingCenter/FundApproval3/index.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue deleted file mode 100644 index df110181..00000000 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ /dev/null @@ -1,1107 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue deleted file mode 100644 index ce2572bf..00000000 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ /dev/null @@ -1,585 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue deleted file mode 100644 index 8b0e6d3d..00000000 --- a/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue +++ /dev/null @@ -1,550 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue deleted file mode 100644 index 0018f2cb..00000000 --- a/src/views/PurchasingCenter/MaterialMProcure/index.vue +++ /dev/null @@ -1,754 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue deleted file mode 100644 index b6e1f516..00000000 --- a/src/views/PurchasingCenter/MaterialManagement/index.vue +++ /dev/null @@ -1,962 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue deleted file mode 100644 index 14876f86..00000000 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ /dev/null @@ -1,1832 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue deleted file mode 100644 index cc9bbb19..00000000 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ /dev/null @@ -1,592 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue deleted file mode 100644 index c7fce5a6..00000000 --- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue deleted file mode 100644 index af9df3ac..00000000 --- a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue +++ /dev/null @@ -1,240 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue deleted file mode 100644 index de292ab9..00000000 --- a/src/views/PurchasingCenter/PayStateSearch/index.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue deleted file mode 100644 index 4dc75f71..00000000 --- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue deleted file mode 100644 index ed32fa09..00000000 --- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue deleted file mode 100644 index 07c66c85..00000000 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ /dev/null @@ -1,825 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue deleted file mode 100644 index 33874106..00000000 --- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue +++ /dev/null @@ -1,430 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue deleted file mode 100644 index 7fc9bd6d..00000000 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ /dev/null @@ -1,601 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue deleted file mode 100644 index c5a26331..00000000 --- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue +++ /dev/null @@ -1,600 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue deleted file mode 100644 index 66aa70b4..00000000 --- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue +++ /dev/null @@ -1,179 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/Export2Excel.js b/src/views/PurchasingCenter/PurchaseSituationSearch/Export2Excel.js deleted file mode 100644 index a4a80fd7..00000000 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/Export2Excel.js +++ /dev/null @@ -1,224 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -// import XLSX from 'xlsx' -import XLSX from 'xlsx-style' -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - headerGroup, - dataGroup, - sheetGroup, - filename, - autoWidth = true, - bookType= 'xlsx' -} = {}) { - var wb = new Workbook() - for (let i = 0; i < dataGroup.length; i++) { - /* original data */ - let data = dataGroup[i] - filename = filename || 'excel-list' - data = [...data] - data.unshift(headerGroup[i]); - var ws_name = sheetGroup[i]; - var ws = sheet_from_array_of_arrays(data); - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - let R = 0; - data.map(item => { - let C = 0; - item.map(itm => { - var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); - var cell = {v: itm } - cell.s= { - alignment: { - horizontal: "center" - } - } - ws[cell_ref] = cell; - C++; - }) - R++; - }) - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - } - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue deleted file mode 100644 index 3857ea2f..00000000 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ /dev/null @@ -1,884 +0,0 @@ - - - - - - diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue deleted file mode 100644 index 4d350a2f..00000000 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ /dev/null @@ -1,1216 +0,0 @@ - - - - - - - diff --git a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue deleted file mode 100644 index 2a2ee78c..00000000 --- a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue +++ /dev/null @@ -1,533 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue deleted file mode 100644 index 26a544fe..00000000 --- a/src/views/PurchasingCenter/ReceiveCheck/index.vue +++ /dev/null @@ -1,348 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue deleted file mode 100644 index c56302f0..00000000 --- a/src/views/PurchasingCenter/SetPayPlan/index.vue +++ /dev/null @@ -1,316 +0,0 @@ - - - - - diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue deleted file mode 100644 index 2fdc7622..00000000 --- a/src/views/PurchasingCenter/SupplierManagement/index.vue +++ /dev/null @@ -1,619 +0,0 @@ - - - - - diff --git a/src/views/PurchasingManagement/ArrivalNotice/index.vue b/src/views/PurchasingManagement/ArrivalNotice/index.vue new file mode 100644 index 00000000..f66fa5a8 --- /dev/null +++ b/src/views/PurchasingManagement/ArrivalNotice/index.vue @@ -0,0 +1,201 @@ + + + + diff --git a/src/views/PurchasingManagement/OrderInquiry/index.vue b/src/views/PurchasingManagement/OrderInquiry/index.vue new file mode 100644 index 00000000..e08a00a9 --- /dev/null +++ b/src/views/PurchasingManagement/OrderInquiry/index.vue @@ -0,0 +1,1168 @@ + + + + + + diff --git a/src/views/PurchasingManagement/OutlineOrderInquiry/index.vue b/src/views/PurchasingManagement/OutlineOrderInquiry/index.vue new file mode 100644 index 00000000..43b71376 --- /dev/null +++ b/src/views/PurchasingManagement/OutlineOrderInquiry/index.vue @@ -0,0 +1,296 @@ + + + + diff --git a/src/views/PurchasingManagement/OutlinePartsSearch/index.vue b/src/views/PurchasingManagement/OutlinePartsSearch/index.vue new file mode 100644 index 00000000..1d72d415 --- /dev/null +++ b/src/views/PurchasingManagement/OutlinePartsSearch/index.vue @@ -0,0 +1,294 @@ + + + + diff --git a/src/views/PurchasingManagement/OutlinePurchaseOrder/index.vue b/src/views/PurchasingManagement/OutlinePurchaseOrder/index.vue new file mode 100644 index 00000000..195e9f1c --- /dev/null +++ b/src/views/PurchasingManagement/OutlinePurchaseOrder/index.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/PurchasingManagement/PurchaseOrder/index.vue b/src/views/PurchasingManagement/PurchaseOrder/index.vue new file mode 100644 index 00000000..42acd3f9 --- /dev/null +++ b/src/views/PurchasingManagement/PurchaseOrder/index.vue @@ -0,0 +1,1993 @@ + + + + + diff --git a/src/views/PurchasingManagement/PurchasedPartsSearch/index.vue b/src/views/PurchasingManagement/PurchasedPartsSearch/index.vue new file mode 100644 index 00000000..7987bb5a --- /dev/null +++ b/src/views/PurchasingManagement/PurchasedPartsSearch/index.vue @@ -0,0 +1,610 @@ + + + + diff --git a/src/views/PurchasingManagement/SupplierManagement/index.vue b/src/views/PurchasingManagement/SupplierManagement/index.vue new file mode 100644 index 00000000..78403b1c --- /dev/null +++ b/src/views/PurchasingManagement/SupplierManagement/index.vue @@ -0,0 +1,316 @@ + + + + diff --git a/src/views/SalesManagement/AfterSalesContract/index.vue b/src/views/SalesManagement/AfterSalesContract/index.vue new file mode 100644 index 00000000..fdac4c73 --- /dev/null +++ b/src/views/SalesManagement/AfterSalesContract/index.vue @@ -0,0 +1,2442 @@ + + + + diff --git a/src/views/SalesManagement/AfterService/index.vue b/src/views/SalesManagement/AfterService/index.vue new file mode 100644 index 00000000..e38cb00e --- /dev/null +++ b/src/views/SalesManagement/AfterService/index.vue @@ -0,0 +1,449 @@ + + + + diff --git a/src/views/SalesManagement/AfterServiceSearch/index.vue b/src/views/SalesManagement/AfterServiceSearch/index.vue new file mode 100644 index 00000000..39325e78 --- /dev/null +++ b/src/views/SalesManagement/AfterServiceSearch/index.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/src/views/SalesManagement/CompanyInformationMaintenance/index.vue b/src/views/SalesManagement/CompanyInformationMaintenance/index.vue new file mode 100644 index 00000000..706a4b47 --- /dev/null +++ b/src/views/SalesManagement/CompanyInformationMaintenance/index.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/SalesManagement/ContractSearch/index.vue b/src/views/SalesManagement/ContractSearch/index.vue new file mode 100644 index 00000000..97ec413d --- /dev/null +++ b/src/views/SalesManagement/ContractSearch/index.vue @@ -0,0 +1,2849 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/SalesManagement/ContractSearchNew/index.vue b/src/views/SalesManagement/ContractSearchNew/index.vue new file mode 100644 index 00000000..becc839e --- /dev/null +++ b/src/views/SalesManagement/ContractSearchNew/index.vue @@ -0,0 +1,2712 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/views/SalesManagement/CreateQuotation/index.vue b/src/views/SalesManagement/CreateQuotation/index.vue new file mode 100644 index 00000000..04390a99 --- /dev/null +++ b/src/views/SalesManagement/CreateQuotation/index.vue @@ -0,0 +1,1997 @@ + + + + diff --git a/src/views/SalesManagement/CustomerManagement/index.vue b/src/views/SalesManagement/CustomerManagement/index.vue new file mode 100644 index 00000000..8e385a1b --- /dev/null +++ b/src/views/SalesManagement/CustomerManagement/index.vue @@ -0,0 +1,397 @@ + + + diff --git a/src/views/SalesManagement/DeliveryNotice/DeliveryNotice.vue b/src/views/SalesManagement/DeliveryNotice/DeliveryNotice.vue new file mode 100644 index 00000000..b41dc4b8 --- /dev/null +++ b/src/views/SalesManagement/DeliveryNotice/DeliveryNotice.vue @@ -0,0 +1,652 @@ + + + + + diff --git a/src/views/SalesManagement/DeliveryNotice/index.vue b/src/views/SalesManagement/DeliveryNotice/index.vue new file mode 100644 index 00000000..5e093db2 --- /dev/null +++ b/src/views/SalesManagement/DeliveryNotice/index.vue @@ -0,0 +1,59 @@ + + + + + + diff --git a/src/views/SalesManagement/DeliveryNotice/orderNotice.vue b/src/views/SalesManagement/DeliveryNotice/orderNotice.vue new file mode 100644 index 00000000..d5f0aaab --- /dev/null +++ b/src/views/SalesManagement/DeliveryNotice/orderNotice.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/src/views/SalesManagement/DeliveryNotice/paymentOrder.vue b/src/views/SalesManagement/DeliveryNotice/paymentOrder.vue new file mode 100644 index 00000000..cd260755 --- /dev/null +++ b/src/views/SalesManagement/DeliveryNotice/paymentOrder.vue @@ -0,0 +1,403 @@ + + + diff --git a/src/views/SalesManagement/DeliveryNoticeSearch/index.vue b/src/views/SalesManagement/DeliveryNoticeSearch/index.vue new file mode 100644 index 00000000..96c9743a --- /dev/null +++ b/src/views/SalesManagement/DeliveryNoticeSearch/index.vue @@ -0,0 +1,411 @@ + + + + + diff --git a/src/views/SalesManagement/DeliveryRecord/index.vue b/src/views/SalesManagement/DeliveryRecord/index.vue new file mode 100644 index 00000000..e28f0909 --- /dev/null +++ b/src/views/SalesManagement/DeliveryRecord/index.vue @@ -0,0 +1,518 @@ + + + + + diff --git a/src/views/SalesManagement/DeliveryReview/index.vue b/src/views/SalesManagement/DeliveryReview/index.vue new file mode 100644 index 00000000..5f48660f --- /dev/null +++ b/src/views/SalesManagement/DeliveryReview/index.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/SalesManagement/MachineToolContract/index.vue b/src/views/SalesManagement/MachineToolContract/index.vue new file mode 100644 index 00000000..b7721dbf --- /dev/null +++ b/src/views/SalesManagement/MachineToolContract/index.vue @@ -0,0 +1,2501 @@ + + + + diff --git a/src/views/SalesManagement/MachineToolContractNew/index.vue b/src/views/SalesManagement/MachineToolContractNew/index.vue new file mode 100644 index 00000000..52625b7b --- /dev/null +++ b/src/views/SalesManagement/MachineToolContractNew/index.vue @@ -0,0 +1,2472 @@ + + + + diff --git a/src/views/SalesManagement/MaterialTraceability/index.vue b/src/views/SalesManagement/MaterialTraceability/index.vue new file mode 100644 index 00000000..20cdf644 --- /dev/null +++ b/src/views/SalesManagement/MaterialTraceability/index.vue @@ -0,0 +1,679 @@ + + + + + + + + + + + + diff --git a/src/views/SalesManagement/OrderExamine/index.vue b/src/views/SalesManagement/OrderExamine/index.vue new file mode 100644 index 00000000..48ddb188 --- /dev/null +++ b/src/views/SalesManagement/OrderExamine/index.vue @@ -0,0 +1,945 @@ + + + + diff --git a/src/views/SalesManagement/OrderInquiry/index.vue b/src/views/SalesManagement/OrderInquiry/index.vue new file mode 100644 index 00000000..2328e9f9 --- /dev/null +++ b/src/views/SalesManagement/OrderInquiry/index.vue @@ -0,0 +1,3406 @@ + + + + + + diff --git a/src/views/SalesManagement/OrderManagement/index.vue b/src/views/SalesManagement/OrderManagement/index.vue new file mode 100644 index 00000000..04cc81b0 --- /dev/null +++ b/src/views/SalesManagement/OrderManagement/index.vue @@ -0,0 +1,1219 @@ + + + + diff --git a/src/views/SalesManagement/OrderProgress/index.vue b/src/views/SalesManagement/OrderProgress/index.vue new file mode 100644 index 00000000..09a63527 --- /dev/null +++ b/src/views/SalesManagement/OrderProgress/index.vue @@ -0,0 +1,682 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/SalesManagement/OrderRelease/index.vue b/src/views/SalesManagement/OrderRelease/index.vue new file mode 100644 index 00000000..12262b7b --- /dev/null +++ b/src/views/SalesManagement/OrderRelease/index.vue @@ -0,0 +1,2079 @@ + + + + + diff --git a/src/views/SalesManagement/OrderTraceability/index.vue b/src/views/SalesManagement/OrderTraceability/index.vue new file mode 100644 index 00000000..c4204d24 --- /dev/null +++ b/src/views/SalesManagement/OrderTraceability/index.vue @@ -0,0 +1,467 @@ + + + + + diff --git a/src/views/SalesManagement/ProductDelivery/index.vue b/src/views/SalesManagement/ProductDelivery/index.vue new file mode 100644 index 00000000..2216d6b1 --- /dev/null +++ b/src/views/SalesManagement/ProductDelivery/index.vue @@ -0,0 +1,1374 @@ + + + + + diff --git a/src/views/SalesManagement/ProductMaintenance/index.vue b/src/views/SalesManagement/ProductMaintenance/index.vue new file mode 100644 index 00000000..25c02ec0 --- /dev/null +++ b/src/views/SalesManagement/ProductMaintenance/index.vue @@ -0,0 +1,3489 @@ + + + + + diff --git a/src/views/SalesManagement/SalesContract/index.vue b/src/views/SalesManagement/SalesContract/index.vue new file mode 100644 index 00000000..f5b357ad --- /dev/null +++ b/src/views/SalesManagement/SalesContract/index.vue @@ -0,0 +1,2577 @@ + + + + diff --git a/src/views/SalesManagement/SalesContractNew/index.vue b/src/views/SalesManagement/SalesContractNew/index.vue new file mode 100644 index 00000000..542fdebc --- /dev/null +++ b/src/views/SalesManagement/SalesContractNew/index.vue @@ -0,0 +1,2295 @@ + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/EquipmentUtilization.vue b/src/views/SalesManagement/StatisticalAnalysis/EquipmentUtilization.vue new file mode 100644 index 00000000..cfb2b1d0 --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/EquipmentUtilization.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/OrderTrend.vue b/src/views/SalesManagement/StatisticalAnalysis/OrderTrend.vue new file mode 100644 index 00000000..2fe85345 --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/OrderTrend.vue @@ -0,0 +1,382 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/ProductCategory.vue b/src/views/SalesManagement/StatisticalAnalysis/ProductCategory.vue new file mode 100644 index 00000000..a96287d9 --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/ProductCategory.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/ProductPricing.vue b/src/views/SalesManagement/StatisticalAnalysis/ProductPricing.vue new file mode 100644 index 00000000..82a5a02b --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/ProductPricing.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/ProportionOfProducts.vue b/src/views/SalesManagement/StatisticalAnalysis/ProportionOfProducts.vue new file mode 100644 index 00000000..2578417c --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/ProportionOfProducts.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/RegionalSales.vue b/src/views/SalesManagement/StatisticalAnalysis/RegionalSales.vue new file mode 100644 index 00000000..6599cb45 --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/RegionalSales.vue @@ -0,0 +1,284 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/WorkingHoursStatistics.vue b/src/views/SalesManagement/StatisticalAnalysis/WorkingHoursStatistics.vue new file mode 100644 index 00000000..41ebba1f --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/WorkingHoursStatistics.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/views/SalesManagement/StatisticalAnalysis/index.vue b/src/views/SalesManagement/StatisticalAnalysis/index.vue new file mode 100644 index 00000000..891c21f2 --- /dev/null +++ b/src/views/SalesManagement/StatisticalAnalysis/index.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/src/views/SeikoWorkshop/AndonAlert/index.vue b/src/views/SeikoWorkshop/AndonAlert/index.vue new file mode 100644 index 00000000..195e9f1c --- /dev/null +++ b/src/views/SeikoWorkshop/AndonAlert/index.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/SeikoWorkshop/DevelopProcess/index.vue b/src/views/SeikoWorkshop/DevelopProcess/index.vue new file mode 100644 index 00000000..dbb1488b --- /dev/null +++ b/src/views/SeikoWorkshop/DevelopProcess/index.vue @@ -0,0 +1,1030 @@ + + + + + diff --git a/src/views/SeikoWorkshop/EquipmentMonitoringNew/index.vue b/src/views/SeikoWorkshop/EquipmentMonitoringNew/index.vue new file mode 100644 index 00000000..47cdd489 --- /dev/null +++ b/src/views/SeikoWorkshop/EquipmentMonitoringNew/index.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/views/SeikoWorkshop/MaterialAudit/index.vue b/src/views/SeikoWorkshop/MaterialAudit/index.vue new file mode 100644 index 00000000..1d72d415 --- /dev/null +++ b/src/views/SeikoWorkshop/MaterialAudit/index.vue @@ -0,0 +1,294 @@ + + + + diff --git a/src/views/SeikoWorkshop/OrderWorkTime/index.vue b/src/views/SeikoWorkshop/OrderWorkTime/index.vue new file mode 100644 index 00000000..3775b01d --- /dev/null +++ b/src/views/SeikoWorkshop/OrderWorkTime/index.vue @@ -0,0 +1,290 @@ +//订单工时 + + + + diff --git a/src/views/SeikoWorkshop/OtherWorkCompleted/index.vue b/src/views/SeikoWorkshop/OtherWorkCompleted/index.vue new file mode 100644 index 00000000..cf369466 --- /dev/null +++ b/src/views/SeikoWorkshop/OtherWorkCompleted/index.vue @@ -0,0 +1,345 @@ + + + + + diff --git a/src/views/SeikoWorkshop/PartTraceability/index.vue b/src/views/SeikoWorkshop/PartTraceability/index.vue new file mode 100644 index 00000000..7b47e16e --- /dev/null +++ b/src/views/SeikoWorkshop/PartTraceability/index.vue @@ -0,0 +1,449 @@ + + + + diff --git a/src/views/SeikoWorkshop/PartsBeingMachined/index.vue b/src/views/SeikoWorkshop/PartsBeingMachined/index.vue new file mode 100644 index 00000000..11250b48 --- /dev/null +++ b/src/views/SeikoWorkshop/PartsBeingMachined/index.vue @@ -0,0 +1,225 @@ + + + + diff --git a/src/views/SeikoWorkshop/ProcessInquiry/index.vue b/src/views/SeikoWorkshop/ProcessInquiry/index.vue new file mode 100644 index 00000000..c42a4a7e --- /dev/null +++ b/src/views/SeikoWorkshop/ProcessInquiry/index.vue @@ -0,0 +1,586 @@ + + + + + diff --git a/src/views/SeikoWorkshop/ProcurementContractAudit/index.vue b/src/views/SeikoWorkshop/ProcurementContractAudit/index.vue new file mode 100644 index 00000000..130ea6b5 --- /dev/null +++ b/src/views/SeikoWorkshop/ProcurementContractAudit/index.vue @@ -0,0 +1,425 @@ + + + + diff --git a/src/views/SeikoWorkshop/ProductionExecution/index.vue b/src/views/SeikoWorkshop/ProductionExecution/index.vue new file mode 100644 index 00000000..73630576 --- /dev/null +++ b/src/views/SeikoWorkshop/ProductionExecution/index.vue @@ -0,0 +1,768 @@ + + + + + diff --git a/src/views/SeikoWorkshop/ProductionPlan/index.vue b/src/views/SeikoWorkshop/ProductionPlan/index.vue new file mode 100644 index 00000000..d6aeb12b --- /dev/null +++ b/src/views/SeikoWorkshop/ProductionPlan/index.vue @@ -0,0 +1,457 @@ + + + + + diff --git a/src/views/SeikoWorkshop/ProductionTaskQuery/index.vue b/src/views/SeikoWorkshop/ProductionTaskQuery/index.vue new file mode 100644 index 00000000..aa35a245 --- /dev/null +++ b/src/views/SeikoWorkshop/ProductionTaskQuery/index.vue @@ -0,0 +1,646 @@ + + + + + + diff --git a/src/views/SeikoWorkshop/PurchaseQualityInspection/index.vue b/src/views/SeikoWorkshop/PurchaseQualityInspection/index.vue new file mode 100644 index 00000000..dcf6eb4f --- /dev/null +++ b/src/views/SeikoWorkshop/PurchaseQualityInspection/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/SeikoWorkshop/QualityInformationQuery/index.vue b/src/views/SeikoWorkshop/QualityInformationQuery/index.vue new file mode 100644 index 00000000..4a55cb31 --- /dev/null +++ b/src/views/SeikoWorkshop/QualityInformationQuery/index.vue @@ -0,0 +1,454 @@ + + + + + diff --git a/src/views/SeikoWorkshop/QualityInformationQueryOther/index.vue b/src/views/SeikoWorkshop/QualityInformationQueryOther/index.vue new file mode 100644 index 00000000..a3b5386d --- /dev/null +++ b/src/views/SeikoWorkshop/QualityInformationQueryOther/index.vue @@ -0,0 +1,590 @@ + + + + + diff --git a/src/views/SeikoWorkshop/QualityMaintenance/index.vue b/src/views/SeikoWorkshop/QualityMaintenance/index.vue new file mode 100644 index 00000000..e29cd1fd --- /dev/null +++ b/src/views/SeikoWorkshop/QualityMaintenance/index.vue @@ -0,0 +1,297 @@ + + + diff --git a/src/views/SeikoWorkshop/ScrapProduction/index.vue b/src/views/SeikoWorkshop/ScrapProduction/index.vue new file mode 100644 index 00000000..29e2b803 --- /dev/null +++ b/src/views/SeikoWorkshop/ScrapProduction/index.vue @@ -0,0 +1,363 @@ + + + + diff --git a/src/views/SeikoWorkshop/SelfInspectionRecord/index.vue b/src/views/SeikoWorkshop/SelfInspectionRecord/index.vue new file mode 100644 index 00000000..50bcdbb1 --- /dev/null +++ b/src/views/SeikoWorkshop/SelfInspectionRecord/index.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/SeikoWorkshop/TestDataEntry/index.vue b/src/views/SeikoWorkshop/TestDataEntry/index.vue new file mode 100644 index 00000000..e6117231 --- /dev/null +++ b/src/views/SeikoWorkshop/TestDataEntry/index.vue @@ -0,0 +1,778 @@ + + + + + + diff --git a/src/views/SeikoWorkshop/WorkingHoursStatistics/index.vue b/src/views/SeikoWorkshop/WorkingHoursStatistics/index.vue new file mode 100644 index 00000000..a438ba97 --- /dev/null +++ b/src/views/SeikoWorkshop/WorkingHoursStatistics/index.vue @@ -0,0 +1,475 @@ + + + + diff --git a/src/views/SeikoWorkshop/WorkshopAssignment/index.vue b/src/views/SeikoWorkshop/WorkshopAssignment/index.vue new file mode 100644 index 00000000..2f57e455 --- /dev/null +++ b/src/views/SeikoWorkshop/WorkshopAssignment/index.vue @@ -0,0 +1,934 @@ + + + + + diff --git a/src/views/SeikoWorkshop/ceshi/contextButton.vue b/src/views/SeikoWorkshop/ceshi/contextButton.vue new file mode 100644 index 00000000..93fe2fc1 --- /dev/null +++ b/src/views/SeikoWorkshop/ceshi/contextButton.vue @@ -0,0 +1,80 @@ + + + + + + diff --git a/src/views/SeikoWorkshop/ceshi/index.vue b/src/views/SeikoWorkshop/ceshi/index.vue new file mode 100644 index 00000000..1789cd8c --- /dev/null +++ b/src/views/SeikoWorkshop/ceshi/index.vue @@ -0,0 +1,707 @@ + + + + + diff --git a/src/views/SeikoWorkshop/documentManagement/index.vue b/src/views/SeikoWorkshop/documentManagement/index.vue new file mode 100644 index 00000000..dfe5aa83 --- /dev/null +++ b/src/views/SeikoWorkshop/documentManagement/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/SeikoWorkshop/workingCondition/index.vue b/src/views/SeikoWorkshop/workingCondition/index.vue new file mode 100644 index 00000000..f22231fa --- /dev/null +++ b/src/views/SeikoWorkshop/workingCondition/index.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/src/views/TechnologyCenter/BOMBasic/index.vue b/src/views/TechnologyCenter/BOMBasic/index.vue new file mode 100644 index 00000000..76fbaa6b --- /dev/null +++ b/src/views/TechnologyCenter/BOMBasic/index.vue @@ -0,0 +1,693 @@ + + + + + diff --git a/src/views/TechnologyCenter/BOMInventoryQuery/index.vue b/src/views/TechnologyCenter/BOMInventoryQuery/index.vue new file mode 100644 index 00000000..15d1ccc1 --- /dev/null +++ b/src/views/TechnologyCenter/BOMInventoryQuery/index.vue @@ -0,0 +1,1359 @@ + + + + + diff --git a/src/views/TechnologyCenter/BOMMaintain/index.vue b/src/views/TechnologyCenter/BOMMaintain/index.vue new file mode 100644 index 00000000..28bdfda5 --- /dev/null +++ b/src/views/TechnologyCenter/BOMMaintain/index.vue @@ -0,0 +1,1664 @@ + + + + + diff --git a/src/views/TechnologyCenter/BOMSearch/index.vue b/src/views/TechnologyCenter/BOMSearch/index.vue new file mode 100644 index 00000000..eb08572a --- /dev/null +++ b/src/views/TechnologyCenter/BOMSearch/index.vue @@ -0,0 +1,1509 @@ + + + + + diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue deleted file mode 100644 index 26363797..00000000 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ /dev/null @@ -1,1085 +0,0 @@ - - - - - - - - diff --git a/src/views/TechnologyCenter/DrawingConfirmation/index.vue b/src/views/TechnologyCenter/DrawingConfirmation/index.vue new file mode 100644 index 00000000..57bc1ca2 --- /dev/null +++ b/src/views/TechnologyCenter/DrawingConfirmation/index.vue @@ -0,0 +1,2583 @@ + + + + + diff --git a/src/views/TechnologyCenter/DrawingConfirmationDistribution/index.vue b/src/views/TechnologyCenter/DrawingConfirmationDistribution/index.vue new file mode 100644 index 00000000..9801e95b --- /dev/null +++ b/src/views/TechnologyCenter/DrawingConfirmationDistribution/index.vue @@ -0,0 +1,2097 @@ + + + + + diff --git a/src/views/TechnologyCenter/DrawingConfirmationSearch/index.vue b/src/views/TechnologyCenter/DrawingConfirmationSearch/index.vue new file mode 100644 index 00000000..b713af35 --- /dev/null +++ b/src/views/TechnologyCenter/DrawingConfirmationSearch/index.vue @@ -0,0 +1,412 @@ + + + + + + diff --git a/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue b/src/views/TechnologyCenter/ImportBOM/UploadExcel/index.vue similarity index 100% rename from src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue rename to src/views/TechnologyCenter/ImportBOM/UploadExcel/index.vue diff --git a/src/views/TechnologyCenter/ImportBOM/index.vue b/src/views/TechnologyCenter/ImportBOM/index.vue new file mode 100644 index 00000000..69b83081 --- /dev/null +++ b/src/views/TechnologyCenter/ImportBOM/index.vue @@ -0,0 +1,944 @@ + + + + + diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue deleted file mode 100644 index 068df5bc..00000000 --- a/src/views/TechnologyCenter/ImportChangeParts/index.vue +++ /dev/null @@ -1,302 +0,0 @@ - - - - diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue deleted file mode 100644 index a232c012..00000000 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ /dev/null @@ -1,816 +0,0 @@ - - - - - - - diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue deleted file mode 100644 index 574b71cf..00000000 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ /dev/null @@ -1,484 +0,0 @@ - - - - - diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue deleted file mode 100644 index 2c80c129..00000000 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ /dev/null @@ -1,688 +0,0 @@ - - - - - - - diff --git a/src/views/TechnologyCenter/ImportParts/uploadFile.js b/src/views/TechnologyCenter/ImportParts/uploadFile.js deleted file mode 100644 index ec90ea94..00000000 --- a/src/views/TechnologyCenter/ImportParts/uploadFile.js +++ /dev/null @@ -1,196 +0,0 @@ -import request from '@/utils/request' -import state from '@/store' -import router from '@/router' - -// 初始化 项目名称 -export function initProject() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' - } - }) -} -// 导入Excel -export function upload(project, machine, group, designer) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '组件明细表_基本件_导入数据', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer - } - }) -} -// 导入Excel1 -export function upload1(designer, time, project, machine, group, num1, num2, name, size, num3, supplier, remark, mark) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '组件明细表_基本件_导入数据1', - param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '=string&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark - } - }) -} -// 查询零件（查重） -export function searchPart(project, machine, group) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '导入数据_查询', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group - } - }) -} -// 导入Excel外购件 -export function outBuyUpload(project, machine, group, designer) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '组件明细表_外购件_导入数据', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group + '&设计者=' + designer - } - }) -} -// 导入Excel1外购件 -export function outBuyUpload1(designer, time, project, machine, group, num1, num2, name, size, num3, supplier, remark, mark) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: '组件明细表_外购件_导入数据1', - param: '设计者=' + designer + '&保存时间=' + time + '&项目=' + project + '&机床=' + machine + '&组号=' + group + '&序号=' + num1 + '&图号或者型号=' + num2 + '&名称=' + name + '&材料或者规格=' + size + '&数量=' + num3 + '&供货商=' + supplier + '&备注=' + remark + '&标记=' + mark - } - }) -} -// 查询零件（查重）外购件 -export function outBuySearchPart(project, machine, group) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: '导入数据_外购件_查询', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group - } - }) -} -// 查询零件 基本件 -export function searchBasePartDetail(project, machine, group) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_综合_全部', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group - } - }) -} -// 查询零件 基本件 -export function searchOutPartDetail(project, machine, group) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_零件明细表_外购件和标准件_数据导入保存_综合_全部', - param: '项目=' + project + '&机床=' + machine + '&组号=' + group - } - }) -} -// 删除 基本件 -export function deleteTable1(id) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: 'PDM_零件明细表_基本件_数据导入保存_删除数据', - param: 'id=' + id - } - }) -} -// 删除 外购件 -export function deleteTable2(id) { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '2', - name: 'PDM_零件明细表_外购件和标准件_数据导入保存_删除数据', - param: 'id=' + id - } - }) -} -// 初始化规范 备注 -export function initStandard1() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_备注' - } - }) -} -// 初始化规范 材料或者规格 -export function initStandard2() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_材料或者规格' - } - }) -} -// 初始化规范 物料流水号 -export function initStandard3() { - return request({ - url: '', - method: 'post', - data: { - UserID: state.state.user.id, - ModularID: router.currentRoute.path, - type: '1', - name: 'PDM_零件明细表_基本件_数据导入保存_查询数据_规范表_物料流水号' - } - }) -} diff --git a/src/views/TechnologyCenter/ImprotPartDrawing/index.vue b/src/views/TechnologyCenter/ImprotPartDrawing/index.vue new file mode 100644 index 00000000..83826d3b --- /dev/null +++ b/src/views/TechnologyCenter/ImprotPartDrawing/index.vue @@ -0,0 +1,883 @@ + + + + + diff --git a/src/views/TechnologyCenter/MaterialMaintain/index.vue b/src/views/TechnologyCenter/MaterialMaintain/index.vue new file mode 100644 index 00000000..c03ef384 --- /dev/null +++ b/src/views/TechnologyCenter/MaterialMaintain/index.vue @@ -0,0 +1,1284 @@ + + + + + diff --git a/src/views/TechnologyCenter/MaterialQuery/index.vue b/src/views/TechnologyCenter/MaterialQuery/index.vue new file mode 100644 index 00000000..89cef606 --- /dev/null +++ b/src/views/TechnologyCenter/MaterialQuery/index.vue @@ -0,0 +1,1035 @@ + + + + diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue deleted file mode 100644 index dc570ab1..00000000 --- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue +++ /dev/null @@ -1,300 +0,0 @@ - - - - - diff --git a/src/views/TechnologyCenter/ProcurementInquiry/Export2Excel.js b/src/views/TechnologyCenter/ProcurementInquiry/Export2Excel.js deleted file mode 100644 index a4a80fd7..00000000 --- a/src/views/TechnologyCenter/ProcurementInquiry/Export2Excel.js +++ /dev/null @@ -1,224 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -// import XLSX from 'xlsx' -import XLSX from 'xlsx-style' -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - headerGroup, - dataGroup, - sheetGroup, - filename, - autoWidth = true, - bookType= 'xlsx' -} = {}) { - var wb = new Workbook() - for (let i = 0; i < dataGroup.length; i++) { - /* original data */ - let data = dataGroup[i] - filename = filename || 'excel-list' - data = [...data] - data.unshift(headerGroup[i]); - var ws_name = sheetGroup[i]; - var ws = sheet_from_array_of_arrays(data); - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - let R = 0; - data.map(item => { - let C = 0; - item.map(itm => { - var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); - var cell = {v: itm } - cell.s= { - alignment: { - horizontal: "center" - } - } - ws[cell_ref] = cell; - C++; - }) - R++; - }) - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - } - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/TechnologyCenter/ProcurementInquiry/index.vue b/src/views/TechnologyCenter/ProcurementInquiry/index.vue deleted file mode 100644 index 626f50b1..00000000 --- a/src/views/TechnologyCenter/ProcurementInquiry/index.vue +++ /dev/null @@ -1,522 +0,0 @@ - - - - - diff --git a/src/views/TechnologyCenter/QueryParts/Export2Excel.js b/src/views/TechnologyCenter/QueryParts/Export2Excel.js deleted file mode 100644 index 20784f3a..00000000 --- a/src/views/TechnologyCenter/QueryParts/Export2Excel.js +++ /dev/null @@ -1,220 +0,0 @@ -/* eslint-disable */ -require('script-loader!file-saver'); -import XLSX from 'xlsx' - -function generateArray(table) { - var out = []; - var rows = table.querySelectorAll('tr'); - var ranges = []; - for (var R = 0; R < rows.length; ++R) { - var outRow = []; - var row = rows[R]; - var columns = row.querySelectorAll('td'); - for (var C = 0; C < columns.length; ++C) { - var cell = columns[C]; - var colspan = cell.getAttribute('colspan'); - var rowspan = cell.getAttribute('rowspan'); - var cellValue = cell.innerText; - if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; - - //Skip ranges - ranges.forEach(function (range) { - if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { - for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); - } - }); - - //Handle Row Span - if (rowspan || colspan) { - rowspan = rowspan || 1; - colspan = colspan || 1; - ranges.push({ - s: { - r: R, - c: outRow.length - }, - e: { - r: R + rowspan - 1, - c: outRow.length + colspan - 1 - } - }); - }; - - //Handle Value - outRow.push(cellValue !== "" ? cellValue : null); - - //Handle Colspan - if (colspan) - for (var k = 0; k < colspan - 1; ++k) outRow.push(null); - } - out.push(outRow); - } - return [out, ranges]; -}; - -function datenum(v, date1904) { - if (date1904) v += 1462; - var epoch = Date.parse(v); - return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); -} - -function sheet_from_array_of_arrays(data, opts) { - var ws = {}; - var range = { - s: { - c: 10000000, - r: 10000000 - }, - e: { - c: 0, - r: 0 - } - }; - for (var R = 0; R != data.length; ++R) { - for (var C = 0; C != data[R].length; ++C) { - if (range.s.r > R) range.s.r = R; - if (range.s.c > C) range.s.c = C; - if (range.e.r < R) range.e.r = R; - if (range.e.c < C) range.e.c = C; - var cell = { - v: data[R][C] - }; - if (cell.v == null) continue; - var cell_ref = XLSX.utils.encode_cell({ - c: C, - r: R - }); - - if (typeof cell.v === 'number') cell.t = 'n'; - else if (typeof cell.v === 'boolean') cell.t = 'b'; - else if (cell.v instanceof Date) { - cell.t = 'n'; - cell.z = XLSX.SSF._table[14]; - cell.v = datenum(cell.v); - } else cell.t = 's'; - - ws[cell_ref] = cell; - } - } - if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); - return ws; -} - -function Workbook() { - if (!(this instanceof Workbook)) return new Workbook(); - this.SheetNames = []; - this.Sheets = {}; -} - -function s2ab(s) { - var buf = new ArrayBuffer(s.length); - var view = new Uint8Array(buf); - for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; - return buf; -} - -export function export_table_to_excel(id) { - var theTable = document.getElementById(id); - var oo = generateArray(theTable); - var ranges = oo[1]; - - /* original data */ - var data = oo[0]; - var ws_name = "SheetJS"; - - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - /* add ranges to worksheet */ - // ws['!cols'] = ['apple', 'banan']; - ws['!merges'] = ranges; - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: 'xlsx', - bookSST: false, - type: 'binary' - }); - - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), "test.xlsx") -} - -export function export_json_to_excel({ - multiHeader = [], - header, - data, - filename, - merges = [], - autoWidth = true, - bookType= 'xlsx' -} = {}) { - /* original data */ - filename = filename || 'excel-list' - data = [...data] - data.unshift(header); - - for (let i = multiHeader.length-1; i > -1; i--) { - data.unshift(multiHeader[i]) - } - - var ws_name = "SheetJS"; - var wb = new Workbook(), - ws = sheet_from_array_of_arrays(data); - - if (merges.length > 0) { - if (!ws['!merges']) ws['!merges'] = []; - merges.forEach(item => { - ws['!merges'].push(XLSX.utils.decode_range(item)) - }) - } - - if (autoWidth) { - /*设置worksheet每列的最大宽度*/ - const colWidth = data.map(row => row.map(val => { - /*先判断是否为null/undefined*/ - if (val == null) { - return { - 'wch': 10 - }; - } - /*再判断是否为中文*/ - else if (val.toString().charCodeAt(0) > 255) { - return { - 'wch': val.toString().length * 2 - }; - } else { - return { - 'wch': val.toString().length - }; - } - })) - /*以第一行为初始值*/ - let result = colWidth[0]; - for (let i = 1; i < colWidth.length; i++) { - for (let j = 0; j < colWidth[i].length; j++) { - if (result[j]['wch'] < colWidth[i][j]['wch']) { - result[j]['wch'] = colWidth[i][j]['wch']; - } - } - } - ws['!cols'] = result; - } - - /* add worksheet to workbook */ - wb.SheetNames.push(ws_name); - wb.Sheets[ws_name] = ws; - - var wbout = XLSX.write(wb, { - bookType: bookType, - bookSST: false, - type: 'binary' - }); - saveAs(new Blob([s2ab(wbout)], { - type: "application/octet-stream" - }), `${filename}.${bookType}`); -} diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue deleted file mode 100644 index 0be17637..00000000 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - diff --git a/src/views/WarehouseManagement/Inboundscanning/index.vue b/src/views/WarehouseManagement/Inboundscanning/index.vue new file mode 100644 index 00000000..195e9f1c --- /dev/null +++ b/src/views/WarehouseManagement/Inboundscanning/index.vue @@ -0,0 +1,248 @@ + + + + diff --git a/src/views/WarehouseManagement/InventoryCheck/index.vue b/src/views/WarehouseManagement/InventoryCheck/index.vue new file mode 100644 index 00000000..dec7dde0 --- /dev/null +++ b/src/views/WarehouseManagement/InventoryCheck/index.vue @@ -0,0 +1,548 @@ + + + + diff --git a/src/views/WarehouseManagement/InventoryQuery/index.vue b/src/views/WarehouseManagement/InventoryQuery/index.vue new file mode 100644 index 00000000..058d6b97 --- /dev/null +++ b/src/views/WarehouseManagement/InventoryQuery/index.vue @@ -0,0 +1,536 @@ + + + + diff --git a/src/views/WarehouseManagement/InventoryRecord/index.vue b/src/views/WarehouseManagement/InventoryRecord/index.vue new file mode 100644 index 00000000..511c0feb --- /dev/null +++ b/src/views/WarehouseManagement/InventoryRecord/index.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/views/WarehouseManagement/LocationManagement/index.vue b/src/views/WarehouseManagement/LocationManagement/index.vue new file mode 100644 index 00000000..62580b96 --- /dev/null +++ b/src/views/WarehouseManagement/LocationManagement/index.vue @@ -0,0 +1,273 @@ + + + + diff --git a/src/views/WarehouseManagement/MaterialLocation/index.vue b/src/views/WarehouseManagement/MaterialLocation/index.vue new file mode 100644 index 00000000..d538852e --- /dev/null +++ b/src/views/WarehouseManagement/MaterialLocation/index.vue @@ -0,0 +1,246 @@ + + + + diff --git a/src/views/WarehouseManagement/MaterialRecord/index.vue b/src/views/WarehouseManagement/MaterialRecord/index.vue new file mode 100644 index 00000000..15787729 --- /dev/null +++ b/src/views/WarehouseManagement/MaterialRecord/index.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/WarehouseManagement/MaterialRequisition/index.vue b/src/views/WarehouseManagement/MaterialRequisition/index.vue new file mode 100644 index 00000000..6aaef525 --- /dev/null +++ b/src/views/WarehouseManagement/MaterialRequisition/index.vue @@ -0,0 +1,954 @@ + + + + + diff --git a/src/views/WarehouseManagement/MoldManagement/index.vue b/src/views/WarehouseManagement/MoldManagement/index.vue new file mode 100644 index 00000000..092b47e9 --- /dev/null +++ b/src/views/WarehouseManagement/MoldManagement/index.vue @@ -0,0 +1,547 @@ + + + + + diff --git a/src/views/WarehouseManagement/NewReplenishmentQuery/index.vue b/src/views/WarehouseManagement/NewReplenishmentQuery/index.vue new file mode 100644 index 00000000..6530ff86 --- /dev/null +++ b/src/views/WarehouseManagement/NewReplenishmentQuery/index.vue @@ -0,0 +1,267 @@ + + + + diff --git a/src/views/WarehouseManagement/OutFactoryMaintenance/index.vue b/src/views/WarehouseManagement/OutFactoryMaintenance/index.vue new file mode 100644 index 00000000..deeab30b --- /dev/null +++ b/src/views/WarehouseManagement/OutFactoryMaintenance/index.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/src/views/WarehouseManagement/OutsourcingAllocation/index.vue b/src/views/WarehouseManagement/OutsourcingAllocation/index.vue new file mode 100644 index 00000000..0117fbb2 --- /dev/null +++ b/src/views/WarehouseManagement/OutsourcingAllocation/index.vue @@ -0,0 +1,656 @@ + + + + diff --git a/src/views/WarehouseManagement/OutsourcingWarehousing/index.vue b/src/views/WarehouseManagement/OutsourcingWarehousing/index.vue new file mode 100644 index 00000000..c85f0ad6 --- /dev/null +++ b/src/views/WarehouseManagement/OutsourcingWarehousing/index.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/views/WarehouseManagement/PickingListQuery/index.vue b/src/views/WarehouseManagement/PickingListQuery/index.vue new file mode 100644 index 00000000..aca9bfac --- /dev/null +++ b/src/views/WarehouseManagement/PickingListQuery/index.vue @@ -0,0 +1,377 @@ + + + + + diff --git a/src/views/WarehouseManagement/PurchaseOutRecord/index.vue b/src/views/WarehouseManagement/PurchaseOutRecord/index.vue new file mode 100644 index 00000000..035631f5 --- /dev/null +++ b/src/views/WarehouseManagement/PurchaseOutRecord/index.vue @@ -0,0 +1,541 @@ + + + + + diff --git a/src/views/WarehouseManagement/PurchasePartsStorage/index.vue b/src/views/WarehouseManagement/PurchasePartsStorage/index.vue new file mode 100644 index 00000000..22ce9cc5 --- /dev/null +++ b/src/views/WarehouseManagement/PurchasePartsStorage/index.vue @@ -0,0 +1,1462 @@ + + + + diff --git a/src/views/WarehouseManagement/Replenishment/index.vue b/src/views/WarehouseManagement/Replenishment/index.vue new file mode 100644 index 00000000..372bc309 --- /dev/null +++ b/src/views/WarehouseManagement/Replenishment/index.vue @@ -0,0 +1,701 @@ + + + + + diff --git a/src/views/WarehouseManagement/ReplenishmentQuery/index.vue b/src/views/WarehouseManagement/ReplenishmentQuery/index.vue new file mode 100644 index 00000000..06e1a6eb --- /dev/null +++ b/src/views/WarehouseManagement/ReplenishmentQuery/index.vue @@ -0,0 +1,308 @@ + + + + diff --git a/src/views/WarehouseManagement/ReturnRecord/index.vue b/src/views/WarehouseManagement/ReturnRecord/index.vue new file mode 100644 index 00000000..8b323754 --- /dev/null +++ b/src/views/WarehouseManagement/ReturnRecord/index.vue @@ -0,0 +1,510 @@ + + + + + diff --git a/src/views/WarehouseManagement/TransferQuery/index.vue b/src/views/WarehouseManagement/TransferQuery/index.vue new file mode 100644 index 00000000..9b0af947 --- /dev/null +++ b/src/views/WarehouseManagement/TransferQuery/index.vue @@ -0,0 +1,854 @@ + + + + diff --git a/src/views/WarehouseManagement/WarehousingRecord/OutsourcingRecord.vue b/src/views/WarehouseManagement/WarehousingRecord/OutsourcingRecord.vue new file mode 100644 index 00000000..8da82585 --- /dev/null +++ b/src/views/WarehouseManagement/WarehousingRecord/OutsourcingRecord.vue @@ -0,0 +1,326 @@ + + + + diff --git a/src/views/WarehouseManagement/WarehousingRecord/SpindleStockRecord.vue b/src/views/WarehouseManagement/WarehousingRecord/SpindleStockRecord.vue new file mode 100644 index 00000000..772246e0 --- /dev/null +++ b/src/views/WarehouseManagement/WarehousingRecord/SpindleStockRecord.vue @@ -0,0 +1,728 @@ + + + + diff --git a/src/views/WarehouseManagement/WarehousingRecord/WarehousingRecord.vue b/src/views/WarehouseManagement/WarehousingRecord/WarehousingRecord.vue new file mode 100644 index 00000000..854761bb --- /dev/null +++ b/src/views/WarehouseManagement/WarehousingRecord/WarehousingRecord.vue @@ -0,0 +1,999 @@ + + + + diff --git a/src/views/WarehouseManagement/WarehousingRecord/index.vue b/src/views/WarehouseManagement/WarehousingRecord/index.vue new file mode 100644 index 00000000..618efafe --- /dev/null +++ b/src/views/WarehouseManagement/WarehousingRecord/index.vue @@ -0,0 +1,59 @@ + + + + + + diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue deleted file mode 100644 index 2502e935..00000000 --- a/src/views/WorkshopProcurement/AccountingPrice/index.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue deleted file mode 100644 index 241a13f2..00000000 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue b/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue deleted file mode 100644 index 7fe5ca6e..00000000 --- a/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue deleted file mode 100644 index 04b10f33..00000000 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ /dev/null @@ -1,859 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue deleted file mode 100644 index 093093fb..00000000 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ /dev/null @@ -1,1019 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue deleted file mode 100644 index 97e20d1a..00000000 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ /dev/null @@ -1,424 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/ExcelExport/index.vue b/src/views/WorkshopProcurement/ExcelExport/index.vue deleted file mode 100644 index 099d4f48..00000000 --- a/src/views/WorkshopProcurement/ExcelExport/index.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/FundApproval1/index.vue b/src/views/WorkshopProcurement/FundApproval1/index.vue deleted file mode 100644 index 4c2bfa61..00000000 --- a/src/views/WorkshopProcurement/FundApproval1/index.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue deleted file mode 100644 index ac0a6c06..00000000 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ /dev/null @@ -1,402 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue deleted file mode 100644 index 483c45ae..00000000 --- a/src/views/WorkshopProcurement/FundApproval3/index.vue +++ /dev/null @@ -1,570 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue deleted file mode 100644 index 72916e49..00000000 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ /dev/null @@ -1,782 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue deleted file mode 100644 index 889b9837..00000000 --- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue deleted file mode 100644 index aeb6cfda..00000000 --- a/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue deleted file mode 100644 index 791d6cb5..00000000 --- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue deleted file mode 100644 index fc87e6e5..00000000 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ /dev/null @@ -1,1441 +0,0 @@ - - - - - - - diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue deleted file mode 100644 index e1155ca4..00000000 --- a/src/views/WorkshopProcurement/OfflineContract1/index.vue +++ /dev/null @@ -1,1039 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue deleted file mode 100644 index 06fbb840..00000000 --- a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue +++ /dev/null @@ -1,448 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue deleted file mode 100644 index 2f12ea71..00000000 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ /dev/null @@ -1,721 +0,0 @@ - - - - - - - diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue deleted file mode 100644 index e4bf3ee2..00000000 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ /dev/null @@ -1,789 +0,0 @@ - - - - - - - - diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue deleted file mode 100644 index bcac30db..00000000 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue deleted file mode 100644 index 7c7ff228..00000000 --- a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue +++ /dev/null @@ -1,1177 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue b/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue deleted file mode 100644 index 7e82e6d1..00000000 --- a/src/views/WorkshopProcurement/OutsourcingQuotaSetting/index.vue +++ /dev/null @@ -1,480 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue deleted file mode 100644 index c05810b5..00000000 --- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue +++ /dev/null @@ -1,325 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue deleted file mode 100644 index a9038ea0..00000000 --- a/src/views/WorkshopProcurement/PayStateSearch/index.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue deleted file mode 100644 index 0c8dd13c..00000000 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ /dev/null @@ -1,646 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue deleted file mode 100644 index bd4f2fea..00000000 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ /dev/null @@ -1,779 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue deleted file mode 100644 index 1ece0f22..00000000 --- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue b/src/views/WorkshopProcurement/PurchaseContractChange/index.vue deleted file mode 100644 index 0eaf9879..00000000 --- a/src/views/WorkshopProcurement/PurchaseContractChange/index.vue +++ /dev/null @@ -1,855 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue deleted file mode 100644 index 29def8fc..00000000 --- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue +++ /dev/null @@ -1,774 +0,0 @@ - - - - - - diff --git a/src/views/WorkshopProcurement/PurchaseInvoiceDelivery/index.vue b/src/views/WorkshopProcurement/PurchaseInvoiceDelivery/index.vue deleted file mode 100644 index 669a2383..00000000 --- a/src/views/WorkshopProcurement/PurchaseInvoiceDelivery/index.vue +++ /dev/null @@ -1,600 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue b/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue deleted file mode 100644 index 24aba7f8..00000000 --- a/src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue b/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue deleted file mode 100644 index 61a6af04..00000000 --- a/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue +++ /dev/null @@ -1,226 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue deleted file mode 100644 index 107e8184..00000000 --- a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue deleted file mode 100644 index 8c7cb83f..00000000 --- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue +++ /dev/null @@ -1,434 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue b/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue deleted file mode 100644 index dd8e7ffc..00000000 --- a/src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue +++ /dev/null @@ -1,317 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue deleted file mode 100644 index 0862249f..00000000 --- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue +++ /dev/null @@ -1,536 +0,0 @@ - - - - - - - diff --git a/src/views/WorkshopProcurement/ScrappedSupplementaryInvestment1/index.vue b/src/views/WorkshopProcurement/ScrappedSupplementaryInvestment1/index.vue deleted file mode 100644 index 6930ac05..00000000 --- a/src/views/WorkshopProcurement/ScrappedSupplementaryInvestment1/index.vue +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - diff --git a/src/views/WorkshopProcurement/StockPreparation/index.vue b/src/views/WorkshopProcurement/StockPreparation/index.vue deleted file mode 100644 index 418a912b..00000000 --- a/src/views/WorkshopProcurement/StockPreparation/index.vue +++ /dev/null @@ -1,428 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/costStatistics/index.vue b/src/views/WorkshopProcurement/costStatistics/index.vue deleted file mode 100644 index ee59c804..00000000 --- a/src/views/WorkshopProcurement/costStatistics/index.vue +++ /dev/null @@ -1,316 +0,0 @@ - - - - - diff --git a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue b/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue deleted file mode 100644 index b8944a21..00000000 --- a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - - diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue index b5d69537..63ad8368 100644 --- a/src/views/layout/components/AppMain.vue +++ b/src/views/layout/components/AppMain.vue @@ -4,9 +4,7 @@ - - - + diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 9559305a..914e15f8 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -1,12 +1,12 @@