From 94c4496ebe697ed0fa560e7620f5146ef4cc62e6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 18 五月 2024 16:39:28 +0800
Subject: [PATCH] #
---
pages/phyz/wrkMast/DBList.vue | 438 +++++++++++++++++++++++++
pages/phyz/wrkMast/wrkMast.vue | 552 ++++++++++++++++++++++++-------
2 files changed, 858 insertions(+), 132 deletions(-)
diff --git a/pages/phyz/wrkMast/DBList.vue b/pages/phyz/wrkMast/DBList.vue
index 8183fd0..4deb92e 100644
--- a/pages/phyz/wrkMast/DBList.vue
+++ b/pages/phyz/wrkMast/DBList.vue
@@ -1,22 +1,452 @@
<template>
- <view>
+ <view class="container">
+ <view class="code">
+ <uni-search-bar :focus="searchValueFocus" v-model="searchValue"
+ maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+ </uni-search-bar>
+ <view class="code-title">
+ <view></view>
+ <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+ <view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">绛涢��</view>
+ </view>
+ </view>
+ <view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
+ <view class="list-left">
+ <view class="detl-threeCode">{{orderDetl.wrkNo}}</view>
+ <view>宸ヤ綔绫诲瀷锛歿{orderDetl.ioType$}}</view>
+ <view>宸ヤ綔鐘跺喌锛歿{orderDetl.wrkSts$}}</view>
+ <view>婧愬簱浣嶏細{{orderDetl.sourceLocNo}}</view>
+ <view>鐩爣搴撲綅锛歿{orderDetl.locNo}}</view>
+ <view>璐ф灦鐮侊細{{orderDetl.barcode}}</view>
+ </view>
+ <view class="list-right" @click="addItem(index)">
+ <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
+ </view>
+ </view>
+
+
+ <!-- 鍨珮 -->
+ <view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+ - 宸茬粡鍒板簳浜� -
+ </view>
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="addItem" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">鍏ュ簱鏁伴噺</view>
+ <view class="popup-item">
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="addClose">鍙栨秷</view>
+ <view class="btn-right" @click="addConfirm()">娣诲姞</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 绛涢�夊脊绐� -->
+ <view>
+ <uni-popup ref="filter" type="dialog">
+ <view class="filter-popup">
+ <!-- 鏍囬 -->
+ <view class="title">绛涢��</view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>閿�鍞鍗曪細</view>
+ <input type="text" v-model="searchValue">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>涓昏鍗曞彿锛�</view>
+ <input type="text" v-model="orderNo">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧缂栧彿锛�</view>
+ <input type="text" v-model="matnr">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧鍚嶇О锛�</view>
+ <input type="text" v-model="maktx">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鍟嗗搧绉嶇被锛�</view>
+ <input type="text" v-model="brand">
+ </view>
+ </view>
+ <view class="btn filter-btn">
+ <view class="btn-left" @click="filterClose">閲嶇疆</view>
+ <view class="btn-right" @click="filterConfirm()">纭</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
<script>
export default {
- data() {
+ data(){
return {
+ baseUrl: '',
+ token: '',
+ searchValueFocus: true,
+ searchValue: '',
+ orderNo: '',
+ matnr: '',
+ maktx: '',
+ brand: '',
+ total: '',
+ dataList: [],
+ orderCarList: [],
+ data: {
+ curr: 1,
+ limit: 100,
+ three_code: '',
+ matnr: '',
+ maktx: '',
+ order_no: '',
+ brand: ''
+ },
+ index: 0,
+ count: 0,
+ mask: false
}
},
+ // 涓嬫媺鍒锋柊
+ onReachBottom() {
+ this.status = 'more';
+ this.getOrderDetlList(this.searchValue,10);
+ },
+ onLoad() {
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ this.searchValue = uni.getStorageSync('bcpThreeCode');
+ this.getOrderDetlList(this.searchValue,10)
+ console.log("onLoad");
+ },
+ onShow() {
+ console.log(uni.getStorageSync('pakinOrderCar'));
+ },
+ onHide() {
+ uni.setStorageSync('pakinOrderCar', this.orderCarList);
+ },
methods: {
+ getOrderDetlList(threeCode,limit) {
+ uni.showLoading({})
+ let _this = this
+ _this.mask = true
+ _this.data.three_code = threeCode
+ _this.data.limit = limit
+ uni.request({
+ url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
+ header: {'token': uni.getStorageSync('token')},
+ data: _this.data,
+ method: 'GET',
+ success(res) {
+ uni.hideLoading()
+ res = res.data
+ if (res.code === 200) {
+ for (let k of res.data.records) {
+ if (k.anfme > k.qty && k.qty == 0) {
+ k['color'] = 'order-sts-start'
+ } else if (k.anfme > k.qty && k.qty != 0) {
+ k['color'] = 'order-sts-working'
+ } else {
+ k['color'] = 'order-sts-end'
+ }
+ }
+ let list = res.data.records
+ _this.dataList = _this.dataList.concat(list);
+ _this.data.curr = _this.data.curr + 1
+ // _this.dataList = res.data.records
+ _this.total = res.data.total
+ _this.mask = false
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
+ },
+ searchValueInput2() {
+ this.dataList = []
+ this.data.curr = 1
+ uni.setStorageSync('bcpThreeCode', this.searchValue);
+ if (this.searchValue.length == 0) {
+ this.getOrderDetlList(this.searchValue,10)
+ } else {
+ this.getOrderDetlList(this.searchValue,10)
+ }
+
+ },
+ clear() {
+ this.dataList = []
+ this.data.curr = 1
+ setTimeout(()=> {
+ this.getOrderDetlList(this.searchValue,10)
+ },300)
+ },
+ // 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
+ addItem(index) {
+ // 鍒ゆ柇娣诲姞鐨勫晢鍝佹槸鍚﹀拰宸茬粡娣诲姞鐨勯噸澶�
+ let dataList = this.dataList
+ for (let k of this.orderCarList) {
+ if (k.orderNo == dataList[index].orderNo
+ && k.threeCode == dataList[index].threeCode
+ && k.matnr == dataList[index].matnr) {
+ uni.showToast({ title: '璇峰嬁閲嶅娣诲姞鍟嗗搧锛�', icon: "none", position: 'top' })
+ return
+ }
+ }
+ this.index = index
+ this.$refs.addItem.open()
+ },
+ addClose() {
+ this.$refs.addItem.close()
+ this.count = 0
+ },
+ addConfirm() {
+ // if (this.count == 0) {
+ // uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
+ // return
+ // }
+ this.dataList[this.index]['used'] = true
+ this.dataList[this.index]['pakinQty'] = this.count
+ this.orderCarList.push(this.dataList[this.index])
+ this.index = 0
+ this.count = 0
+ this.$refs.addItem.close()
+ },
+ // 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
+ orderCar() {
+ let _this = this
+ if (_this.orderCarList.length === 0) {
+ uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
+ return
+ }
+ uni.navigateTo({
+ url: '../order/orderCar',
+ success(res) {
+ res.eventChannel.emit('item', {
+ item: _this.orderCarList
+ })
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ console.log(data);
+ if (data.data == 1) {
+ _this.orderCarList = []
+ _this.getOrderDetlList(uni.getStorageSync('bcpThreeCode'),10)
+ }
+ }
+ }
+ })
+ },
+ changeValue(value) {
+ this.count = value
+ },
+ // 绛涢��
+ filter() {
+ this.$refs.filter.open('bottom')
+ },
+ filterConfirm() {
+ this.dataList = []
+ this.data.curr = 1
+ this.data.maktx = this.maktx
+ this.data.matnr = this.matnr
+ this.data.order_no = this.order_no
+ this.data.brand = this.brand
+ this.getOrderDetlList(this.searchValue,10)
+ this.$refs.filter.close()
+ },
+ filterClose() {
+ this.dataList = []
+ this.data.curr = 1
+ this.data.maktx = ''
+ this.data.matnr = ''
+ this.data.order_no = ''
+ this.data.brand = ''
+ this.getOrderDetlList(this.searchValue,10)
+ this.$refs.filter.close()
+ }
}
}
+
</script>
<style>
-
-</style>
+ @import url('../../../static/css/common/order.css');
+ .list-font-color {
+ color: #fff;
+ /* background-color: #33bb44; */
+ }
+ .order-sts-start {
+ background-color: #3eb689;
+ }
+ .order-sts-working {
+ background-color: #ff9d46;
+ }
+ .order-sts-end {
+ background-color: #ff7356;
+ }
+ .detl-threeCode {
+ font-size: 28px;
+ font-weight: bold;
+ }
+ .shop-car {
+ position: fixed;
+ left: 22rpx;
+ bottom: 150rpx;
+ background-color: #2299ff;
+ width: 260rpx;
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+ box-shadow: 0 0 10px 5px rgba(0, 0, 0, .6);
+ border-radius: 10rpx;
+ color: #fff;
+ font-size: 28px;
+ font-weight: bold;
+ }
+ .car-left {
+ padding: 16rpx;
+ flex: 5;
+ }
+ .car-right {
+ flex: 4;
+ }
+
+ .mask {
+ position: absolute;
+ width: 100%;
+ height: 100vh;
+ z-index: 999;
+ top: 0;
+ left: 0;
+ background-color: rgba(0, 0, 0, .4);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16px;
+ color: #fff;
+ }
+
+ .popup {
+ width: 80vw;
+ min-height: 100rpx;
+ background-color: #FFF;
+ border-radius: 25rpx;
+ position: relative;
+ }
+ .title {
+ height: 100rpx;
+ line-height: 100rpx;
+ width: 100%;
+ color: #606266;
+ text-align: center;
+ font-size: 16px;
+ }
+ .popup-item {
+ height: 80rpx;
+ line-height: 80rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ .popup-item-left {
+ width: 16vw;
+ padding-right: 20rpx;
+ text-align: right;
+ color: #606266;
+ }
+ .popup-item-right {
+ display: flex;
+ align-items: center;
+ width: 50vw;
+ height: 50rpx;
+ padding: 2px 5px;
+ border: 1px solid #E4E7ED;
+ border-radius: 5rpx;
+ }
+ .popup-item-right input{
+ color: #606266;
+ }
+ .btn {
+ display: flex;
+ height: 90rpx;
+ margin-top: 20rpx;
+ border-top: 1px solid #DCDFE6;
+ justify-content: center;
+ align-items: center;
+ }
+ .btn-left {
+ display: flex;
+ flex: 1;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ color: #606266;
+ border-right: 1px solid #DCDFE6;
+ }
+ .btn-right {
+ display: flex;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ color: #409EFF;
+ }
+ .filter-popup {
+ width: 100%;
+ height: 80vh;
+ background-color: #FFF;
+ position: relative;
+ border-radius: 30rpx 30rpx 0rpx 0rpx;
+ }
+ .filter-popup-item {
+ height: 100%;
+ width: 100%;
+ background-color: #c9cdd5;
+ }
+ .filter-popup-item-left {
+ width: 30%;
+ height: 100%;
+ background-color: #DCDFE6;
+
+ }
+ .item-btn {
+ width: 100%;
+ height: 80rpx;
+ line-height: 80rpx;
+ background-color: #c9cdd5;
+ text-align: center;
+ }
+ .item-btn:checked {
+ background-color: #606266;
+ }
+ .filter-btn {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: #FFF;
+ }
+ .item-cl {
+ display: flex;align-items: center;
+ }
+ .item-cl input {
+ border-bottom: 1px solid #b9b9b9;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/phyz/wrkMast/wrkMast.vue b/pages/phyz/wrkMast/wrkMast.vue
index 50cfaa4..8ab1cba 100644
--- a/pages/phyz/wrkMast/wrkMast.vue
+++ b/pages/phyz/wrkMast/wrkMast.vue
@@ -1,184 +1,480 @@
<template>
<view class="container">
<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 style="font-weight: bold;">宸ヤ綔鍙穥{item.wrkNo}}</view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">宸ヤ綔鐘舵��</text>
- <text>{{item.wrkSts$}}</text>
- </view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">鍏ュ嚭搴撶被鍨�</text>
- <text>{{item.ioType$}}</text>
- </view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">浼樺厛绾�</text>
- <text>{{item.ioPri}}</text>
- </view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">婧愬簱浣�</text>
- <text>{{item.sourceLocNo}}</text>
- </view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">鐩爣搴撲綅</text>
- <text>{{item.locNo}}</text>
- </view>
- <view style="display: flex;border-bottom: 1px solid #FFF;margin: 10rpx;">
- <text style="flex: 1;">鏂欑鐮�</text>
- <text>{{item.barcode}}</text>
- </view>
- </view>
- <!-- 宸︿笅 -->
- <view class="list-left-bottom">
- <button size="mini" @click="getWrkDetlList(item.wrkNo)">鏄庣粏</button>
- <button size="mini" @click="handControl(item.wrkNo)">瀹屾垚</button>
- <button size="mini">鍙栨秷</button>
- </view>
+ <!-- <uni-search-bar :focus="searchValueFocus" v-model="searchValue"
+ maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
+ </uni-search-bar> -->
+ <view class="code-title">
+ <view></view>
+ <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue}} 鎬绘暟閲忥細- {{total}} -</view>
+ <view style="width: 100rpx;margin: 16rpx 0;" @click="filter()">绛涢��</view>
</view>
- <!-- 鍙充晶 -->
- <!-- <view class="list-right"></view> -->
</view>
- <view style="height: 200rpx;"></view>
+
+ <view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
+ <view class="list-left">
+ <view class="detl-threeCode">{{orderDetl.wrkNo}}</view>
+ <view>宸ヤ綔鏃堕棿锛歿{orderDetl.ioTime$}}</view>
+ <view>宸ヤ綔绫诲瀷锛歿{orderDetl.ioType$}}</view>
+ <view>宸ヤ綔鐘跺喌锛歿{orderDetl.wrkSts$}}</view>
+ <view>婧愬簱浣嶏細{{orderDetl.sourceLocNo}}</view>
+ <view>鐩爣搴撲綅锛歿{orderDetl.locNo}}</view>
+ <view>璐ф灦鐮侊細{{orderDetl.barcode}}</view>
+ </view>
+ <view class="list-right" @click="opt(index)">
+ <uni-icons type="bars" size="25" color="#fff"></uni-icons>
+ </view>
+ </view>
+
+
+ <!-- 鍨珮 -->
+ <view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+ - 宸茬粡鍒板簳浜� -
+ </view>
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="addItem" type="dialog">
+ <view class="popup">
+ <!-- 鏍囬 -->
+ <view class="title">鍏ュ簱鏁伴噺</view>
+ <view class="popup-item">
+ <uni-number-box :value="count" :step='1' :max="9999999" color="#747474" @change="changeValue" />
+ </view>
+ <view class="btn">
+ <view class="btn-left" @click="addClose">鍙栨秷</view>
+ <view class="btn-right" @click="addConfirm()">娣诲姞</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 绛涢�夊脊绐� -->
+ <view>
+ <uni-popup ref="filter" type="dialog">
+ <view class="filter-popup">
+ <!-- 鏍囬 -->
+ <view class="title">绛涢��</view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>宸ヤ綔鍙凤細</view>
+ <input type="text" v-model="wrk_no">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>宸ヤ綔绫诲瀷锛�</view>
+ <input type="text" v-model="io_type">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>宸ヤ綔鐘舵�侊細</view>
+ <input type="text" v-model="wrk_sts">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>婧愬簱浣嶏細</view>
+ <input type="text" v-model="source_loc_no">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鐩爣搴撲綅锛�</view>
+ <input type="text" v-model="loc_no">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>璐ф灦鐮侊細</view>
+ <input type="text" v-model="barcode">
+ </view>
+ </view>
+ <view class="popup-item" style="background-color: #dfdfdf;">
+ <view class="item-cl">
+ <view>鐩爣妤煎眰锛�</view>
+ <input type="text" v-model="crn_no">
+ </view>
+ </view>
+ <view class="btn filter-btn">
+ <view class="btn-left" @click="filterClose">閲嶇疆</view>
+ <view class="btn-right" @click="filterConfirm()">纭</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+ <!-- 鎿嶄綔寮圭獥 -->
+ <view>
+ <uni-popup ref="option" type="dialog">
+ <view class="filter-popup" style="height: 50vh;">
+ <!-- 鏍囬 -->
+ <view class="title">鎿嶄綔</view>
+ <button size="mini">瀹屾垚</button>
+ <button size="mini">鍙栨秷(AGV)</button>
+ <button size="mini">鍙栨秷</button>
+ <button size="mini">鏇存敼璋冩嫧鏂瑰紡</button>
+ </view>
+ </uni-popup>
+ </view>
</view>
</template>
<script>
export default {
- data() {
+ data(){
return {
baseUrl: '',
token: '',
+ searchValueFocus: true,
searchValue: '',
- searchFocus: true,
- dataList: []
+ wrk_no: '',
+ barcode: '',
+ wrk_sts: '',
+ crn_no: '',
+ source_loc_no: '',
+ loc_no: '',
+ io_type: '',
+ total: '',
+ dataList: [],
+ orderCarList: [],
+ data: {
+ curr: 1,
+ limit: 100,
+ wrk_no: '',
+ barcode: '',
+ wrk_sts: '',
+ crn_no: '',
+ source_loc_no: '',
+ loc_no: '',
+ io_type: ''
+ },
+ index: 0,
+ count: 0,
+ mask: false
+
}
},
- onShow() {
+ // 涓嬫媺鍒锋柊
+ onReachBottom() {
+ this.status = 'more';
+ this.getOrderDetlList(this.searchValue,10);
+ },
+ onLoad() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
- this.oldDataList = [...this.dataList]
- this.getWrkMastList()
+ this.searchValue = uni.getStorageSync('bcpThreeCode');
+ this.getOrderDetlList(this.searchValue,10)
+ console.log("onLoad");
+ },
+ onShow() {
+ console.log(uni.getStorageSync('pakinOrderCar'));
+ },
+ onHide() {
+ uni.setStorageSync('pakinOrderCar', this.orderCarList);
},
methods: {
- // 鎼滅储妗嗚緭鍏�
- searchInput() {
-
- },
- // 閲嶇疆鎼滅储妗�
- clear() {
-
- },
- // 鑾峰彇宸ヤ綔鍒楄〃
- getWrkMastList() {
+ getOrderDetlList(threeCode,limit) {
+ uni.showLoading({})
let _this = this
- _this.dataList = []
+ _this.mask = true
+ _this.data.wrk_no = threeCode
+ _this.data.limit = limit
uni.request({
url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- },
+ data: _this.data,
method: 'GET',
success(res) {
+ uni.hideLoading()
res = res.data
if (res.code === 200) {
- _this.dataList = res.data.records
- }
+ for (let k of res.data.records) {
+ if ([21, 22, 201].includes(k.wrkSts)) {
+ k['color'] = 'order-sts-start'
+ } else if ([205,206].includes(k.wrkSts)) {
+ k['color'] = 'order-sts-end'
+ } else {
+ k['color'] = 'order-sts-working'
+ }
+ }
+ let list = res.data.records
+ _this.dataList = _this.dataList.concat(list);
+ _this.data.curr = _this.data.curr + 1
+ // _this.dataList = res.data.records
+ _this.total = res.data.total
+ _this.mask = false
+ } else if (res.code == 403) {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
}
})
},
- // 鑾峰彇宸ヤ綔鏄庣粏
- getWrkDetlList(e) {
+ searchValueInput2() {
+ this.dataList = []
+ this.data.curr = 1
+ uni.setStorageSync('bcpThreeCode', this.searchValue);
+ if (this.searchValue.length == 0) {
+ this.getOrderDetlList(this.searchValue,10)
+ } else {
+ this.getOrderDetlList(this.searchValue,10)
+ }
+
+ },
+ clear() {
+ this.dataList = []
+ this.data.curr = 1
+ setTimeout(()=> {
+ this.getOrderDetlList(this.searchValue,10)
+ },300)
+ },
+ // 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
+ opt(index) {
+ this.$refs.option.open('bottom')
+ },
+ addClose() {
+ this.$refs.addItem.close()
+ this.count = 0
+ },
+ addConfirm() {
+ // if (this.count == 0) {
+ // uni.showToast({ title: '鍏ュ簱鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
+ // return
+ // }
+ this.dataList[this.index]['used'] = true
+ this.dataList[this.index]['pakinQty'] = this.count
+ this.orderCarList.push(this.dataList[this.index])
+ this.index = 0
+ this.count = 0
+ this.$refs.addItem.close()
+ },
+ // 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
+ orderCar() {
let _this = this
+ if (_this.orderCarList.length === 0) {
+ uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
+ return
+ }
uni.navigateTo({
- url: "./wrkDetl",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ url: '../order/orderCar',
+ success(res) {
res.eventChannel.emit('item', {
- item: e
+ item: _this.orderCarList
})
},
events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- // _this.matnr = data.data
- _this.input(_this.matnr)
- },
- },
- });
- },
- handControl(wrkNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/hand/control/wrkMast`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: {
- workNo: wrkNo,
- type: 1
- },
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.getWrkMastList()
- }
+ console.log(data);
+ if (data.data == 1) {
+ _this.orderCarList = []
+ _this.getOrderDetlList(uni.getStorageSync('bcpThreeCode'),10)
+ }
+ }
}
})
+ },
+ changeValue(value) {
+ this.count = value
+ },
+ // 绛涢��
+ filter() {
+ this.$refs.filter.open('bottom')
+ },
+ filterConfirm() {
+ this.dataList = []
+ this.data.curr = 1
+ this.data.wrk_no = this.wrk_no
+ this.data.barcode = this.barcode
+ this.data.wrk_sts = this.wrk_sts
+ this.data.crn_no = this.crn_no
+ this.data.source_loc_no = this.source_loc_no
+ this.data.loc_no = this.loc_no
+ this.data.io_type = this.io_type
+ this.getOrderDetlList(this.data.wrk_no,10)
+ this.$refs.filter.close()
+ },
+ filterClose() {
+ this.dataList = []
+ this.data.wrk_no = ''
+ this.data.barcode = ''
+ this.data.wrk_sts = ''
+ this.data.crn_no = ''
+ this.data.source_loc_no = ''
+ this.data.loc_no = ''
+ this.data.io_type = ''
+ this.getOrderDetlList(this.searchValue,10)
+ this.$refs.filter.close()
}
+
}
}
+
</script>
<style>
@import url('../../../static/css/common/order.css');
- .code {
- background-color: #d9d9d9;
- z-index: 99;
- position: sticky;
- top: 0rpx;
+ .list-font-color {
+ color: #fff;
+ /* background-color: #33bb44; */
+ }
+ .order-sts-start {
+ background-color: #3eb689;
+ }
+ .order-sts-working {
+ background-color: #ff9d46;
+ }
+ .order-sts-end {
+ background-color: #ff7356;
+ }
+ .detl-threeCode {
+ font-size: 28px;
+ font-weight: bold;
+ }
+ .shop-car {
+ position: fixed;
+ left: 22rpx;
+ bottom: 150rpx;
+ background-color: #2299ff;
+ width: 260rpx;
+ height: 90rpx;
+ display: flex;
+ align-items: center;
+ box-shadow: 0 0 10px 5px rgba(0, 0, 0, .6);
+ border-radius: 10rpx;
+ color: #fff;
+ font-size: 28px;
+ font-weight: bold;
+ }
+ .car-left {
+ padding: 16rpx;
+ flex: 5;
+ }
+ .car-right {
+ flex: 4;
+ }
+
+ .mask {
+ position: absolute;
+ width: 100%;
+ height: 100vh;
+ z-index: 999;
+ top: 0;
left: 0;
- }
- .list {
- margin: 20rpx;
- background-color: #fff;
- background-color: #157ec1;
- color: #FFF;
- border-radius: 20rpx;
- border: 1px solid #eeeeee;
+ background-color: rgba(0, 0, 0, .4);
display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 16px;
+ color: #fff;
+ }
+
+ .popup {
+ width: 80vw;
+ min-height: 100rpx;
+ background-color: #FFF;
+ border-radius: 25rpx;
position: relative;
}
- .list-left {
- flex: 1;
- position: relative;
+ .title {
+ height: 100rpx;
+ line-height: 100rpx;
+ width: 100%;
+ color: #606266;
+ text-align: center;
+ font-size: 16px;
}
- .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;
+ .popup-item {
+ height: 80rpx;
+ line-height: 80rpx;
display: flex;
align-items: center;
justify-content: center;
}
-</style>
+ .popup-item-left {
+ width: 16vw;
+ padding-right: 20rpx;
+ text-align: right;
+ color: #606266;
+ }
+ .popup-item-right {
+ display: flex;
+ align-items: center;
+ width: 50vw;
+ height: 50rpx;
+ padding: 2px 5px;
+ border: 1px solid #E4E7ED;
+ border-radius: 5rpx;
+ }
+ .popup-item-right input{
+ color: #606266;
+ }
+ .btn {
+ display: flex;
+ height: 90rpx;
+ margin-top: 20rpx;
+ border-top: 1px solid #DCDFE6;
+ justify-content: center;
+ align-items: center;
+ }
+ .btn-left {
+ display: flex;
+ flex: 1;
+ height: 100%;
+ justify-content: center;
+ align-items: center;
+ color: #606266;
+ border-right: 1px solid #DCDFE6;
+ }
+ .btn-right {
+ display: flex;
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+ color: #409EFF;
+ }
+ .filter-popup {
+ width: 100%;
+ height: 80vh;
+ background-color: #FFF;
+ position: relative;
+ border-radius: 30rpx 30rpx 0rpx 0rpx;
+ }
+ .filter-popup button {
+ margin: 16rpx;
+ }
+ .filter-popup-item {
+ height: 100%;
+ width: 100%;
+ background-color: #c9cdd5;
+ }
+ .filter-popup-item-left {
+ width: 30%;
+ height: 100%;
+ background-color: #DCDFE6;
+
+ }
+ .item-btn {
+ width: 100%;
+ height: 80rpx;
+ line-height: 80rpx;
+ background-color: #c9cdd5;
+ text-align: center;
+ }
+ .item-btn:checked {
+ background-color: #606266;
+ }
+ .filter-btn {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: #FFF;
+ }
+ .item-cl {
+ display: flex;align-items: center;
+ }
+ .item-cl input {
+ border-bottom: 1px solid #b9b9b9;
+ }
+</style>
\ No newline at end of file
--
Gitblit v1.9.1