diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index 7b693454..5ff7f799 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -109,14 +109,14 @@ export function getGroups(stepNumber) { }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', - param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index aae52c5b..7d0dbbf6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel -export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel +export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 63e5c46a..2f7b7a27 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -127,12 +127,13 @@ export default { } else { this.ordername = '' } - console.log(this.ordername, 9990999) if (column.order === 'ascending') { this.order = 1 } else if (column.order === 'descending') { this.order = 2 } else { this.order = '' } + console.log(this.ordername, 9990999, this.order) + this.selecttable() }, initProject() { diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index b18e0f50..79c95e6f 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -421,14 +421,18 @@ export default { // 编辑 handleEdit(index, row, formName) { this.temp = 2 - this.dialogFormVisible = true this.form.WarehouseNumber = row.仓库编号 this.form.WarehouseName = row.仓库名称 this.form.WarehouseDescription = row.仓库描述 this.form.Address = row.地址 - this.form.ContactpeopleValue = row.人员编号 + if (this.role !== '15') { + this.form.ContactpeopleValue = this.Contactpeople[0].value + } else { + this.form.ContactpeopleValue = parseInt(row.人员编号) + } this.form.Note = row.备注 this.HouseNumber = row.仓库流水号 + this.dialogFormVisible = true }, // 执行修改 chaEdit() { diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 47d75a09..5fe39080 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -458,27 +458,27 @@ export default { 'id' ]) }, - watch: { - // 如果路由有变化，会再次执行该方法 - '$route'(to) { - const _this = this - console.log(to, 2222) - if (to.name === 'InitialProduction') { - _this.typeChange() - } - } - // '$route': { - // handler(route) { - // const _this = this - // console.log(route.name) - // if (route.name === 'InitialProduction') { - // _this.typeChange() - // } - // } - // } - }, + // watch: { + // // 如果路由有变化，会再次执行该方法 + // '$route'(to) { + // const _this = this + // console.log(to, 2222) + // if (to.name === 'InitialProduction') { + // _this.typeChange() + // } + // } + // // '$route': { + // // handler(route) { + // // const _this = this + // // console.log(route.name) + // // if (route.name === 'InitialProduction') { + // // _this.typeChange() + // // } + // // } + // // } + // }, created() { - // this.typeChange() + this.typeChange() this.getCurrentTime() this.getNowTime() }, diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue index 640fa768..d4dafd3d 100644 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -20,7 +20,7 @@ 查询 - 完成 + 完成 diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index 3ff0d547..282a1c6a 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -36,7 +36,6 @@ height="750" highlight-current-row border - stripe @selection-change="handleSelectionChange"> diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 159e251a..06eefe6a 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -149,13 +149,13 @@
-
{{ content }}
+ -
- -
+ + + -
+
@@ -421,7 +421,7 @@ export default { }, submitTotal() { // 确定合同总额 // this.$refs.tinymce.destroyTinymce() - this.$refs.tinymce.initTinymce() + // this.$refs.tinymce.initTinymce() document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) @@ -778,7 +778,7 @@ export default { document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal) this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML - this.$refs.tinymce.initTinymce() + // this.$refs.tinymce.initTinymce() setTimeout(() => { this.$refs.tinymce.setContent(this.contentNew) }, 1000) diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 838f5213..0cdeaa5e 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -245,7 +245,7 @@ 删除 @@ -290,7 +290,7 @@ - + diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 454bd399..b1370518 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -228,7 +228,7 @@ - + @@ -610,6 +610,14 @@ export default { this.form2.计划完成日期 = '' this.dialogVisible2 = true }, + closedialog() { + this.form2.采购计划流水号 = '' + this.form2.采购单名称 = '' + this.form2.supplierNameValue = '' + this.form2.计划完成日期 = '' + this.form2.供应商名称 = '' + this.form2.计划完成日期 = '' + }, submitAddPurchaseOrder() { // 新建采购单 this.$refs['form2'].validate((valid) => { if (valid) { diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index eede78fb..46cdd120 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -36,7 +36,7 @@ 未结算 - + @@ -46,12 +46,12 @@ {{ scope.row.日期.split(' ')[0] }} - + - + - + @@ -71,8 +71,8 @@
- 离线采购计划编号: - + 离线备料单号: + 供应商: { + getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => { if (response.data.rows.length !== 0) { for (let i = 0; i < response.data.rows.length; i++) { this.tableData10.push({ diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index 49d42f0f..8592ba4f 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -121,7 +121,7 @@ :disabled="Number(scope.row.是否请款)===1" type="text" size="mini" - icon="el-icon-delete" + icon="el-icon-right" style="margin-left: 20px" @click="deleteTable1(scope.row)"/> @@ -142,7 +142,7 @@ - +