Commit 9554fc5c authored by 沈翠玲's avatar 沈翠玲

工单关闭 和版本更新和修改bug

parent 0bf77811
......@@ -70,6 +70,15 @@ export function updateWorkorder(data) {
})
}
// 关闭生产工单
export function closeWorkorder(data) {
return request({
url: '/mes/pro/workorder/close',
method: 'put',
data: data
})
}
// 删除生产工单
export function delWorkorder(workorderId) {
return request({
......
......@@ -564,6 +564,7 @@ import {
dofinish,
printInfo,
doCheckToolNum,
closeWorkorder
} from "@/api/mes/pro/workorder";
import { addProtaskList } from "@/api/mes/pro/protask";
......@@ -796,11 +797,13 @@ export default {
},
handleClose(){
if(this.ids.length === 0) return this.$message.warning('请勾选要关闭的工单')
updateWorkorder({
"workorderId": this.ids.join(','),
"status": "CLOSE"
}).then(({data}) => {
const obj = this.ids.map(v=>({
workorderId: v,
status: "CLOSE"
}))
closeWorkorder(JSON.stringify(obj)).then(({data}) => {
this.$message.success('关闭工单成功')
this.getList();
})
},
showArrangDetail(row, arrangeCode) {
......
......@@ -41,14 +41,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="statusArr">
<el-select
v-model="queryParams.statusArr"
......@@ -100,7 +92,7 @@
</template>
</el-table-column>
<el-table-column
label="排产任务id"
label="任务单编码"
width="100"
align="center"
key="taskWorkunitId"
......
......@@ -109,7 +109,7 @@
<el-upload
slot="append"
class="upload-demo"
:action="baseURL + '/common/upload '"
:action="baseURL + '/common/bsnUpload '"
:before-upload="handleBeforeUpload"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
......@@ -203,6 +203,7 @@
// 如果上传成功
if (res.code == 200) {
this.form.url = res.url
this.$message.success("文件上传成功");
} else {
this.$message.error("文件上传失败");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment