From 8a99f9a7909ffa6711f2926c1997982392c05b55 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 16:05:13 +0800
Subject: [PATCH] #
---
pages/phyz/order/purchaseOrder.vue | 197 ++++++++++++++++++++++++++++
pages/tzsk/AGV/AGVPakin.vue | 3
pages/tzsk/AGV/orderList.vue | 48 ------
pages/phyz/AGV/AGVPakin.vue | 21 +--
static/img/newLogo.png | 0
pages/login/login.vue | 2
pages/home/orderManage.vue | 22 +++
pages.json | 16 ++
pages/home/menuHome.vue | 7 +
static/css/common/order.css | 46 ++++++
pages/home/other.vue | 38 ----
11 files changed, 304 insertions(+), 96 deletions(-)
diff --git a/pages.json b/pages.json
index af7cffd..6e7bce2 100644
--- a/pages.json
+++ b/pages.json
@@ -434,6 +434,22 @@
"navigationBarTitleText" : "AGV缁勬墭",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/home/orderManage",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍗曟嵁绠＄悊",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/phyz/order/purchaseOrder",
+ "style" :
+ {
+ "navigationBarTitleText" : "閲囪喘鍏ュ簱鍗�",
+ "enablePullDownRefresh" : false
+ }
}
diff --git a/pages/home/menuHome.vue b/pages/home/menuHome.vue
index de7e801..4a9067f 100644
--- a/pages/home/menuHome.vue
+++ b/pages/home/menuHome.vue
@@ -32,6 +32,13 @@
// cuIcon: 'pullup',
url: `/home/inOutManage`
},
+ {
+ title: '鍗曟嵁绠＄悊',
+ name: 'ordeManage',
+ color: 'mauve',
+ // cuIcon: 'pullup',
+ url: `/home/orderManage`
+ },
// {
// title: '娴嬭瘯',
// name: 'testView',
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/home/orderManage.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/home/other.vue b/pages/home/other.vue
index 20810c0..385df96 100644
--- a/pages/home/other.vue
+++ b/pages/home/other.vue
@@ -26,39 +26,11 @@
project: 'tzsk',
elements2: [
{
- title: '鍑哄簱鎷ｉ��',
- name: 'checkOut',
- color: 'cyan',
+ title: '閲囪喘鍏ュ簱鍗�',
+ name: 'purchaseOrder',
+ color: 'blue',
// cuIcon: 'pullup',
- url: '/tzsk/pakin/checkOut'
- },
- {
- title: '鎵樼洏瑙ｇ粦',
- name: 'untie',
- color: 'cyan',
- // cuIcon: 'pullup',
- url: '/tzsk/pakin/untie'
- },
- {
- title: '涓存椂鍏ュ簱',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/pakin/pakin2'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
- },
- {
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
+ url: `/phyz/AGV/purchaseOrder`
},
],
colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
@@ -243,4 +215,4 @@
background-color: #ffffff;
color: #666666;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ba5bd5c..588654c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
<!-- logo -->
<view class="logo">
<view class="logo-box">
- <image src="../../static/img/logo.png" mode="aspectFit"></image>
+ <image src="../../static/img/newLogo.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
index 554101d..bb5f8b1 100644
--- a/pages/phyz/AGV/AGVPakin.vue
+++ b/pages/phyz/AGV/AGVPakin.vue
@@ -2,18 +2,15 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
@input="findOrder()">
</view>
<view class="item">
- <view class="code-decs">鏂欑鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
<view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 鐗╂枡鐮�" v-model="matnr" :focus="matFocus" @input="findMat()">
<view class="item-right">
<button></button>
<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
@@ -87,6 +84,9 @@
</view>
</view>
</scroll-view>
+ <view>
+
+ </view>
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" @click="reset('warn')">閲嶇疆</button>
@@ -617,15 +617,8 @@
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
-
.item input {
- height: 50rpx;
- line-height: 50rpx;
- /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
- font-size: 36upx;
- font-family: PingFang SC;
- width: 55vw;
-
+ flex: 1;
}
.code-decs {
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
new file mode 100644
index 0000000..20ced19
--- /dev/null
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -0,0 +1,197 @@
+<template>
+ <view>
+ <view class="code">
+ <uni-search-bar :focus="searchValueFocus" v-model="searchValue" @input="searchValueInput()"
+ maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+ </uni-search-bar>
+ <view class="code-title">
+ <view></view>
+ <view>鍗曟嵁鍒楄〃</view>
+ <view></view>
+ <!-- <view @click="allChecked">{{allCheckBtnTitle}}</view> -->
+ </view>
+ </view>
+ <view class="list" v-for="(item,i) in dataList">
+ <view class="list-left">
+ <view>缂栧彿锛歿{item.matnr}}</view>
+ <view>鍚嶇О锛歿{item.maktx}}</view>
+ <view>瑙勬牸锛歿{item.specs}}</view>
+ <view>鏁伴噺锛歿{item.anfme}}</view>
+ <view class="card-id">{{i + 1}}</view>
+ </view>
+ <!-- <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 class="list-right">
+
+ </view>
+ </view>
+ <view style="height: 100rpx;"></view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ searchValueFocus: true,
+ searchValue: '',
+ checck: true,
+ dataList: [
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931255',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z',
+ checked: true
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931241',
+ maktx: '浣犲ソ',
+ anfme: 10,
+ specs: '10-z'
+ },
+ {
+ orderNo: 'cg0931241',
+ matnr: 'cg0931225',
+ 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'
+ },
+ {
+ 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: [],
+ allCheck: false,
+ allCheckBtnTitle: '鍏ㄩ��'
+ }
+ },
+ onShow() {
+ this.oldDataList = [...this.dataList]
+ },
+ methods: {
+ searchValueInput() {
+ let count = 0
+ let sign = 0
+ this.dataList = [...this.oldDataList]
+ this.newDataList = []
+ for (let k in this.dataList) {
+ if (!this.dataList[k].matnr.includes(this.matnr)) {
+ count++;
+ } else {
+ this.newDataList.push(this.dataList[k])
+ }
+ }
+ if (this.matnr != '') {
+ for (let j in this.dataList) {
+ if (!this.dataList[j].maktx.includes(this.matnr)) {
+ } else {
+ for (let i in this.newDataList) {
+ if (this.newDataList[i].matnr == this.dataList[j].matnr) {
+ sign++
+ }
+ }
+ if (sign == 0) {
+ this.newDataList.push(this.dataList[j])
+ }
+ }
+ }
+ }
+ this.dataList = this.newDataList
+ },
+ checkboxChange(e) {
+ let items = this.dataList,
+ values = e.orderNo;
+ if (e.checked) {
+ 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() {
+ this.matnr = ''
+ this.dataList = [...this.oldDataList]
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/common/order.css');
+
+</style>
\ No newline at end of file
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 00b6672..b6b4789 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -2,8 +2,7 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">绔欑偣鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 绔欑偣鐮�" v-model="orderNo" :focus="orderNoFocus"
@input="findOrder()">
</view>
</view>
diff --git a/pages/tzsk/AGV/orderList.vue b/pages/tzsk/AGV/orderList.vue
index 61fef18..a6012ee 100644
--- a/pages/tzsk/AGV/orderList.vue
+++ b/pages/tzsk/AGV/orderList.vue
@@ -188,50 +188,6 @@
</script>
<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;
-
- background-color: #fff;
- border-radius: 20rpx;
- border: 1px solid #eeeeee;
- display: flex;
- position: relative;
- }
- .card-id {
- position: absolute;
- right: 10rpx;
- top: 5rpx;
- height: 30rpx;
- line-height: 30rpx;
- width: 30rpx;
- text-align: center;
- color: #eeeeee;
- background-color: #ddd844;
- border-radius: 50%;
- font-size: 10px;
- }
- .list-left {
- flex: 1;
- padding: 20rpx;
- position: relative;
- }
- .list-right {
- width: 100rpx;
- border-left: 1px solid #eeeeee;
- display: flex;
- align-items: center;
- justify-content: center;
- }
+ @import url('../../../static/css/common/order.css');
+
</style>
\ No newline at end of file
diff --git a/static/css/common/order.css b/static/css/common/order.css
new file mode 100644
index 0000000..3ea9df4
--- /dev/null
+++ b/static/css/common/order.css
@@ -0,0 +1,46 @@
+.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;
+
+ background-color: #fff;
+ border-radius: 20rpx;
+ border: 1px solid #eeeeee;
+ display: flex;
+ position: relative;
+ }
+ .card-id {
+ position: absolute;
+ right: 10rpx;
+ top: 5rpx;
+ height: 30rpx;
+ line-height: 30rpx;
+ width: 30rpx;
+ text-align: center;
+ color: #eeeeee;
+ background-color: #ddd844;
+ border-radius: 50%;
+ font-size: 10px;
+ }
+ .list-left {
+ flex: 1;
+ padding: 20rpx;
+ position: relative;
+ }
+ .list-right {
+ width: 100rpx;
+ border-left: 1px solid #eeeeee;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
\ No newline at end of file
diff --git a/static/img/newLogo.png b/static/img/newLogo.png
index 71dd632..ddec72c 100644
--- a/static/img/newLogo.png
+++ b/static/img/newLogo.png
Binary files differ
--
Gitblit v1.9.1