Commit ce3a4b8b authored by 张海景's avatar 张海景

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

parent 7a07fb8c
......@@ -7,8 +7,8 @@ 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>
......@@ -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;
......
......@@ -14,17 +14,14 @@
</u-form>
</view>
<view>
<zb-table ref="zbTable" rowKey="userName"
:columns="tableColumn" :data="tableData" :stripe="true"
@toggleRowSelection="toggleRowSelection">
</zb-table>
<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 {
export default {
props: {
data: {
type: Object,
......@@ -41,32 +38,33 @@
total: 0,
tableParams: {
nickName: null,
userName: null,
userName: null
},
tableData: [],
tableSelectData: [],
tableColumn: [{
tableColumn: [
{
type: 'radio',
width: 40
},
{
name: 'userName',
label: '编号',
width: 160,
width: 160
},
{
name: 'nickName',
label: '名称',
width: 200,
width: 200
},
{
name: 'workstationName',
label: '工作站',
width: 160,
},
],
width: 160
}
]
};
},
// computed: {
// tableData() {
......@@ -74,62 +72,62 @@
// }
// },
mounted() {
this.getList()
this.getList();
// this.data.workstationName
},
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.userQuery(this.params)
console.log(res, 'res')
const res = await this.$u.api.userQuery(this.params);
console.log(res, 'res');
if (res.code == 200) {
this.tableData= res.rows.map(item => {
this.tableData = res.rows.map((item) => {
return {
...item,
workstationName: this.data?.workstationName || null
}
})
this.total = res.total
};
});
this.total = res.total;
}
},
// 分页触发
change(e) {
this.params.pageNum = e.current
this.getList()
this.params.pageNum = e.current;
this.getList();
},
toggleRowSelection(checked, arr) {
this.tableSelectData = arr
},
this.tableSelectData = arr;
}
}
};
</script>
<style lang="scss" scoped>
.dmodel-table {
.dmodel-table {
height: 1200rpx;
margin-top: 20rpx;
padding: 0 20rpx;
position: relative;
}
.tableForm{
}
.tableForm {
display: flex;
margin-bottom:20rpx;
}
.btn{
margin-left:10px;
}
.uni-pagination-box{
margin-bottom: 20rpx;
}
.btn {
margin-left: 10px;
}
.uni-pagination-box {
position: absolute;
right:20rpx;
bottom:40rpx;
}
right: 20rpx;
bottom: 40rpx;
}
</style>
......@@ -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>
......@@ -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,10 +2042,10 @@ 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];
......
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