|
@@ -1,5 +1,5 @@
|
|
<template>
|
|
<template>
|
|
- <view class="uni-column" style="padding: 24rpx">
|
|
|
|
|
|
+ <view class="uni-column" style="padding: 24rpx ;background-color: #f5f5f5;">
|
|
<view v-if="form.length>0" style="margin-bottom: 20rpx;">
|
|
<view v-if="form.length>0" style="margin-bottom: 20rpx;">
|
|
<view>
|
|
<view>
|
|
<view class="item-info uni-row">
|
|
<view class="item-info uni-row">
|
|
@@ -16,7 +16,7 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view v-if="form.length>0" style="height: calc(100% - 200rpx); overflow: auto;">
|
|
|
|
|
|
+ <view v-if="form.length>0" calss="item-info uni-row" style="overflow: auto; padding-bottom: 100rpx">
|
|
<view v-for="(item, index) in form" :key="index" :class="{'list-item':true,'selected':isSelected(item)}"
|
|
<view v-for="(item, index) in form" :key="index" :class="{'list-item':true,'selected':isSelected(item)}"
|
|
@click="handleSelection(item)">
|
|
@click="handleSelection(item)">
|
|
|
|
|
|
@@ -41,6 +41,7 @@
|
|
<text class="label right">{{item['dept']}}</text>
|
|
<text class="label right">{{item['dept']}}</text>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
|
|
|
@@ -54,7 +55,9 @@
|
|
<button class='bottom-btn left-btn' type="warn" @click="handleEnd">结束报工</button>
|
|
<button class='bottom-btn left-btn' type="warn" @click="handleEnd">结束报工</button>
|
|
<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
|
|
<button class='bottom-btn right-btn' type="primary" @click="handleContinue">继续扫码</button>
|
|
</view>
|
|
</view>
|
|
|
|
+
|
|
<dialog-lotReporting ref="lotReporting"></dialog-lotReporting>
|
|
<dialog-lotReporting ref="lotReporting"></dialog-lotReporting>
|
|
|
|
+ <dialog-Search ref="searchRef"></dialog-Search>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -67,7 +70,8 @@
|
|
} from 'vue'
|
|
} from 'vue'
|
|
import path from '@/api/base/path.js'
|
|
import path from '@/api/base/path.js'
|
|
|
|
|
|
- const lotReporting = ref(null)
|
|
|
|
|
|
+ const lotReporting = ref(null);
|
|
|
|
+ const searchRef = ref(null);
|
|
const workshopId = ref();
|
|
const workshopId = ref();
|
|
|
|
|
|
const form = ref([]); //表单数据true
|
|
const form = ref([]); //表单数据true
|
|
@@ -171,6 +175,11 @@
|
|
lotReporting.value.open(data);
|
|
lotReporting.value.open(data);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 搜索按钮操作
|
|
|
|
+ function handleSearch() {
|
|
|
|
+ searchRef.value.open();
|
|
|
|
+ }
|
|
|
|
+
|
|
// 全选按钮操作
|
|
// 全选按钮操作
|
|
function handleAll() {
|
|
function handleAll() {
|
|
//清空选中数据
|
|
//清空选中数据
|
|
@@ -210,22 +219,6 @@
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
<style lang="scss">
|
|
- $nav-height: 60rpx;
|
|
|
|
-
|
|
|
|
- .bottom-btn-container {
|
|
|
|
- position: fixed;
|
|
|
|
- top: 80%;
|
|
|
|
- right: 20rpx;
|
|
|
|
- left: 20rpx;
|
|
|
|
-
|
|
|
|
- .start-batch-btn {
|
|
|
|
- margin-bottom: 24rpx;
|
|
|
|
- border-radius: 8rpx;
|
|
|
|
- background-color: #00e2a6;
|
|
|
|
- width: 80%;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
.active {
|
|
.active {
|
|
flex: 1;
|
|
flex: 1;
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
@@ -274,50 +267,14 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- .box-bg {
|
|
|
|
- width: 100%;
|
|
|
|
- background-color: #F5F5F5;
|
|
|
|
- padding: 5rpx 0;
|
|
|
|
- justify-content: space-around;
|
|
|
|
- align-items: center;
|
|
|
|
-
|
|
|
|
- .input-view {
|
|
|
|
- width: 100%;
|
|
|
|
- flex: 4;
|
|
|
|
- background-color: #f8f8f8;
|
|
|
|
- height: $nav-height;
|
|
|
|
- border: 1rpx solid #999;
|
|
|
|
- border-radius: 15rpx;
|
|
|
|
- padding: 0 15rpx;
|
|
|
|
- flex-wrap: nowrap;
|
|
|
|
- margin: 0 10rpx 20rpx;
|
|
|
|
- line-height: $nav-height;
|
|
|
|
-
|
|
|
|
- .input-uni-icon {
|
|
|
|
- line-height: $nav-height;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- .nav-bar-input {
|
|
|
|
- width: 80%;
|
|
|
|
- height: $nav-height;
|
|
|
|
- line-height: $nav-height;
|
|
|
|
- padding: 0 5rpx;
|
|
|
|
- background-color: #f8f8f8;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
|
|
- .search {
|
|
|
|
- width: 20%;
|
|
|
|
- text-align: center;
|
|
|
|
- color: #808080;
|
|
|
|
- margin-top: -20rpx;
|
|
|
|
- }
|
|
|
|
|
|
+ .search {
|
|
|
|
+ width: 20%;
|
|
|
|
+ text-align: center;
|
|
|
|
+ color: #808080;
|
|
|
|
+ margin-top: -20rpx;
|
|
}
|
|
}
|
|
|
|
|
|
- .uni-column {
|
|
|
|
- background-color: rgba(245, 245, 245, 1);
|
|
|
|
- height: calc(100% - 40rpx);
|
|
|
|
- }
|
|
|
|
|
|
|
|
.list-item {
|
|
.list-item {
|
|
background-color: #fff;
|
|
background-color: #fff;
|