From 418263683eff6d18fe197a1543e5346491987688 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 13:58:22 +0800
Subject: [PATCH] #
---
pages/phyz/AGV/AGVPakin2.vue | 39 +++++++
pages/tzsk/work/wrkMast.vue | 117 +++++++++++++++++++++++
pages/tzsk/AGV/orderList.vue | 114 +++++++++++++++++-----
pages/phyz/AGV/AGVPakin.vue | 2
pages.json | 16 +++
pages/home/inOutManage.vue | 9 +
6 files changed, 270 insertions(+), 27 deletions(-)
diff --git a/pages.json b/pages.json
index 98edef3..af7cffd 100644
--- a/pages.json
+++ b/pages.json
@@ -418,6 +418,22 @@
"navigationBarTitleText" : "璁㈠崟鍒楄〃",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/tzsk/work/wrkMast",
+ "style" :
+ {
+ "navigationBarTitleText" : "宸ヤ綔妗ｆ煡璇�",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/phyz/AGV/AGVPakin2",
+ "style" :
+ {
+ "navigationBarTitleText" : "AGV缁勬墭",
+ "enablePullDownRefresh" : false
+ }
}
diff --git a/pages/home/inOutManage.vue b/pages/home/inOutManage.vue
index 290b8a4..4aadf8c 100644
--- a/pages/home/inOutManage.vue
+++ b/pages/home/inOutManage.vue
@@ -26,6 +26,13 @@
project: 'tzsk',
elements2: [
{
+ title: '缁勬墭',
+ name: 'pakin',
+ color: 'blue',
+ // cuIcon: 'pullup',
+ url: `/phyz/AGV/AGVPakin`
+ },
+ {
title: '绌烘澘鍏ュ嚭搴�',
name: 'emptyIn',
color: 'blue',
@@ -33,7 +40,7 @@
url: `/tzsk/AGV/AGVPakin`
},
{
- title: '閲囪喘鍏ュ簱',
+ title: '閲囪喘鍏ュ簱-鍚庤浆璁㈠崟',
name: 'AGVPick',
color: 'cyan',
// cuIcon: 'pullup',
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
index a30572b..554101d 100644
--- a/pages/phyz/AGV/AGVPakin.vue
+++ b/pages/phyz/AGV/AGVPakin.vue
@@ -649,6 +649,6 @@
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
}
</style>
diff --git a/pages/phyz/AGV/AGVPakin2.vue b/pages/phyz/AGV/AGVPakin2.vue
new file mode 100644
index 0000000..43bfa0e
--- /dev/null
+++ b/pages/phyz/AGV/AGVPakin2.vue
@@ -0,0 +1,39 @@
+<template>
+ <view>
+ <view class="code">
+ <view class="code-item">
+ <view>璁㈠崟鍙�</view>
+ <input type="text" placeholder="鎵爜 / 杈撳叆">
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+ .code-item {
+ display: flex;
+ margin: 16rpx;
+ padding: 16rpx;
+ font-size: 18px;
+ align-items: center;
+ border: 1px solid #d8d8d8;
+ border-radius: 16rpx;
+ background-color: #FFF;
+ }
+ .code-item input {
+ padding-left: 20rpx;
+ }
+</style>
diff --git a/pages/tzsk/AGV/orderList.vue b/pages/tzsk/AGV/orderList.vue
index 01d53c0..61fef18 100644
--- a/pages/tzsk/AGV/orderList.vue
+++ b/pages/tzsk/AGV/orderList.vue
@@ -4,6 +4,11 @@
<uni-search-bar :focus="matFocus" v-model="matnr" @input="matInput()" ma
maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿鍟嗗搧">
</uni-search-bar>
+ <view class="code-title">
+ <view></view>
+ <view>鍟嗗搧鍒楄〃</view>
+ <view @click="allChecked">{{allCheckBtnTitle}}</view>
+ </view>
</view>
<view class="list" v-for="(item,i) in dataList">
<view class="list-left">
@@ -13,12 +18,13 @@
<view>鏁伴噺锛歿{item.anfme}}</view>
<view class="card-id">{{i + 1}}</view>
</view>
- <view class="list-right">
- <label @click="checkboxChange(item)">
- <checkbox :value="item.orderNo" color="#FFCC33" style="transform:scale(0.7)" /><text></text>
+ <view class="list-right" @click="checkboxChange(item)">
+ <label >
+ <checkbox :value="item.orderNo" :checked="item.checked" color="#FFCC33" style="transform:scale(0.7)" /><text></text>
</label>
</view>
</view>
+ <view style="height: 100rpx;"></view>
</view>
</template>
@@ -32,49 +38,87 @@
dataList: [
{
orderNo: 'cg0931241',
+ matnr: 'cg0931255',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z',
+ checked: true
+ },
+ {
+ orderNo: 'cg0931241',
matnr: 'cg0931241',
maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
},
{
- orderNo: 'cg0931242',
- matnr: 'cg0931242',
- maktx: '鍝堝搱',
+ orderNo: 'cg0931241',
+ matnr: 'cg0931225',
+ maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
},
{
- orderNo: 'cg0931243',
- matnr: 'cg0931243',
- maktx: '鍝堝搱',
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
},
{
- orderNo: 'cg0931244',
- matnr: 'cg0931244',
- maktx: '杈ｆ',
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
},
{
- orderNo: 'cg0931245',
- matnr: 'cg0931245',
- maktx: '44',
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
},
{
- orderNo: 'cg0931246',
- matnr: 'cg0931246',
- maktx: '41',
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
anfme: 10,
specs: '10-z'
- }
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z'
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z'
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z'
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z'
+ },
],
oldDataList: [],
- newDataList: []
+ newDataList: [],
+ allCheck: false,
+ allCheckBtnTitle: '鍏ㄩ��'
}
},
onShow() {
@@ -86,7 +130,6 @@
let sign = 0
this.dataList = [...this.oldDataList]
this.newDataList = []
- this.searchEnd()
for (let k in this.dataList) {
if (!this.dataList[k].matnr.includes(this.matnr)) {
count++;
@@ -111,10 +154,6 @@
}
this.dataList = this.newDataList
},
- searchEnd() {
-
-
- },
checkboxChange(e) {
let items = this.dataList,
values = e.orderNo;
@@ -122,6 +161,22 @@
this.$set(e,'checked',false)
} else {
this.$set(e,'checked',true)
+ }
+ },
+ allChecked() {
+ if (this.allCheck) {
+ this.allCheck = false
+ this.allCheckBtnTitle = '鍏ㄩ��'
+ } else {
+ this.allCheck = true
+ this.allCheckBtnTitle = '鍙栨秷'
+ }
+ for (let item of this.dataList) {
+ if (this.allCheck) {
+ this.$set(item,'checked',true)
+ } else {
+ this.$set(item,'checked',false)
+ }
}
},
clear() {
@@ -135,6 +190,15 @@
<style>
.code {
background-color: #d9d9d9;
+ z-index: 99;
+ position: sticky;
+ top: 80rpx;
+ left: 0;
+ }
+ .code-title {
+ display: flex;
+ justify-content: space-around;
+ height: 50rpx;
}
.list {
margin: 20rpx;
diff --git a/pages/tzsk/work/wrkMast.vue b/pages/tzsk/work/wrkMast.vue
new file mode 100644
index 0000000..c83a938
--- /dev/null
+++ b/pages/tzsk/work/wrkMast.vue
@@ -0,0 +1,117 @@
+<template>
+ <view>
+ <view class="code">
+ <uni-search-bar :focus="searchFocus" v-model="searchValue" @input="searchInput()" ma
+ maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿鍟嗗搧">
+ </uni-search-bar>
+ </view>
+ <view class="list" v-for="(item,i) in dataList">
+ <!-- 宸︿晶 -->
+ <view class="list-left">
+ <!-- 宸︿笂 -->
+ <view class="list-left-top">
+ <view>宸ヤ綔鍙�4099</view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">宸ヤ綔鐘舵��</text>
+ <text>201.鐢熸垚鍏ュ簱浠诲姟ID</text>
+ </view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">鍏ュ嚭搴撶被鍨�</text>
+ <text>1.鍏ュ簱</text>
+ </view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">浼樺厛绾�</text>
+ <text>300</text>
+ </view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">婧愬簱浣�</text>
+ <text>CS-101-001-01@1</text>
+ </view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">鐩爣搴撲綅</text>
+ <text>YZ-015-001-01@1</text>
+ </view>
+ <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
+ <text style="flex: 1;">鏂欑鐮�</text>
+ <text>1112223335</text>
+ </view>
+ </view>
+ <!-- 宸︿笅 -->
+ <view class="list-left-bottom">
+ <button size="mini">鏄庣粏</button>
+ <button size="mini">瀹屾垚</button>
+ <button size="mini">鍙栨秷</button>
+ </view>
+ </view>
+ <!-- 鍙充晶 -->
+ <!-- <view class="list-right"></view> -->
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ searchValue: '',
+ searchFocus: true,
+ dataList: [
+ {},
+ {},
+ {}
+ ]
+ }
+ },
+ methods: {
+ // 鎼滅储妗嗚緭鍏�
+ searchInput() {
+
+ },
+ // 閲嶇疆鎼滅储妗�
+ clear() {
+
+ }
+ }
+ }
+</script>
+
+<style>
+ .code {
+ background-color: #d9d9d9;
+ z-index: 99;
+ position: sticky;
+ top: 80rpx;
+ left: 0;
+ }
+ .list {
+ margin: 20rpx;
+ background-color: #fff;
+ background-color: #157ec1;
+ color: #FFF;
+ border-radius: 20rpx;
+ border: 1px solid #eeeeee;
+ display: flex;
+ position: relative;
+ }
+ .list-left {
+ flex: 1;
+ position: relative;
+ }
+ .list-left-top {
+ /* border-bottom: 1px solid #eeeeee; */
+ padding: 20rpx;
+ }
+ .list-left-bottom {
+ border-bottom: 1px solid #eeeeee;
+ padding: 10rpx;
+ display: flex;
+ justify-content: space-around;
+ }
+ .list-right {
+ width: 100rpx;
+ border-left: 1px solid #eeeeee;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+</style>
--
Gitblit v1.9.1