Commit 5fca79f4 authored by 沈翠玲's avatar 沈翠玲

工序新增和工序删除

parent 22bf2be9
...@@ -97,3 +97,20 @@ export function addProtaskList(workorderIds) { ...@@ -97,3 +97,20 @@ export function addProtaskList(workorderIds) {
method: "post", method: "post",
}); });
} }
// 工站变更
export function splitWorkstation(data) {
return request({
url: "/mes/pro/protask/splitWorkstation",
method: "put",
data: data,
});
}
// 工序删除
export function deleteTask(taskId) {
return request({
url: "/mes/pro/protask/deleteTask/" + taskId,
method: "delete",
});
}
\ No newline at end of file
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
<el-date-picker <el-date-picker
v-model="queryParams.scheduleStartDate" v-model="queryParams.scheduleStartDate"
type="datetimerange" type="datetimerange"
:clearable="false"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
...@@ -114,6 +115,7 @@ ...@@ -114,6 +115,7 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
:clearable="false"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
...@@ -161,14 +163,24 @@ ...@@ -161,14 +163,24 @@
@click="handleOpenTask" @click="handleOpenTask"
>取消完工</el-button> >取消完工</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
size="mini" size="mini"
@click="handleSumbmitMakeProduction" :disabled='single'
>下达生产</el-button> @click="handleSplitWorkstation"
</el-col> --> >工序新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled='single'
@click="handleDeleteTask"
>工序删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -201,6 +213,12 @@ ...@@ -201,6 +213,12 @@
prop="processName" prop="processName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column
label="任务顺序"
align="center"
prop="ordinalStr"
:show-overflow-tooltip="true"
/>
<el-table-column label="排产数量" align="center" prop="quantity" /> <el-table-column label="排产数量" align="center" prop="quantity" />
<el-table-column label="可加工数量" align="center" prop="quantityWait"/> <el-table-column label="可加工数量" align="center" prop="quantityWait"/>
<el-table-column label="已完成数量" align="center" prop="quantityQualify" /> <el-table-column label="已完成数量" align="center" prop="quantityQualify" />
...@@ -243,6 +261,7 @@ ...@@ -243,6 +261,7 @@
v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'"
v-model="scope.row.scheduleStartDate" v-model="scope.row.scheduleStartDate"
type="datetime" type="datetime"
:clearable="false"
style="width: 100%;" style="width: 100%;"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
...@@ -267,6 +286,7 @@ ...@@ -267,6 +286,7 @@
v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'"
v-model="scope.row.scheduleEndDate" v-model="scope.row.scheduleEndDate"
type="datetime" type="datetime"
:clearable="false"
style="width: 100%;" style="width: 100%;"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
...@@ -493,8 +513,34 @@ ...@@ -493,8 +513,34 @@
<el-button @click="jobAssignmentVisible = false">取 消</el-button> <el-button @click="jobAssignmentVisible = false">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 工序新增 -->
<el-dialog
title="工序新增"
:visible.sync="splitVisible"
width="600px"
append-to-body
>
<el-form :model="splitform" ref="splitform" size="small" :inline="true">
<el-row>
<el-col :span="24">
<el-form-item label="工作单元" prop="workunitCode">
<el-input v-model="splitform.workunitName" placeholder="工作单元" >
<el-button slot="append" icon="el-icon-search" @click="$refs.jobAssign.showFlag = true"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
@click="handleSubmitSplit"
>确 定</el-button>
<el-button @click="splitVisible = false">取 消</el-button>
</div>
</el-dialog>
<!-- 工作单元选择 --> <!-- 工作单元选择 -->
<jobAssign ref="jobAssign" :taskId="taskId" @onSelected="val => onWorkstationSelect(val)"></jobAssign> <jobAssign ref="jobAssign" :taskId="splitVisible ? null : taskId" @onSelected="val => onWorkstationSelect(val)"></jobAssign>
<!-- 排程 --> <!-- 排程 -->
<el-dialog <el-dialog
title="详情" title="详情"
...@@ -538,7 +584,7 @@ import { ...@@ -538,7 +584,7 @@ import {
getworkstationList, getworkstationList,
gettaskWorkunitList, gettaskWorkunitList,
getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList' getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
import {putProtaskSplit} from '@/api/mes/pro/protask' import {putProtaskSplit, splitWorkstation, deleteTask} from '@/api/mes/pro/protask'
import BrandSelect from "@/components/TmTool/index.vue"; import BrandSelect from "@/components/TmTool/index.vue";
import shiftSelectMixin from '@/utils/shiftSelectMixin' import shiftSelectMixin from '@/utils/shiftSelectMixin'
import OrderList from './orderList.vue' import OrderList from './orderList.vue'
...@@ -573,6 +619,8 @@ export default { ...@@ -573,6 +619,8 @@ export default {
taskWorkunitId: null, taskWorkunitId: null,
arrangCodeVisible: false, arrangCodeVisible: false,
scheduleVisible: false, scheduleVisible: false,
splitVisible: false,
splitform: {},
isOrder: true, isOrder: true,
// 遮罩层 // 遮罩层
loading: false, loading: false,
...@@ -643,6 +691,19 @@ export default { ...@@ -643,6 +691,19 @@ export default {
} }
}); });
}, },
handleSubmitSplit() {
let datas = Object.assign({}, this.splitform);
datas['taskId'] = this.selectedRows[0].taskId
datas['scheduleStartDate'] = this.selectedRows[0].scheduleStartDate
datas['scheduleEndDate'] = this.selectedRows[0].scheduleEndDate
splitWorkstation(datas).then((res) => {
// console.log(res, 'res333')
if (res.code === 200) {
this.splitVisible = false;
this.getList();
}
});
},
hanldeGetdefaultWorkCenterList() { hanldeGetdefaultWorkCenterList() {
getdefaultWorkCenterList().then(async (res) => { getdefaultWorkCenterList().then(async (res) => {
console.log(res, 5566) console.log(res, 5566)
...@@ -662,6 +723,16 @@ export default { ...@@ -662,6 +723,16 @@ export default {
const response = await getworkshopList() const response = await getworkshopList()
this.workshopList = response.rows this.workshopList = response.rows
}, },
handleDeleteTask(){
this.$modal
.confirm('是否删除工序')
.then( ()=> {
deleteTask(this.selectedRows[0].taskId).then(response => {
this.$modal.msgSuccess("删除成功");
this.getList();
});
})
},
async handleChangeWorkshopId() { async handleChangeWorkshopId() {
// this.workstationList = [] // this.workstationList = []
this.queryWorkunitParams.workstationId = null this.queryWorkunitParams.workstationId = null
...@@ -687,6 +758,15 @@ export default { ...@@ -687,6 +758,15 @@ export default {
console.log('this.selectedRows[0]', this.selectedRows[0]) console.log('this.selectedRows[0]', this.selectedRows[0])
this.jobAssignmentVisible = true; this.jobAssignmentVisible = true;
}, },
handleSplitWorkstation() {
this.splitform = {
workunitName: null,
workunitId: null
};
this.workstationId = this.selectedRows[0].workstationId
this.taskId = this.selectedRows[0].taskId
this.splitVisible = true;
},
handleChangeWorkStationId(item) { handleChangeWorkStationId(item) {
this.hanldeGettaskWorkunitList() this.hanldeGettaskWorkunitList()
const finditem = this.workstationList.find(v => v.workstationId === item) const finditem = this.workstationList.find(v => v.workstationId === item)
...@@ -714,8 +794,13 @@ export default { ...@@ -714,8 +794,13 @@ export default {
}, },
onWorkstationSelect(row) { onWorkstationSelect(row) {
if (row != undefined && row != null) { if (row != undefined && row != null) {
this.Assignform.workunitId = row.workunitId if (!this.splitVisible) {
this.Assignform.workunitName = row.workunitName this.Assignform.workunitId = row.workunitId
this.Assignform.workunitName = row.workunitName
} else {
this.splitform.workunitId = row.workunitId
this.splitform.workunitName = row.workunitName
}
} }
}, },
handleClick(row,index) { handleClick(row,index) {
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
handleBeforeUpload(file) { handleBeforeUpload(file) {
this.loading = true this.loading = true
// 校检文件后缀名 // 校检文件后缀名
if(file && file.name && file.name.substring(file.name.lastIndexOf('.') + 1) === 'apk') { if(file && file.name && (file.name.substring(file.name.lastIndexOf('.') + 1) === 'apk' || file.name.substring(file.name.lastIndexOf('.') + 1) === 'wgt')) {
return true; return true;
} else { } else {
this.$message.error('请上传APK安装包'); this.$message.error('请上传APK安装包');
......
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