src/api/WorkOrder.js
@@ -43,6 +43,15 @@ }) } // ERP订单反关闭 export function ReverseClosedErpOrder(data) { return request({ url: 'WorkOrder/ReverseClosedErpOrder', method: 'post', params: data }) } // ERP订单删除 export function DeleteErpOrder(data) { return request({ @@ -133,6 +142,15 @@ }) } // MES工单启动提交 export function MesOrderBitchReverseClosedSeave(data) { return request({ url: 'WorkOrder/MesOrderBitchReverseClosedSeave', method: 'post', data }) } // 生产开报工扫码获取工单对应工序任务(自制) export function MesOrderStepSearch(data) { return request({ src/views/kanbanManager/zhkb.vue
@@ -175,7 +175,7 @@ const res = await PrentOrganizationNoCompany() this.wkshopArr = res.data const temp = ['CJ001', '006', 'ZP001'] const temp = ['00301', '00302', '00303'] temp.forEach(i => { const aa = this.wkshopArr.find(j => j.torg_code === i).torg_name src/views/produce/reportCorrect.vue
@@ -106,7 +106,7 @@ <!-- />--> <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/produce/reportVerify.vue
@@ -133,7 +133,7 @@ /> <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/produce/stepReport.vue
@@ -178,7 +178,7 @@ </el-table-column> <el-table-column prop="rowNum" width="50" width="80" label="序号" fixed /> src/views/statistic/defectDetailList.vue
@@ -114,7 +114,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/statistic/groupSalaryList.vue
@@ -149,7 +149,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/statistic/personSalaryList.vue
@@ -148,7 +148,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/statistic/repairDetailList.vue
@@ -122,7 +122,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/statistic/subcontractingOperation.vue
@@ -123,7 +123,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/statistic/workOrderProcess.vue
@@ -114,7 +114,7 @@ > <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> src/views/workOrder/produceOrderList.vue
@@ -164,11 +164,11 @@ @selection-change="handleSelectionChange" > <!-- @row-click="rowClick"--> <el-table-column type="selection" width="50" :selectable="selected" /> <!-- <el-table-column--> <!-- type="selection"--> <!-- width="50"--> <!-- :selectable="selected"--> <!-- />--> <!-- <el-table-column--> <!-- width="50"--> <!-- fixed--> @@ -184,7 +184,7 @@ <!-- </el-table-column>--> <el-table-column prop="rowNum" width="50" width="80" fixed label="序号" /> @@ -340,7 +340,7 @@ > <template slot-scope="{row}"> <div class="operationClass"> <el-tooltip class="item" effect="dark" content="下达" placement="top"> <el-tooltip class="item" effect="dark" content="订单下达" placement="top"> <!-- <el-button v-waves type="text" @click="edit('edit',row)">下达</el-button>--> <i class="el-icon-bottom" @@ -351,10 +351,21 @@ </el-tooltip> <el-tooltip v-del-tab-index class="item" effect="dark" content="订单关闭" placement="top"> <i v-if="row.status!=='CLOSED'" class="el-icon-switch-button" :style="{color:$store.state.settings.theme}" :style="{color:'red'}" style="cursor: pointer;margin-left: 15px" @click="orderClose(row.id)" /> </el-tooltip> <el-tooltip v-del-tab-index class="item" effect="dark" content="订单启动" placement="top"> <i v-if="row.status==='CLOSED'" class="el-icon-thumb" :style="{color:$store.state.settings.theme}" style="cursor: pointer;margin-left: 15px" @click="orderOpen(row.id)" /> </el-tooltip> @@ -479,7 +490,7 @@ DeleteErpOrder, ErpOrderSearch, MarkBatchSaveErpOrder, MarkSaveErpOrder MarkSaveErpOrder, ReverseClosedErpOrder } from '@/api/WorkOrder' import { SeaveSearchErpOrder } from '@/api/ErpSyncMes' import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData' @@ -700,6 +711,7 @@ this.form.partname = '' this.form.partspec = '' this.form.paystartdate = '' this.form.saleordercode = '' this.form.payenddate = '' this.form.creatuser = '' this.form.erpordercode = '' @@ -743,24 +755,50 @@ async orderClose(id) { this.tableData.forEach(item => { if (item.id === id) { if (item.status !== 'NEW') { return this.$message.info('此订单非新订单，无法关闭！') } else { this.$confirm('是否确认关闭订单?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => { if (res.code === '200') { this.$message.success('订单关闭成功!') this.getErpOrderSearch() } }) }).catch(() => { this.$message.info('已取消关闭！') // if (item.status !== 'NEW') { // return this.$message.info('此订单非新订单，无法关闭！') // } else { this.$confirm('是否确认关闭订单，该订单下的所有工单将会关闭！', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => { if (res.code === '200') { this.$message.success('订单关闭成功!') this.getErpOrderSearch() } }) } }).catch(() => { this.$message.info('已取消关闭！') }) // } } }) }, // 订单开启 async orderOpen(id) { this.tableData.forEach(item => { if (item.id === id) { // if (item.status !== 'NEW') { // return this.$message.info('此订单非新订单，无法关闭！') // } else { this.$confirm('是否确认启动订单，该订单下的所有工单将会开启！', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { ReverseClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => { if (res.code === '200') { this.$message.success('订单启动成功!') this.getErpOrderSearch() } }) }).catch(() => { this.$message.info('已取消关闭！') }) // } } }) }, src/views/workOrder/workOrderClose.vue
@@ -3,7 +3,8 @@ <div class="body" :style="{height:mainHeight+'px'}"> <div class="bodyTopButtonGroup"> <el-button v-waves icon="el-icon-switch-button" type="success" @click="orderClose()">工单关闭</el-button> <el-button v-waves icon="el-icon-switch-button" type="danger" @click="orderClose()">工单关闭</el-button> <el-button v-waves icon="el-icon-thumb" type="success" @click="orderOpen()">工单启动</el-button> </div> <div class="bodyTopFormGroup"> @@ -136,6 +137,7 @@ </div> <div class="elTableDiv"> <!-- @row-click="rowClick"--> <el-table ref="tableDataRef" class="tableFixed" @@ -148,17 +150,16 @@ :header-cell-style="this.$headerCellStyle" :cell-style="this.$cellStyle" @sort-change="sortChange" @row-click="rowClick" @selection-change="handleSelectionChange" > <el-table-column type="selection" width="50" :selectable="selected" /> <!-- :selectable="selected"--> <el-table-column prop="rowNum" width="50" width="80" label="序号" fixed /> @@ -347,10 +348,20 @@ <el-tooltip class="item" effect="dark" content="工单关闭" placement="top"> <i v-if="row.status!=='CLOSED'" class="el-icon-switch-button" style="cursor: pointer;margin-left: 15px" :style="{color:$store.state.settings.theme}" :style="{color:'red'}" @click.stop="orderClose(row)" /> </el-tooltip> <el-tooltip class="item" effect="dark" content="工单启动" placement="top"> <i v-if="row.status==='CLOSED'" class="el-icon-thumb" style="cursor: pointer;margin-left: 15px" :style="{color:$store.state.settings.theme}" @click.stop="orderOpen(row)" /> </el-tooltip> @@ -1976,7 +1987,7 @@ AddUpdateMesOrder, DeleteMesOrder, MesBadOrderSearch, MesOrderDistribution, MesOrderClosedSearch, UpdateMesOrderStepSearch, MesOrderBitchClosedSeave UpdateMesOrderStepSearch, MesOrderBitchClosedSeave, MesOrderBitchReverseClosedSeave } from '@/api/WorkOrder' import { PartSelect } from '@/api/ProductModel' import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData' @@ -2423,7 +2434,7 @@ this.dialogVisibleTask = false }, handleSelectionChange(val) { this.multipleSelection = val.map(i => i.wo_code) this.multipleSelection = val }, selected(row, index) { @@ -2520,15 +2531,19 @@ }, // 工单关闭事件 async orderClose(row) { this.$confirm('是否确认删除?', '提示', { this.$confirm('是否确认关闭?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { let data = null if (row) { // 行关闭工单 this.multipleSelection = [row.wo_code] data = [row.wo_code] } else { data = this.multipleSelection.filter(i => i.status !== 'CLOSED').map(i => i.wo_code) } MesOrderBitchClosedSeave(this.multipleSelection).then(res => { MesOrderBitchClosedSeave(data).then(res => { if (res.code === '200') { this.$notify.success('关闭成功!') // if (this.form.page > 1 && this.tableData.length === 1) { @@ -2541,6 +2556,33 @@ this.$notify.info('已取消删除！') }) }, // 工单启动事件 async orderOpen(row) { this.$confirm('是否确认启动?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { let data = null if (row) { // 行启动工单 data = [row.wo_code] } else { data = this.multipleSelection.filter(i => i.status === 'CLOSED').map(i => i.wo_code) } MesOrderBitchReverseClosedSeave(data).then(res => { if (res.code === '200') { this.$notify.success('启动成功!') // if (this.form.page > 1 && this.tableData.length === 1) { // this.form.page-- // } this.getMesOrderClosedSearch() } }) }).catch(() => { this.$notify.info('已取消删除！') }) }, // 对话框产品信息值改变 partcodeChangeDialog(val) { console.log(val) src/views/workOrder/workOrderList.vue
@@ -163,7 +163,7 @@ /> <el-table-column prop="rowNum" width="50" width="80" label="序号" fixed /> src/views/workOrder/workOrderSend.vue
@@ -164,7 +164,7 @@ <!-- />--> <el-table-column prop="rowNum" width="50" width="80 " label="序号" fixed /> vue.config.js
@@ -52,8 +52,8 @@ }, proxy: { [process.env.VUE_APP_BASE_API]: { // target: 'http://121.196.36.24:8031', // 请求的第三⽅接⼝地址 本地开发服务器 target: 'http://192.168.21.221:8000', // 请求的第三⽅接⼝地址 本地开发服务器 target: 'http://121.196.36.24:8031', // 请求的第三⽅接⼝地址 本地测试地址 // target: 'http://192.168.21.221:8000', // 请求的第三⽅接⼝地址 客户地址 changeOrigin: true, // 请求跨域时，需 配置此项 pathRewrite: { // 路径重写,替换target中的请求地址 ['^' + process.env.VUE_APP_BASE_API]: '/api/'
