diff --git a/config/index.js b/config/index.js index 6427159f..7609b831 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/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js index b9c2393e..1e02d379 100644 --- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js +++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import state from '@/store' // 查询表格数据 export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) { @@ -6,6 +7,7 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, url: '', method: 'post', data: { + UserID: state.state.user.id, type: '1', name: '车间生产管理工艺_外协付款_查询', param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime, @@ -38,14 +40,14 @@ export function getPayment(Number, pageCurrent, pageSize) { }) } // 增加 -export function edittype(num1, num2, num3, num4, num5, num6, num7, num8) { +export function AddType1(num1, num2, num3, num4) { return request({ url: '', method: 'post', data: { type: '2', - name: '车间生产管理工艺_外协发票管理_增加数据', - param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8 + name: '车间生产管理工艺_外协付款_新增发票', + param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + num3 + '&开票金额=' + num4 } }) } diff --git a/src/utils/curd.js b/src/utils/curd.js index 5bbc55eb..d28337aa 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -1,10 +1,12 @@ -/** -Created by hedekun -20180727 - */ +import { ExcelDownLoad } from '@/utils/request' + import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { + Vue.prototype.exportExcel_NPOI = function(param) { + console.log(ExcelDownLoad, param, 1111111111) + download(`${ExcelDownLoad}?param=${param}`) + } Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { var paramStr = '' var paramarray = [] @@ -268,3 +270,39 @@ export default { } } } +function download(url) { + getBlob(url, function(blob, filename) { + saveAs(blob, filename) + }) +} +// function decodeUtf8(bytes) { var encoded = ''; for (var i = 0; i < bytes.length; i++) { encoded += '%' + bytes[i].toString(16) } return decodeURIComponent(encoded) } +function getBlob(url, cb) { + var xhr = new XMLHttpRequest() + xhr.open('GET', url, true) + xhr.responseType = 'blob' + xhr.onload = function() { + if (xhr.status === 200) { + const name = xhr.getResponseHeader('content-disposition').split('=')[1] + var filename1 = decodeURIComponent(name) + cb(xhr.response, filename1) + } + } + xhr.send() +} + +function saveAs(blob, filename = '下载文件.xls') { + if (window.navigator.msSaveOrOpenBlob) { + navigator.msSaveBlob(blob, filename) + } else { + var link = document.createElement('a') + var body = document.querySelector('body') + link.href = window.URL.createObjectURL(blob) + link.download = filename + // fix Firefox + link.style.display = 'none' + body.appendChild(link) + link.click() + body.removeChild(link) + window.URL.revokeObjectURL(link.href) + } +} diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index e39c5c70..f02d95fc 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -26,7 +26,7 @@

总装调试

- + @@ -172,7 +167,7 @@
检测项
 - 增加 + 增加 删除 + @click="handleDelete(scope.row)"/> @@ -202,7 +196,7 @@
检测项明细
 - 增加 + 增加 删除 + @click="handleDelete(scope.row)"/> diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index c176ac3e..bae344a4 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -59,9 +59,9 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 - 导出 + 导出 @@ -579,7 +579,7 @@ export default { selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => { import('@/vendor/Export2Excel').then(excel => { const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注'] - const filterVal = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注'] + const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注'] const list = response.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 2f7b7a27..4385f57b 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -40,7 +40,7 @@ type="date" placeholder="选择日期"/> - 查询 + 查询 diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue index 46147ef0..d2f56526 100644 --- a/src/views/BasicData/MenuManagement/index.vue +++ b/src/views/BasicData/MenuManagement/index.vue @@ -3,7 +3,7 @@ - 创建一级菜单 + 创建一级菜单
@@ -83,7 +83,7 @@ - 创建二级菜单 + 创建二级菜单
@@ -394,3 +394,20 @@ export default { padding-right: 8px; } + diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue index 55d90c68..4d5167f1 100644 --- a/src/views/BasicData/PartsNumberMaintenance/index.vue +++ b/src/views/BasicData/PartsNumberMaintenance/index.vue @@ -22,13 +22,13 @@ 零件图号: - 查询 + 查询
基本件三表数量 - 全部删除 + 全部删除
外购件和标准件三表数量 - 全部删除 + 全部删除
编辑 删除 @@ -291,6 +293,7 @@ 编辑 @@ -350,6 +353,7 @@ 编辑 @@ -421,6 +425,7 @@ 编辑 @@ -505,7 +510,7 @@
临时表 - 全部删除 + 全部删除
@@ -550,6 +555,7 @@ 删除 @@ -603,6 +609,7 @@ 删除 diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index deb1164d..e27e0da0 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -3,9 +3,9 @@ - 新增 - 编辑 - 删除 + 新增 + 编辑 + 删除 @@ -14,10 +14,10 @@ - 新增 - 离职 - 离职名单 - 移动 + 新增 + 离职 + 离职名单 + 移动 + diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index 9c4d1c72..99082e4c 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -9,8 +9,8 @@ :label="item.label" :value="item.value"/> - 查询 - 新增 + 查询 + 新增 班次类型工作时间 @@ -475,3 +475,20 @@ export default { margin: 0px; } + diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue index 6116e022..ad0c1740 100644 --- a/src/views/BasicData/SystemRrolemaintenance/index.vue +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -3,8 +3,8 @@ - 查询 - 增加 + 查询 + 增加 + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index ede3a0eb..60ffc6be 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -13,8 +13,8 @@ :label="item.label" :value="item.value"/> - 查询 - 增加 + 查询 + 增加 @@ -403,3 +403,20 @@ export default { margin: 0px; } + diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index f8f99a4c..e4be7325 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -7,9 +7,9 @@ 工艺分类： - 新增 - 编辑 - 删除 + 新增 + 编辑 + 删除 @@ -525,17 +525,22 @@ export default { this.temp = 5 }, submitTechnologicalRequirements() { - addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => { - if (response.data[0].result === '1') { - this.$message.success('增加成功') - this.loading3 = true - searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => { - this.loading3 = false - this.tableData3 = response.data - }) - this.dialogFormVisible5 = false - } else { this.$message.error('增加失败') } - }) + if (this.form3.TechnologicalRequirements !== '') { + addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => { + if (response.data[0].result === '1') { + this.$message.success('增加成功') + this.loading3 = true + searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => { + this.loading3 = false + this.tableData3 = response.data + }) + this.dialogFormVisible5 = false + } else { this.$message.error('增加失败') } + }) + } else { + this.$message.error('请输入工艺要求') + this.dialogFormVisible5 = false + } }, editTechnologicalRequirements(row) { this.temp = 6 @@ -606,3 +611,20 @@ export default { } } + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index dff89195..76601d4a 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -264,7 +264,7 @@ end-placeholder="结束日期"/> 查询 - 创建领料单 + 创建领料单 选入物料 @@ -275,7 +275,7 @@
- + - 领料详情 + 领料详情 diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index 92e3f4f7..6be72ee7 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -4,7 +4,7 @@ 零件图号 - 查询 + 查询 清空 diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 31d5b1d0..72c1130a 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -20,8 +20,8 @@ :label="item.label" :value="item.value"/> - 查询 - 新增 + 查询 + 新增
@@ -384,3 +384,20 @@ export default { width:165px } + diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 79c95e6f..cf46232e 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -2,7 +2,7 @@
- 新建仓库 + 新建仓库
@@ -41,7 +41,7 @@ size="mini" icon="el-icon-edit" plain - type="warning" + type="primary" @click="handleEdit(scope.$index, scope.row, 'form')">修改 删除 - 增加货位 + 增加货位 @@ -605,3 +605,20 @@ export default { margin: 10px 0 10px 10px; } + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 77f9a30e..303e2e83 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -2,21 +2,11 @@
- - - 查询 + 领料单编号: + + 查询 - 领料确认 + 领料确认
@@ -274,8 +264,6 @@ export default { pickingListNumber: '', pickingListNumberShow: '', pickListTable1: [], - startTime: '', - pickingListPeople: '', // 制单人 pageCurrent3: 1, pageSize3: 10000, total3: 0, @@ -544,10 +532,9 @@ export default { }, // 查询领料单列表 searchList() { - let check, check1 - this.pickingListPeople ? check = 1 : check = 0 - this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '') - searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, check1, this.startTime[0], this.startTime[1]).then(response => { + let check + this.pickingListNumber ? check = 1 : check = 0 + searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => { this.pickListTable1 = response.data.rows this.total3 = response.data.total }) @@ -582,7 +569,7 @@ export default { }) }, tableRowClassName({ row }) { - if (parseInt(row.是否审批) === 1) { + if (parseInt(row.是否审批) === 0) { return 'shenpi-row' } else { return '' @@ -693,3 +680,20 @@ export default { background: #E9F0F9 !important; } + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index e9a2284f..9fc75916 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -8,7 +8,7 @@ - 查询 + 查询 diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index b6818390..58873d1c 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -17,7 +17,7 @@ :label="item.label" :value="item.value"/> - 查询明细 + 查询明细 @@ -68,7 +68,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库
@@ -351,3 +351,20 @@ export default { + diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index fb22417f..3a28894d 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -22,7 +22,7 @@ - 查询 + 查询 - 查询 + 查询 - 查询明细 + 查询明细 @@ -72,7 +72,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库
@@ -475,3 +475,20 @@ export default { margin-bottom: 5px; } + diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue index 809cac35..2ffe89b8 100644 --- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -24,8 +24,8 @@ - 查询 - 出库 + 查询 + 出库 diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index 91cda143..e44add6d 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -22,7 +22,7 @@ 零件图号: - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue index 8ffe0043..8984137e 100644 --- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -14,7 +14,7 @@ @change="pageCurrent=1;total=0;searchTable()"/> 操作者: - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue index d476923f..1e3a5ed4 100644 --- a/src/views/ManufacturingCenter/AddingOrder/index.vue +++ b/src/views/ManufacturingCenter/AddingOrder/index.vue @@ -19,9 +19,9 @@ :value="item.value"/> - 查询 - 加序 - 删除加序 + 查询 + 加序 + 删除加序 diff --git a/src/views/ManufacturingCenter/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue index df4a1f51..a755e425 100644 --- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue +++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue @@ -10,7 +10,8 @@ size="mini" height="800" highlight-current-row - border> + border + stripe> diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index dd0f8609..76c40d39 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -31,7 +31,7 @@ 计划总工时（小时）: - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index d6db393e..0162d6c9 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -4,7 +4,7 @@ 零件图号: - 查询 + 查询 查询全部 @@ -13,13 +13,13 @@ 分配外购备料 - 分配自家备料 + 分配自家备料 - 打印自家备料单 + 打印自家备料单 - 导出 + 导出 @@ -45,9 +45,9 @@ align="center"/> @@ -327,3 +327,21 @@ export default { + + diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue index 3ba78ae4..3e5a55df 100644 --- a/src/views/ManufacturingCenter/Enter0therData/index.vue +++ b/src/views/ManufacturingCenter/Enter0therData/index.vue @@ -17,9 +17,9 @@ - 保存 - 编辑 - 删除 + 保存 + 编辑 + 删除 - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index e7ef503c..5de98a3c 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -20,7 +20,7 @@ style="width: 160px" type="date" placeholder="选择日期"/> - 查询 + 查询 - 查询 + 查询
@@ -153,7 +153,7 @@ value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> - 查询 + 查询
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 579ef378..28f36a16 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -21,7 +21,7 @@
{{ item.value2 }}
- 查询 + 查询

车间生产

@@ -73,7 +73,7 @@ diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue index 94c8f275..7686671e 100644 --- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue +++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue @@ -18,7 +18,7 @@ style="width: 170px;margin:0px 10px" type="date" placeholder="选择加工完成日期"/> - 查询 + 查询
@@ -34,7 +34,7 @@ :value="item.value"/> - 查询 + 查询
@@ -49,7 +49,7 @@ 不合格数量统计 - 查询 + 查询
@@ -73,7 +73,7 @@ style="width: 160px" type="date" placeholder="选择日期"/> - 查询 + 查询
@@ -90,7 +90,7 @@ :value="item.value"/> - 查询 + 查询
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue index d4dafd3d..e28940e3 100644 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -19,8 +19,8 @@ :value="item.value"/> - 查询 - 完成 + 查询 + 完成 @@ -30,6 +30,7 @@ class="table" highlight-current-row border + stripe height="750" style="width: 100%" @current-change="getCurrentRow"> diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index f42b1569..cce8e487 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -12,8 +12,8 @@ style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px" start-placeholder="开始日期" end-placeholder="结束日期"/> - 查询 - 导出 + 查询 + 导出 diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 7a7fd68d..1cb6a61a 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -28,7 +28,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 零件工艺调整 diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index fdc5d7b2..d14edc10 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -29,7 +29,7 @@ 是否核准 - 保存 + 保存 折叠 展开 @@ -69,7 +69,7 @@ 长度: - 计算重量 + 计算重量 重量: @@ -84,7 +84,7 @@ 厚: - 计算重量 + 计算重量 重量: @@ -112,7 +112,7 @@ 长度: - 计算重量 + 计算重量 重量: @@ -150,21 +150,21 @@ 公差: - 计算公差 + 计算公差 - 粘贴 + 粘贴 - 原有 + 原有 - + 完艺 - 删除 + 删除 - + 复制并保存 - 保存 + 保存 记录修改备注 diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index 282a1c6a..cce14df4 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -22,9 +22,9 @@ :label="item.label" :value="item.value"/> - 全选 - 保存 - 通用件保存 + 全选 + 保存 + 通用件保存 - 查询 + 查询 - 导出 + 导出 diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index e459cc65..8e4f13d4 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -21,8 +21,8 @@ :value="item.value"/> - 查询 - 导出 + 查询 + 导出 diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue index 3e89344a..a9fad44e 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue @@ -28,7 +28,7 @@

交货期:

~ - 查询 + 查询 @@ -247,7 +247,7 @@

子计划：{{ machineNum }} 备料

子计划：{{ machineNum }} 制造

子计划：{{ machineNum }} 装配

- 增加 + 增加