diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 70849d00..6b20a96d 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -18,7 +18,7 @@ export function QualityType() { method: 'post', data: { type: '1', - name: '质量管理_质检类型_查询数据' + name: '质检管理_质检类型_查询数据' } }) } @@ -41,7 +41,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec method: 'post', data: { type: '1', - name: '质量管理_质量情况_查询数据', + name: '质检管理_质量情况_查询数据', param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4, Pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/Assembly/ShipmentApproval.js b/src/api/Assembly/ShipmentApproval.js new file mode 100644 index 00000000..efa590b6 --- /dev/null +++ b/src/api/Assembly/ShipmentApproval.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// PDM_机床名称_发货状态_查询数据 +export function selecttable(check2, machineNumberValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货状态_查询数据', + param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + } + }) +} +// PDM_机床名称_发货状态_编辑数据 +export function updatestate(machineNumberValue, state, attention) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_发货审批_编辑数据', + param: '机床流水号=' + machineNumberValue + '&发货状态=' + state + '&注意事项=' + attention + } + }) +} + diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js index 643fe665..bbf40ff2 100644 --- a/src/api/Inventory/CreatePickingList.js +++ b/src/api/Inventory/CreatePickingList.js @@ -84,7 +84,7 @@ export function dropList(num) { } }) } -// 选入领料单 +// 查询领料单明细 export function searchListDetail(...params) { return request({ url: '', diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js new file mode 100644 index 00000000..95f7be9a --- /dev/null +++ b/src/api/Inventory/MaterialOut.js @@ -0,0 +1,85 @@ +import request from '@/utils/request' + +// 初始化人员 +export function initPickPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0' + } + }) +} +// 初始化机床项目 +export function initMachineProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 领料单查询 +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_查询数据', + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询领料单明细 +export function searchListDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_查询数据', + param: `领料单流水号=${params[0]}` + } + }) +} +// 查看领料单明细相关的物料货位数量 +export function searchStockNumber(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_物料出库_标准件和外购件_查询数据', + param: `物料流水号=${params[0]}` + } + }) +} +// 出库 +export function submitOutStore(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_物料出库_出库记录_增加数据', + param: `出库数量=${params[0]}&出库人流水号=${params[1]}&基本件流水号=${params[2]}&标准件和外购件流水号=${params[3]}` + } + }) +} diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 63672b54..85eb72c7 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -400,3 +400,36 @@ export function getMachineNames(num) { } }) } +export function machineSelect(projectValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据2', + param: `项目流水号=${projectValue}` + } + }) +} +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} +export function deleteFileData(id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: 'PDM_机床总图_删除数据', + param: `文件标识=${id}` + } + }) +} diff --git a/src/icons/svg/CreatePickingList.svg b/src/icons/svg/CreatePickingList.svg new file mode 100644 index 00000000..343a5d73 --- /dev/null +++ b/src/icons/svg/CreatePickingList.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialOut.svg b/src/icons/svg/MaterialOut.svg new file mode 100644 index 00000000..2cb31100 --- /dev/null +++ b/src/icons/svg/MaterialOut.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ShipmentApproval.svg b/src/icons/svg/ShipmentApproval.svg new file mode 100644 index 00000000..1c0ddb41 --- /dev/null +++ b/src/icons/svg/ShipmentApproval.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/doc.svg b/src/icons/svg/doc.svg new file mode 100644 index 00000000..04117746 --- /dev/null +++ b/src/icons/svg/doc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/excel.svg b/src/icons/svg/excel.svg new file mode 100644 index 00000000..efbf9848 --- /dev/null +++ b/src/icons/svg/excel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/file.svg b/src/icons/svg/file.svg new file mode 100644 index 00000000..a36bf667 --- /dev/null +++ b/src/icons/svg/file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/pdf.svg b/src/icons/svg/pdf.svg new file mode 100644 index 00000000..b2117fb9 --- /dev/null +++ b/src/icons/svg/pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/pic.svg b/src/icons/svg/pic.svg new file mode 100644 index 00000000..ca2f133a --- /dev/null +++ b/src/icons/svg/pic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ppt.svg b/src/icons/svg/ppt.svg new file mode 100644 index 00000000..27dcc3e8 --- /dev/null +++ b/src/icons/svg/ppt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 873cd097..c609d18e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,13 +11,16 @@ export const name1 = `OP1000` export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 + const service = axios.create({ - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index a661d266..951c39cb 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -26,7 +26,7 @@

总装调试

- + - + @@ -66,6 +66,11 @@ {{ scope.row.零件名称 }} + + + @@ -173,6 +175,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, export default { data() { return { + partNumValue: '', machineNumberValue: '', machineNumber: [], groupNumberValue: '', diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 1f6f39b1..f5ea48c6 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -78,7 +78,7 @@ diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index 5783f32d..f01c02ce 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -231,7 +231,11 @@ export default { methods: { // 导出 exportUninquirySheet3() { + if (this.machineNumberValue === null) { + this.machineNumberValue = '' + } searchtable55(this.machineNumberValue).then(res1 => { + console.log(res1.data) if (res1.data.length === 0) { this.$message.error('请选择机床') return diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue index 83014f1a..c2c4da9f 100644 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ b/src/views/MarketingCenter/InvoiceRecord/index.vue @@ -476,7 +476,7 @@ export default { return Number(prev) } }, 0) - sums[index] += ' 元(含税)' + sums[index] += ' 万元(含税)' } else { sums[index] = 'N/A' } @@ -484,10 +484,10 @@ export default { sums[index] = this.taxRate * 100 + '% (税率)' return } else if (index === 9) { - sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)' + sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)' return } else if (index === 10) { - sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)' + sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)' return } }) diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 3ec55c56..8c458083 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -214,7 +214,7 @@ export default { fax2: '', postCode2: '', hasTax: '含税', - taxRate: 0.16, + taxRate: 0.13, preview: false, // 预览 demoRadio: '', // 模板radio content: ``, // 合同格式模板 diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index c7a33ef5..550df1b7 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -20,6 +20,7 @@ :label="item.label" :value="item.value"/> + 上传总图 @@ -44,6 +45,50 @@ + + + + + +
+ + 点击上传 + +
+ + +
+
+
+
+ 删除 +
+
+
+
+
+
+
+
{{ file.name }}
 +
+
+
+ + @@ -51,13 +96,22 @@ import UploadExcelComponent from './UploadExcel/index.vue' import specificationData from './specificationData' import { sleep } from '../../../utils/tool' -import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum } from '../../../api/TechnologyCenter/ImportParts' - +import { initProject, isExit, isExit1, importBasics, importPurcharse, searchMachine, searchGroupNum, machineSelect, getFileData, deleteFileData } from '../../../api/TechnologyCenter/ImportParts' +import { uploadFileMachine, downloadFileMachine } from '@/utils/request' export default { name: 'UploadExcel', components: { UploadExcelComponent, specificationData }, data() { return { + fileList: [], + hadFile: [], + showFileList: true, + projectId: '', + action: '', + disabledMachine: true, + machineDrawValue: '', + machineDraw: [], + dialogVisibleMachine: false, project: [], projectValue: '', worksheet: [], @@ -108,6 +162,57 @@ export default { this.fetchData() }, methods: { + opendialogVisibleMachine() { + this.machineDraw = [] + this.machineDrawValue = '' + this.dialogVisibleMachine = true + this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false + this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue) + }, + changeMachine() { + this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false + this.action = `${uploadFileMachine}?&MachineNum=${this.machineDrawValue}` + this.getFileData(this.machineDrawValue) + console.log(this.action) + }, + uploadSuccess(res, file, fileList) { + if (res[0].result === '1') { + const index = fileList.indexOf(file) + fileList.splice(index, 1) + } else { + this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`) + } + if (fileList.length === 0) { + this.$message.success('文件上传成功') + this.getFileData(this.machineDrawValue) + } + }, + uploadFailure(a, file, fileList) { + fileList.map(file => { + this.$message.error(`${file.name}文件上传失败，请检查上传文件是否正确！`) + }) + }, + // 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据 + getFileData(machineDrawValue) { + console.log(machineDrawValue, 88) + this.hadFile = [] + getFileData(machineDrawValue).then(res => { + console.log(res) + if (res.data.length > 0) { + res.data.map(item => { + this.hadFile.push({ + url: `${downloadFileMachine}?id=${item.文件标识}.${item.文件后缀}&name=${item.文件名称}.${item.文件后缀}`, + name: `${item.文件名称}.${item.文件后缀}`, + suffix: item.文件后缀, + id: item.文件标识 + }) + }) + } + }) + }, + deleteFileData(id) { + this.deleteRow(deleteFileData, id, function() { this.getFileData(this.machineDrawValue) }) + }, async test() { await sleep(10000) console.log(1) @@ -339,8 +444,52 @@ export default { } +.content{ + position: relative; + padding: 8px 8px 0 8px; +} +.action{ + position: absolute; + top: 4px; + right: 8px; +} +.delete{ + padding: 0 5px; + border-radius: 3px; + color: #0f84b0; + font-size: 12px; +} +.delete:hover{ + background: -webkit-linear-gradient(top,#0ba9e3,#0099d3); + color: #fff; +} +a{ + text-decoration: none; +} +.icon{ + width: 30px; + height: 30px; + display: inline-block; + margin-right: 7px; + margin-top: 2px; + font-size: 26px; +} +.info{ + position: absolute; + left: 44px; + line-height: 30px; + display: inline-block; + color: #999; +} diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index e9fcb8c8..2c4b00bb 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -13,8 +13,8 @@ 主页 - - 退出 + + 退出 diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue index e37ac230..f50704de 100644 --- a/src/views/layout/components/TagsView.vue +++ b/src/views/layout/components/TagsView.vue @@ -7,6 +7,7 @@
    +
  • 重新加载
  • 关闭当前
  • 关闭其他
  • 关闭全部
    • @@ -20,6 +21,7 @@ import Cookies from 'js-cookie' export default { components: { ScrollPane }, + inject: ['reload'], data() { return { visible: false, @@ -78,6 +80,11 @@ export default { } }) }, + refreshSelectedTag() { + this.$nextTick(() => { + this.reload() // 2019.6.2 cjn + }) + }, closeSelectedTag(view) { this.$store.dispatch('delVisitedViews', view).then((views) => { if (this.isActive(view)) {