mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产工单添加完成功能

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2023-09-12 23:03:00 +08:00
parent dd0c463b29
commit f3d8881237
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/mes/pro/workorder.js
View File

@ -50,4 +50,11 @@ export function listItems(query) {
method: 'get',
params: query
})
}
export function dofinish(workorderId){
return request({
url: '/mes/pro/workorder/'+workorderId,
method: 'put'
})
}

27
src/views/mes/pro/workorder/index.vue
View File

@ -179,8 +179,16 @@
icon="el-icon-plus"
v-if="scope.row.status =='CONFIRMED'"
@click="handleAdd(scope.row)"
v-hasPermi="['mes:pro:workorder:add']"
v-hasPermi="['mes:pro:workorder:update']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-circle-check"
v-if="scope.row.status =='CONFIRMED'"
@click="handleFinish(scope.row)"
v-hasPermi="['mes:pro:workorder:update']"
>完成</el-button>
<el-button
size="mini"
type="text"
@ -350,7 +358,7 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
<el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">完成</el-button>
<el-button type="success" @click="handleConfirm" v-if="form.status =='PREPARE' && optType !='view' && form.workorderId !=null">完成</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -358,7 +366,7 @@
</template>
<script>
import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder";
import { listWorkorder, getWorkorder, delWorkorder, addWorkorder, updateWorkorder ,dofinish} from "@/api/mes/pro/workorder";
import Workorderbom from "./bom/bom.vue";
import WorkorderItemList from "./items/item.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
@ -639,13 +647,22 @@ export default {
...this.queryParams
}, `workorder_${new Date().getTime()}.xlsx`)
},
handleFinish(){
handleConfirm(){
let that = this;
this.$modal.confirm('是否完成工单编制？【完成后将不能更改】').then(function(){
this.$modal.confirm('是确认完成工单编制？【确认后将不能更改】').then(function(){
that.form.status = 'CONFIRMED';
that.submitForm();
});
},
handleFinish(row){
const workorderIds = row.workorderId || this.ids;
this.$modal.confirm('确认完成工单？一旦完成，此工单将无法继续报工').then(function() {
return dofinish(workorderIds) //完成工单
}).then(() => {
this.getList();
this.$modal.msgSuccess("更改成功");
}).catch(() => {});
},
//物料选择弹出框
onItemSelected(obj){
if(obj != undefined && obj != null){