From aca46a03226d908a96b074010633e15ce4df1a4d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 16:55:52 +0800
Subject: [PATCH] #
---
pages/phyz/order/purchaseOrder.vue | 55 -------------
pages/phyz/wrkMast/waitPakin.vue | 133 +++++++++++++++++++++++++++++++++
pages.json | 8 ++
static/css/common/order.css | 36 +++++++++
4 files changed, 179 insertions(+), 53 deletions(-)
diff --git a/pages.json b/pages.json
index aa1f6d0..7681b95 100644
--- a/pages.json
+++ b/pages.json
@@ -466,6 +466,14 @@
"navigationBarTitleText" : "宸ヤ綔妗�",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/phyz/wrkMast/waitPakin",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏ュ簱閫氱煡妗�",
+ "enablePullDownRefresh" : false
+ }
}
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
index 5daa42a..2aed4e8 100644
--- a/pages/phyz/order/purchaseOrder.vue
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -53,7 +53,6 @@
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.oldDataList = [...this.dataList]
this.getOrderList()
},
@@ -64,25 +63,10 @@
this.dataList = [...this.oldDataList]
this.newDataList = []
for (let k in this.dataList) {
- if (!this.dataList[k].matnr.includes(this.matnr)) {
+ if (!this.dataList[k].orderNo.includes(this.searchValue)) {
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
@@ -131,6 +115,7 @@
res = res.data
if (res.code === 200) {
_this.dataList = res.data.records
+ _this.oldDataList = [..._this.dataList]
}
}
})
@@ -164,40 +149,4 @@
<style>
@import url('../../../static/css/common/order.css');
- .card-status-1 {
- position: absolute;
- right: 20rpx;
- top: 30rpx;
- padding: 4rpx 20rpx;
- text-align: center;
- font-size: 10px;
- color: #f5222d;
- background-color: #fff1f0;
- border: 1px solid #ffa39e;
- border-radius: 6rpx;
- }
- .card-status-2 {
- position: absolute;
- right: 20rpx;
- top: 30rpx;
- padding: 4rpx 20rpx;
- text-align: center;
- font-size: 10px;
- color: #52c41a;
- background-color: #f6ffed;
- border: 1px solid #b7eb8f;
- border-radius: 6rpx;
- }
- .card-status-4 {
- position: absolute;
- right: 20rpx;
- top: 30rpx;
- padding: 4rpx 20rpx;
- text-align: center;
- font-size: 10px;
- color: #1890ff;
- background-color: #e6f7ff;
- border: 1px solid #91d5ff;
- border-radius: 6rpx;
- }
</style>
\ No newline at end of file
diff --git a/pages/phyz/wrkMast/waitPakin.vue b/pages/phyz/wrkMast/waitPakin.vue
new file mode 100644
index 0000000..d12aad3
--- /dev/null
+++ b/pages/phyz/wrkMast/waitPakin.vue
@@ -0,0 +1,133 @@
+<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.suppCode}}</view>
+ <view>鍟嗗搧缂栫爜锛歿{item.matnr}}</view>
+ <view>鍟嗗搧鍚嶇О锛歿{item.maktx}}</view>
+ <view>鍗曟嵁缂栧彿锛歿{item.orderNo}}</view>
+ <view>鏁伴噺锛歿{item.anfme}}</view>
+ <!-- <view class="card-id">{{i + 1}}</view> -->
+ <view class="card-status-1" v-if="item.ioStatus == 'N'">寰呭叆搴�</view>
+ <view class="card-status-2" v-if="item.ioStatus == 'Y'">鍏ュ簱涓�</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" @click="deleteItem(item)">
+ <uni-icons type="trash" color="#c1c1c1"></uni-icons>
+ </view>
+ </view>
+ <view style="height: 50rpx;"></view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ searchValueFocus: true,
+ searchValue: '',
+ checck: true,
+ dataList: [],
+ }
+ },
+ onShow() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.oldDataList = [...this.dataList]
+ this.getWaitPakinList()
+ },
+ 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
+ },
+ // 鑾峰彇璁㈠崟鍒楄〃
+ getWaitPakinList() {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/agv/waitPakin/list/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: {
+ curr: 1,
+ limit: 1000,
+ },
+ method: 'GET',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.dataList = res.data.records
+ }
+ }
+ })
+ },
+ deleteItem(item) {
+ let _this = this
+ let param = []
+ param.push(item)
+ uni.request({
+ url: `${_this.baseUrl}/agv/waitPakin/delete/auth`,
+ header: {
+ 'token': uni.getStorageSync('token'),
+ 'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
+ },
+ data: {param: JSON.stringify(param)},
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.getWaitPakinList()
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ }
+ }
+ })
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('../../../static/css/common/order.css');
+</style>
diff --git a/static/css/common/order.css b/static/css/common/order.css
index a20807a..4665071 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -57,4 +57,40 @@
height: 100rpx;
background-color: #FFF;
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
+ }
+ .card-status-1 {
+ position: absolute;
+ right: 20rpx;
+ top: 30rpx;
+ padding: 4rpx 20rpx;
+ text-align: center;
+ font-size: 10px;
+ color: #f5222d;
+ background-color: #fff1f0;
+ border: 1px solid #ffa39e;
+ border-radius: 6rpx;
+ }
+ .card-status-2 {
+ position: absolute;
+ right: 20rpx;
+ top: 30rpx;
+ padding: 4rpx 20rpx;
+ text-align: center;
+ font-size: 10px;
+ color: #52c41a;
+ background-color: #f6ffed;
+ border: 1px solid #b7eb8f;
+ border-radius: 6rpx;
+ }
+ .card-status-4 {
+ position: absolute;
+ right: 20rpx;
+ top: 30rpx;
+ padding: 4rpx 20rpx;
+ text-align: center;
+ font-size: 10px;
+ color: #1890ff;
+ background-color: #e6f7ff;
+ border: 1px solid #91d5ff;
+ border-radius: 6rpx;
}
\ No newline at end of file
--
Gitblit v1.9.1