update
This commit is contained in:
@@ -1,19 +1,24 @@
|
||||
<template>
|
||||
<div class="mod-config">
|
||||
<div style="color:#67c23a;background:#f0f9eb;padding:5px;margin-bottom:5px;text-align:center">录入托盘标识卡信息</div>
|
||||
<el-form :inline="true">
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:8%">
|
||||
<el-form-item label="加工类型">
|
||||
<el-select v-model="processType" clearable>
|
||||
<el-option :value="0" label="初始加工" />
|
||||
<el-option :value="1" label="复加工" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:2%">
|
||||
任务起点位置 :
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:2%">
|
||||
窑炉 :
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:10%">
|
||||
<el-form-item style="margin-left:2%">
|
||||
<el-button type="primary" @click="submitTask()">提交任务</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -30,43 +35,46 @@
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="id"
|
||||
prop="idenCardNum"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="标识卡">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="paramKey"
|
||||
prop="customerName"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="客户信息">
|
||||
label="客户名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="paramValue"
|
||||
prop="orderNo"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="订单号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="remark"
|
||||
prop="productName"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="产品名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="card"
|
||||
prop="materialDes"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="材料号牌">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="num"
|
||||
prop="finishQuantity"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="已完成数">
|
||||
<template slot-scope="scope">
|
||||
{{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="number"
|
||||
prop="quantity"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="数量">
|
||||
@@ -89,20 +97,11 @@
|
||||
align="center"
|
||||
label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
|
||||
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
|
||||
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)">修改</el-button>
|
||||
<el-button type="text" size="small" @click="deleteHandle(scope.$index)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
@size-change="sizeChangeHandle"
|
||||
@current-change="currentChangeHandle"
|
||||
:current-page="pageIndex"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="totalPage"
|
||||
layout="total, sizes, prev, pager, next, jumper">
|
||||
</el-pagination>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
||||
<process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point>
|
||||
@@ -115,12 +114,11 @@
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
startBtnName: '选择起点',
|
||||
kilnBtnName: '选择窑炉',
|
||||
startPosition: '选择起点',
|
||||
kilnId: '选择窑炉',
|
||||
targetPosition: '',
|
||||
dataList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
totalPage: 0,
|
||||
processType: null,
|
||||
dataListLoading: false,
|
||||
addOrUpdateVisible: false,
|
||||
processPointVisible: false
|
||||
@@ -136,41 +134,18 @@
|
||||
methods: {
|
||||
// 获取数据列表
|
||||
getDataList () {
|
||||
this.dataListLoading = true
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/sys/config/list'),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams({
|
||||
'page': this.pageIndex,
|
||||
'limit': this.pageSize
|
||||
})
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.dataList = data.page.list
|
||||
this.totalPage = data.page.totalCount
|
||||
} else {
|
||||
this.dataList = []
|
||||
this.totalPage = 0
|
||||
}
|
||||
this.dataListLoading = false
|
||||
})
|
||||
},
|
||||
// 每页数
|
||||
sizeChangeHandle (val) {
|
||||
this.pageSize = val
|
||||
this.pageIndex = 1
|
||||
this.getDataList()
|
||||
},
|
||||
// 当前页
|
||||
currentChangeHandle (val) {
|
||||
this.pageIndex = val
|
||||
this.getDataList()
|
||||
this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : []
|
||||
// if (data && data.code === 0) {
|
||||
// this.dataList = data.data.records
|
||||
// } else {
|
||||
// this.dataList = []
|
||||
// }
|
||||
},
|
||||
// 新增 / 修改
|
||||
addOrUpdateHandle (id) {
|
||||
addOrUpdateHandle (row, idx) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
this.$refs.addOrUpdate.init(row, idx)
|
||||
})
|
||||
},
|
||||
// 获取点位
|
||||
@@ -182,9 +157,10 @@
|
||||
},
|
||||
setPoint (count, pointType) {
|
||||
if (!pointType) {
|
||||
this.startBtnName = count
|
||||
this.startPosition = count
|
||||
} else {
|
||||
this.kilnBtnName = count
|
||||
this.kilnId = count
|
||||
this.targetPosition = count
|
||||
}
|
||||
},
|
||||
submitTask () {
|
||||
@@ -193,43 +169,61 @@
|
||||
message: '任务为空，请新增一条托盘信息',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (this.startBtnName === '选择起点') {
|
||||
} else if (this.startPosition === '选择起点') {
|
||||
this.$message({
|
||||
message: '请选择任务起点',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (this.kilnBtnName === '选择窑炉') {
|
||||
} else if (this.kilnId === '选择窑炉') {
|
||||
this.$message({
|
||||
message: '请选择窑炉',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (!this.processType) {
|
||||
this.$message.warning('请选择加工类型')
|
||||
} else {
|
||||
this.$confirm(`确定提交任务?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl(`currTask/createProcessTask`),
|
||||
method: 'post',
|
||||
data: this.$http.adornData({
|
||||
craftCode: '',
|
||||
detParams: this.dataList,
|
||||
kilnId: this.kilnId,
|
||||
processType: this.processType,
|
||||
startPosition: this.startPosition,
|
||||
targetPosition: this.targetPosition
|
||||
})
|
||||
}).then(({data}) => {
|
||||
console.log(data)
|
||||
if (data && data.code === 0) {
|
||||
this.$message.success('任务提交成功')
|
||||
this.dataList = []
|
||||
sessionStorage.setItem('taskList', '')
|
||||
this.startPosition = '选择起点'
|
||||
this.kilnId = '选择窑炉'
|
||||
this.targetPosition = null
|
||||
} else {
|
||||
this.$message.warning(data.msg)
|
||||
}
|
||||
})
|
||||
}).catch(() => {})
|
||||
}
|
||||
},
|
||||
// 删除
|
||||
deleteHandle (id) {
|
||||
this.$confirm(`确定对[id=${id}]进行删除]操作?`, '提示', {
|
||||
deleteHandle (idx) {
|
||||
console.log(idx)
|
||||
this.$confirm(`确定对第${idx + 1}项进行删除操作?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/sys/config/delete'),
|
||||
method: 'post',
|
||||
data: this.$http.adornData(id, false)
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.$message({
|
||||
message: '操作成功',
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getDataList()
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.error(data.msg)
|
||||
}
|
||||
})
|
||||
this.dataList.splice(idx, 1)
|
||||
sessionStorage.setItem('taskList', JSON.stringify(this.dataList))
|
||||
}).catch(() => {})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user