From ebc1c9a504394fd968e6beffba1981772da831ae Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 10:18:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Inventory/CreatePickingList.js | 122 ++++ .../Inventory/CreatePickingList/index.vue | 645 ++++++++++++++++++ .../PartWorkCraftSelect_rdlc/index.vue | 2 +- 3 files changed, 768 insertions(+), 1 deletion(-) create mode 100644 src/api/Inventory/CreatePickingList.js create mode 100644 src/views/Inventory/CreatePickingList/index.vue diff --git a/src/api/Inventory/CreatePickingList.js b/src/api/Inventory/CreatePickingList.js new file mode 100644 index 00000000..643fe665 --- /dev/null +++ b/src/api/Inventory/CreatePickingList.js @@ -0,0 +1,122 @@ +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 searchTable(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_三表_查询数据', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`, + Pagination: params[4] + '&' + params[5] + } + }) +} +// 领料单查询 +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 createList(num, remark) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_增加数据', + param: '领料人流水号=' + num + '&领料单备注=' + remark + } + }) +} +// 删除领料单 +export function dropList(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_删除数据', + param: '领料单流水号=' + num + } + }) +} +// 选入领料单 +export function searchListDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_查询数据', + param: `领料单流水号=${params[0]}` + } + }) +} +// 选入领料单 +export function selectIntoList(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单明细_增加数据', + param: `基本件流水号组=${params[0]}&标准件和外购件流水号组=${params[1]}&领料单流水号=${params[2]}` + } + }) +} +// 删除领料单 +export function dropListDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单明细_删除数据', + param: '领料单明细流水号=' + num + } + }) +} diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue new file mode 100644 index 00000000..15561bbd --- /dev/null +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -0,0 +1,645 @@ + + + + + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 7f13feea..5655b5fe 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -155,7 +155,7 @@ 定额员 {{ tableData2[0] ? tableData2[0].定额员 : '' }} 工艺完成 - {{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }} + {{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }} 加工开始 {{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }} 加工结束 From 74bb9baa494f8aa2501c4715d46c334ea36b8f8c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sun, 2 Jun 2019 10:29:01 +0800 Subject: [PATCH 02/11] =?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 03/11] 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 04/11] =?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 0f05db9916d14e774b0110c062830cd08679b42d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 2 Jun 2019 14:26:31 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=8B=E8=BE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/InitialProduction.js | 12 ++ src/utils/request.js | 2 +- .../InitialProduction/index.vue | 148 ++++++++++++------ .../ProcessQuotaEstablishment/index.vue | 7 +- 4 files changed, 116 insertions(+), 53 deletions(-) diff --git a/src/api/ManufacturingCenter/InitialProduction.js b/src/api/ManufacturingCenter/InitialProduction.js index 20649ab8..8f674b1f 100644 --- a/src/api/ManufacturingCenter/InitialProduction.js +++ b/src/api/ManufacturingCenter/InitialProduction.js @@ -61,6 +61,18 @@ export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, } }) } +// 合并投产 +export function production2(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产', + param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' + } + }) +} // 获取表2的值 export function getTable1(num, pageList, pageSize) { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index 8d46ce0f..873cd097 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoice 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 const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 72f38820..c213cdb2 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -164,6 +164,7 @@ +.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 08/11] 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 09/11] . --- 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 10/11] =?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 11/11] =?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