Skip to content

M
mes-pad
Commit ce3a4b8b authored by 张海景's avatar 张海景
Browse files
Options

update:修改质量列表和延迟时间

parent 7a07fb8c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 745 additions and 740 deletions
App.vue
View file @ ce3a4b8b
......@@ -7,9 +7,9 @@ export default {
// #endif
},
//把想要全局的数据放在globalData对象里，globalData是uniapp的不可以自定义命名。
globalData:{
printSocket:null
},
globalData: {
printSocket: null
},
onShow: function () {},
onHide: function () {}
};
......@@ -25,4 +25,9 @@ export default {
/deep/ .times .uni-date-picker__container {
height: 275px !important;
}
/deep/ .uni-pagination__num-tag {
width: 60rpx !important;
height: 60rpx !important;
}
</style>
components/User/User.vue
View file @ ce3a4b8b
......@@ -63,15 +63,15 @@ export default {
this.getList();
},
methods: {
handleClick( ){
handleClick() {
if (this.tableParams.userName) {
this.params.userName = this.tableParams.userName;
}
if (this.tableParams.nickName) {
this.params.nickName = this.tableParams.nickName;
}
this.params.pageNum = 1
this.getList()
this.params.pageNum = 1;
this.getList();
},
async getList() {
const res = await this.$u.api.getUserList(this.params);
......@@ -83,8 +83,8 @@ export default {
},
// 分页触发
change(e) {
this.params.pageNum = e.current
this.getList()
this.params.pageNum = e.current;
this.getList();
},
toggleRowSelection(checked, arr) {
this.tableSelectData = arr;
......
pages/mes/prodReport/components/userPersonnel.vue
View file @ ce3a4b8b
<template>
<view class="dmodel-table">
<view class="search">
<u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="编号" label-width="60px" name="userName">
<uni-easyinput type="text" v-model="tableParams.userName" placeholder="请输入编号" />
</u-form-item>
<u-form-item label="名称" label-width="60px" name="nickName">
<uni-easyinput type="text" v-model="tableParams.nickName" placeholder="请输入名称" />
</u-form-item>
<u-form-item>
<u-button class="btn" @click="handleClick" type="primary" size="medium">搜索</u-button>
</u-form-item>
</u-form>
</view>
<view>
<zb-table ref="zbTable" rowKey="userName"
:columns="tableColumn" :data="tableData" :stripe="true"
@toggleRowSelection="toggleRowSelection">
</zb-table>
</view>
<view class="uni-pagination-box"><uni-pagination show-icon :page-size="params.pageSize" :current="params.pageNum" :total="total" @change="change" /></view>
</view>
<view class="dmodel-table">
<view class="search">
<u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="编号" label-width="60px" name="userName">
<uni-easyinput type="text" v-model="tableParams.userName" placeholder="请输入编号" />
</u-form-item>
<u-form-item label="名称" label-width="60px" name="nickName">
<uni-easyinput type="text" v-model="tableParams.nickName" placeholder="请输入名称" />
</u-form-item>
<u-form-item>
<u-button class="btn" @click="handleClick" type="primary" size="medium">搜索</u-button>
</u-form-item>
</u-form>
</view>
<view>
<zb-table ref="zbTable" rowKey="userName" :columns="tableColumn" :data="tableData" :stripe="true" @toggleRowSelection="toggleRowSelection"></zb-table>
</view>
<view class="uni-pagination-box"><uni-pagination show-icon :page-size="params.pageSize" :current="params.pageNum" :total="total" @change="change" /></view>
</view>
</template>
<script>
export default {
props: {
data: {
type: Object,
default: () => {}
}
},
data() {
return {
params: {
pageNum: 1,
pageSize: 10,
workstationId: this.data?.workstationId || null
},
total: 0,
tableParams: {
nickName: null,
userName: null,
},
tableData: [],
tableSelectData: [],
tableColumn: [{
type: 'radio',
width: 40
},
{
name: 'userName',
label: '编号',
width: 160,
},
{
name: 'nickName',
label: '名称',
width: 200,
},
export default {
props: {
data: {
type: Object,
default: () => {}
}
},
data() {
return {
params: {
pageNum: 1,
pageSize: 10,
workstationId: this.data?.workstationId || null
},
total: 0,
tableParams: {
nickName: null,
userName: null
},
tableData: [],
tableSelectData: [],
tableColumn: [
{
type: 'radio',
width: 40
},
{
name: 'userName',
label: '编号',
width: 160
},
{
name: 'nickName',
label: '名称',
width: 200
},
{
name: 'workstationName',
label: '工作站',
width: 160,
},
],
}
},
// computed: {
// tableData() {
// return this.data || []
// }
// },
mounted() {
this.getList()
// this.data.workstationName
},
methods: {
handleClick( ){
if (this.tableParams.userName) {
this.params.userName = this.tableParams.userName;
}
if (this.tableParams.nickName) {
this.params.nickName = this.tableParams.nickName;
}
this.params.pageNum = 1
this.getList()
},
async getList() {
const res = await this.$u.api.userQuery(this.params)
console.log(res, 'res')
if (res.code == 200) {
this.tableData= res.rows.map(item => {
return {
...item,
workstationName: this.data?.workstationName || null
}
})
this.total = res.total
}
},
// 分页触发
change(e) {
this.params.pageNum = e.current
this.getList()
},
toggleRowSelection(checked, arr) {
this.tableSelectData = arr
},
}
}
{
name: 'workstationName',
label: '工作站',
width: 160
}
]
};
},
// computed: {
// tableData() {
// return this.data || []
// }
// },
mounted() {
this.getList();
// this.data.workstationName
},
methods: {
handleClick() {
if (this.tableParams.userName) {
this.params.userName = this.tableParams.userName;
}
if (this.tableParams.nickName) {
this.params.nickName = this.tableParams.nickName;
}
this.params.pageNum = 1;
this.getList();
},
async getList() {
const res = await this.$u.api.userQuery(this.params);
console.log(res, 'res');
if (res.code == 200) {
this.tableData = res.rows.map((item) => {
return {
...item,
workstationName: this.data?.workstationName || null
};
});
this.total = res.total;
}
},
// 分页触发
change(e) {
this.params.pageNum = e.current;
this.getList();
},
toggleRowSelection(checked, arr) {
this.tableSelectData = arr;
}
}
};
</script>
<style lang="scss" scoped>
.dmodel-table {
height: 1200rpx;
margin-top: 20rpx;
padding: 0 20rpx;
position: relative;
}
.tableForm{
display: flex;
margin-bottom:20rpx;
}
.btn{
margin-left:10px;
}
.uni-pagination-box{
position: absolute;
right:20rpx;
bottom:40rpx;
}
.dmodel-table {
height: 1200rpx;
margin-top: 20rpx;
padding: 0 20rpx;
position: relative;
}
.tableForm {
display: flex;
margin-bottom: 20rpx;
}
.btn {
margin-left: 10px;
}
.uni-pagination-box {
position: absolute;
right: 20rpx;
bottom: 40rpx;
}
</style>
pages/mes/prodReport/index.vue
View file @ ce3a4b8b
......@@ -88,7 +88,7 @@
</view>
<u-button type="primary" @click="commonClick('Refresh')">刷新</u-button>
<u-button type="success" @click="commonClick('StartTask')">开始作业</u-button>
<u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button>
<u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button>
<u-button type="success" @click="commonClick('Prod')">生产报工</u-button>
<u-button type="primary" @click="commonClick('FinshTask')">完成作业</u-button>
<u-button type="primary" @click="commonClick('KnifeTemp')">刀模版上下机</u-button>
......@@ -282,7 +282,7 @@
v-model="userTempVisible"
width="1300rpx"
>
<view class="feedback-card">
<view>
<userPersonnel ref="userPersonnelRef" v-if="userTempVisible" :data="usePersonData" />
</view>
</u-modal>
......@@ -439,7 +439,7 @@
<view class="list-bar">
<u-form label-width="65px" labelAlign="right" :model="curTaskInfo">
<u-row>
<u-col span="3">
<u-col span="3">
<u-form-item label="编排单号">
{{ curTaskInfo.arrangeCode }}
</u-form-item>
......@@ -449,7 +449,7 @@
<uni-data-select v-model="curTaskInfo.workorderCode" @change="materialReturnWorkorderProcessItem" :localdata="curTaskInfo.workorderOption"></uni-data-select>
</u-form-item>
</u-col>
<u-col span="4.5">
<u-col span="4.5">
<u-form-item label="领料原因" prop="pickingReason">
<uni-data-select v-model="curTaskInfo.pickingReason" :localdata="reasonList" @change="pickingCause"></uni-data-select>
</u-form-item>
......@@ -830,8 +830,8 @@ export default {
depletionMethod: 1
},
curTaskInfo: {
pickingReason: null
},
pickingReason: null
},
currentType: 0,
bomFeeData: [],
bomFeeColumn: [
......@@ -985,7 +985,7 @@ export default {
viewSop: [],
reasonList: [],
causeList: [],
reasonList: [],
reasonList: [],
workorderList: [],
materialUsageRecordList: [],
materialusagerecordLoading: false,
......@@ -1244,7 +1244,7 @@ export default {
break;
case 'MaterialRequest':
this.materialRequestShow();
this.pickingCause();
this.pickingCause();
break;
case 'MaterialReturn':
this.materialReturnShow();
......@@ -1455,25 +1455,25 @@ export default {
});
});
},
pickingCause() {
// 查询原因
this.$u.api.abnormal
.detail({
pageNum: 1,
pageSize: 10,
abnormalType: 'REASON'
})
.then((res) => {
this.reasonList = res.rows.map((item) => {
return {
value: item.abnormalReason,
text: item.abnormalReason
};
});
});
},
pickingCause() {
// 查询原因
this.$u.api.abnormal
.detail({
pageNum: 1,
pageSize: 10,
abnormalType: 'REASON'
})
.then((res) => {
this.reasonList = res.rows.map((item) => {
return {
value: item.abnormalReason,
text: item.abnormalReason
};
});
});
},
getWorkorderWithSizeAndDirective(item, index) {
this.$u.api
.getWorkorderWithSizeAndDirective({
......@@ -1850,8 +1850,8 @@ export default {
this.$u.toast('打印机连接失败');
return;
}
console.log(item, 'item')
debugger
console.log(item, 'item');
debugger;
//工单
this.$u.api
.feedback({
......@@ -2042,11 +2042,11 @@ export default {
this.materialRequestFormVisible = false;
},
materialRequestSave() {
if(!this.curTaskInfo.pickingReason){
this.materialRequestVisible = true
this.$u.toast("原因不能为空！")
return
}
if (!this.curTaskInfo.pickingReason) {
this.materialRequestVisible = true;
this.$u.toast('原因不能为空！');
return;
}
const rst = [];
const taskInfo = this.tableSelectData[0];
const t = this;
......@@ -2055,7 +2055,7 @@ export default {
this.materialRequestArrays.forEach((s) => {
if (s.applyNum != null) {
rst.push({
pickingReason: this.curTaskInfo.pickingReason,
pickingReason: this.curTaskInfo.pickingReason,
itemId: s.itemId,
taskWorkunitId: this.curTaskInfo.taskWorkunitId,
workorderCode: items?.text,
......
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