From 74bb9baa494f8aa2501c4715d46c334ea36b8f8c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 10:29:01 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartWorkCraftSelect_rdlc/index.vue | 135 +++++++++--------- 1 file changed, 69 insertions(+), 66 deletions(-) diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 5655b5fe..8a3308e0 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -93,75 +93,77 @@ @current-change="handleCurrentChange"/> - +
在制零件工艺调整
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
江苏高精零件条码零件图号{{ tableData2[0] ? tableData2[0].零件图号 : '' }}数量
零件名称{{ tableData2[0] ? tableData2[0].零件名称 : '' }}{{ tableData2[0] ? tableData2[0].投产数量 : '' }}
项目名称{{ tableData2[0] ? tableData2[0].项目名称 : '' }}{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}机床{{ tableData2[0] ? tableData2[0].机床图号 : '' }}
材质{{ tableData2[0] ? tableData2[0].材料 : '' }}规格{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}组号{{ tableData2[0] ? tableData2[0].组号 : '' }}
序次工艺名称工艺要求难度系数工作者单件准结检查结果计划完成日期工序条码
{{ key + 1 }}{{ value.工艺名称 }}{{ value.工艺要求 }}{{ value.工艺难度等级 }} - {{ value.单件定额工时 }}{{ value.准结定额工时 }} - {{ value.计划日期 }}{{ value.工序流水号 }}
工艺员{{ tableData2[0] ? tableData2[0].工艺员 : '' }}定额员{{ tableData2[0] ? tableData2[0].定额员 : '' }}工艺完成{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}加工开始{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}加工结束{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
江苏高精零件条码零件图号{{ tableData2[0] ? tableData2[0].零件图号 : '' }}数量
零件名称{{ tableData2[0] ? tableData2[0].零件名称 : '' }}{{ tableData2[0] ? tableData2[0].投产数量 : '' }}
项目名称{{ tableData2[0] ? tableData2[0].项目名称 : '' }}{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}机床{{ tableData2[0] ? tableData2[0].机床图号 : '' }}
材质{{ tableData2[0] ? tableData2[0].材料 : '' }}规格{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}组号{{ tableData2[0] ? tableData2[0].组号 : '' }}
序次工艺名称工艺要求难度系数工作者单件准结检查结果计划完成日期工序条码
{{ key + 1 }}{{ value.工艺名称 }}{{ value.工艺要求 }}{{ value.工艺难度等级 }} + {{ value.单件定额工时 }}{{ value.准结定额工时 }} + {{ value.计划日期 }}{{ value.工序流水号 }}
工艺员{{ tableData2[0] ? tableData2[0].工艺员 : '' }}定额员{{ tableData2[0] ? tableData2[0].定额员 : '' }}工艺完成{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}加工开始{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}加工结束{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}
+
@@ -173,6 +175,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, export default { data() { return { + partNumValue: '', machineNumberValue: '', machineNumber: [], groupNumberValue: '', From a4d06695500e017c15174b110e352d9984bbe184 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 10:54:44 +0800 Subject: [PATCH 02/13] cancel multiselect --- src/views/Inventory/CreatePickingList/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 15561bbd..09584add 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -577,7 +577,7 @@ export default { selectIntoList(basePartGroup, null, this.pickingListNum).then(response => { if (response.data[0].result === '1') { this.$message.success('操作成功') - this.multipleSelection = [] + this.searchTable() this.clickList() } else { this.$message.error('操作失败') } }) @@ -585,7 +585,7 @@ export default { selectIntoList(null, purchasePartGroup, this.pickingListNum).then(response => { if (response.data[0].result === '1') { this.$message.success('操作成功') - this.multipleSelection = [] + this.searchTable() this.clickList() } else { this.$message.error('操作失败') } }) From 35d4a98f9df399701e149a953cf15e697a09bc6b Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 13:59:05 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/CreatePickingList.js | 2 +- src/api/Inventory/MaterialOut.js | 39 ++++ src/icons/svg/CreatePickingList.svg | 1 + src/icons/svg/MaterialOut.svg | 1 + src/views/Inventory/MaterialOut/index.vue | 235 ++++++++++++++++++++++ 5 files changed, 277 insertions(+), 1 deletion(-) create mode 100644 src/api/Inventory/MaterialOut.js create mode 100644 src/icons/svg/CreatePickingList.svg create mode 100644 src/icons/svg/MaterialOut.svg create mode 100644 src/views/Inventory/MaterialOut/index.vue 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..01fb227d --- /dev/null +++ b/src/api/Inventory/MaterialOut.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 领料单查询 +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]}` + } + }) +} 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/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue new file mode 100644 index 00000000..22fd780a --- /dev/null +++ b/src/views/Inventory/MaterialOut/index.vue @@ -0,0 +1,235 @@ + + + + + From 6021431bf61dcb1bbcadb3b774131127b34adad9 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 14:29:51 +0800 Subject: [PATCH 04/13] refresh --- src/views/layout/components/TagsView.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue index e37ac230..1761220d 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)) { From 5643b466d3d15cd16a7aa4e7e5f529b4f57a52db Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sun, 2 Jun 2019 14:30:48 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=BA=E5=BA=8A?= =?UTF-8?q?=E6=80=BB=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TechnologyCenter/ImportParts.js | 33 ++++ src/icons/svg/doc.svg | 1 + src/icons/svg/excel.svg | 1 + src/icons/svg/file.svg | 1 + src/icons/svg/pdf.svg | 1 + src/icons/svg/pic.svg | 1 + src/icons/svg/ppt.svg | 1 + src/utils/request.js | 3 + .../TechnologyCenter/ImportParts/index.vue | 160 +++++++++++++++++- 9 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 src/icons/svg/doc.svg create mode 100644 src/icons/svg/excel.svg create mode 100644 src/icons/svg/file.svg create mode 100644 src/icons/svg/pdf.svg create mode 100644 src/icons/svg/pic.svg create mode 100644 src/icons/svg/ppt.svg 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/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 8d46ce0f..c609d18e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,11 +11,14 @@ 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://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index c7a33ef5..cc88ac11 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,51 @@ + + + + + + + +
    + + 点击上传 + +
    +     + +
    +
    +
    +
    + 删除 +
    +
    +
    +
    +
    +
    +
    +
    {{ file.name }}
     +
    +
    +
    +     +     @@ -51,13 +97,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 +163,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 +445,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; +} From 1f17810d0e632aea0626ac84e31e4052f6ab9589 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 14:39:57 +0800 Subject: [PATCH 06/13] logout --- src/views/layout/components/Navbar.vue | 4 ++-- src/views/layout/components/TagsView.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 1761220d..f50704de 100644 --- a/src/views/layout/components/TagsView.vue +++ b/src/views/layout/components/TagsView.vue @@ -7,7 +7,7 @@
      -
    • 刷新当前
      • +
    • 重新加载
    • 关闭当前
    • 关闭其他
    • 关闭全部
      • From 346d2986528ab577d6429f079edd65c3e59c8d08 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 14:50:09 +0800 Subject: [PATCH 07/13] . --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 750f3023..c609d18e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // 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 // 请求超时时间 }) From 27b299f456cf3d72ae41effebe8022cf385fcc73 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sun, 2 Jun 2019 14:51:42 +0800 Subject: [PATCH 08/13] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/MarketingCenter/InvoiceRecord/index.vue | 6 +++--- src/views/TechnologyCenter/ImportParts/index.vue | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 750f3023..c609d18e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // 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/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/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index cc88ac11..3c4df5d3 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -45,13 +45,11 @@ - - - +
      - 点击上传 + 点击上传
      @@ -169,6 +168,7 @@ export default { this.dialogVisibleMachine = true this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue) + this.$notify.error(`请选择机床`) }, changeMachine() { this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false From 178c440bdc6654779d811b162ff1ef7fe2b872f1 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sun, 2 Jun 2019 14:54:33 +0800 Subject: [PATCH 09/13] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/TechnologyCenter/ImportParts/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index 3c4df5d3..550df1b7 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -66,7 +66,7 @@ :file-list="fileList" class="upload-demo" multiple> - 点击上传 + 点击上传 @@ -168,7 +168,6 @@ export default { this.dialogVisibleMachine = true this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue) - this.$notify.error(`请选择机床`) }, changeMachine() { this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false From 5711aeb8521d6256212eb8c0868438a91d29bf65 Mon Sep 17 00:00:00 2001 From: jiangfuzhuang Date: Sun, 2 Jun 2019 15:00:14 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E2=80=94=E2=80=9420190602?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityInspectionInformationInquiry.js | 4 +- src/api/Assembly/ShipmentApproval.js | 38 ++++++ src/icons/svg/ShipmentApproval.svg | 1 + .../Assembly/AssemblyExecution/index.vue | 8 +- .../Assembly/DeliveryApplication/index.vue | 4 +- .../index.vue | 18 ++- src/views/Assembly/ShipmentApproval/index.vue | 125 ++++++++++++++++++ .../machiningHoursStatistics/index.vue | 4 + 8 files changed, 190 insertions(+), 12 deletions(-) create mode 100644 src/api/Assembly/ShipmentApproval.js create mode 100644 src/icons/svg/ShipmentApproval.svg create mode 100644 src/views/Assembly/ShipmentApproval/index.vue 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/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/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.零件名称 }} + + +