From 2b2427b75bb331c9f513f60bec686733967f3f67 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 12 六月 2024 09:53:23 +0800
Subject: [PATCH] #
---
pages/phyz/processOrder/processList.vue | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/home/orderManage.vue | 2
pages/phyz/processOrder/processOrder.vue | 2
pages.json | 7 +
pages/phyz/order/orderCar.vue | 2
5 files changed, 292 insertions(+), 3 deletions(-)
diff --git a/pages.json b/pages.json
index ee6a82b..ac832e5 100644
--- a/pages.json
+++ b/pages.json
@@ -743,6 +743,13 @@
{
"navigationBarTitleText" : "鍗婃垚鍝佸姞宸ュ崟"
}
+ },
+ {
+ "path" : "pages/phyz/processOrder/processList",
+ "style" :
+ {
+ "navigationBarTitleText" : "寰呭姞宸ュ垪琛�"
+ }
}
],
"globalStyle": {
diff --git a/pages/home/orderManage.vue b/pages/home/orderManage.vue
index faf4c17..d3063f8 100644
--- a/pages/home/orderManage.vue
+++ b/pages/home/orderManage.vue
@@ -79,7 +79,7 @@
name: 'processOrder',
color: 'blue',
// cuIcon: 'pullup',
- url: `/phyz/orderOut/bcpOrderOutSelect`
+ url: `/phyz/processOrder/processOrder`
},
],
diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
index eacc317..459272e 100644
--- a/pages/phyz/order/orderCar.vue
+++ b/pages/phyz/order/orderCar.vue
@@ -143,7 +143,7 @@
combMat.barcode = _this.barcode
combMat.locNo = _this.agvDevp
combMat.combMats = []
- let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs}
+ let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs,processSts: item.processSts}
combMat.combMats.push(combM)
combMats.push({...combMat})
}
diff --git a/pages/phyz/processOrder/processList.vue b/pages/phyz/processOrder/processList.vue
new file mode 100644
index 0000000..4ccecd6
--- /dev/null
+++ b/pages/phyz/processOrder/processList.vue
@@ -0,0 +1,282 @@
+<template>
+ <view>
+ <view class="list list-font-color" :class="orderDetl.color" v-for="(orderDetl,index) in dataList" :key="index">
+ <view class="list-left" style="display: flex;flex-direction: column;">
+ <!-- 涓� -->
+ <view>
+ <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
+ <view class="detl-locNo">{{orderDetl.locNo}}</view>
+ <view class="detl-locNo">璐ф灦鐮侊細{{orderDetl.suppCode}}</view>
+ </view>
+ <!-- 涓� -->
+ <view style="display: flex;">
+ <view style="flex: 1;">
+ <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
+ <view>缂栧彿锛歿{orderDetl.matnr}}</view>
+ <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
+ <view>搴撲綅鐘舵�侊細{{orderDetl.locSts$}}</view>
+ <view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
+ </view>
+ <view class="out-btn" @click="pakoutPrive(orderDetl)">
+ <view>鍑哄簱</view>
+ </view>
+ </view>
+ <!-- 涓� -->
+ </view>
+ <!-- <view class="list-right" @click="goToLocDetl(orderDetl)">
+ <uni-icons type="right" size="25" color="#fff"></uni-icons>
+ </view> -->
+ </view>
+
+ <!-- 鍨珮 -->
+ <view style="height: 340rpx;text-align: center;color: #b9b9b9;">
+ - 宸茬粡鍒板簳浜� -
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ baseUrl: '',
+ token: '',
+ dataList: [],
+ count: 0,
+ containerType: '',
+ isOpen: true,
+ option: '',
+ selects: [],
+ orderId: ''
+ }
+ },
+ onShow() {
+ let _this = this
+ this.baseUrl = uni.getStorageSync('baseUrl');
+ this.token = uni.getStorageSync('token');
+ // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+ const eventChannel = this.getOpenerEventChannel();
+ // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+ eventChannel.on('item', function(data) {
+ console.log(data.item);
+ _this.orderId = data.item.id
+ _this.getLocDetl(data.item.orderNo,data.item.threeCode,data.item.matnr,data.item.id)
+ })
+ },
+ methods: {
+ getLocDetl(orderNo,threeCode,matnr,id) {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/agvMobile/query/locDetl/v1`,
+ header: { 'token': uni.getStorageSync('token') },
+ data: {
+ orderNo: orderNo,
+ threeCode: threeCode ,
+ matnr: matnr
+ },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res);
+ if (res.code === 200) {
+ for (let k of res.data) {
+ if (k.locSts == "F") {
+ k['color'] = 'order-sts-start'
+ } else if (k.locSts != "F") {
+ k['color'] = 'order-sts-working'
+ } else {
+ k['color'] = 'order-sts-end'
+ }
+ k['id'] = id
+ }
+ _this.dataList = res.data
+ } 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' })
+ }
+ }
+ })
+ },
+ pakoutPrive(item) {
+ let _this = this
+ console.log(item);
+ if (item.locSts != 'F') {
+ uni.showToast({ title: '褰撳墠搴撲綅涓嶆槸鍦ㄥ簱鐘舵�侊紒', icon: "error", position: 'top' })
+ return
+ }
+ uni.navigateTo({
+ url: "./orderCheck",
+ success: function(res) {
+ // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+ res.eventChannel.emit('mat', {
+ mat: item,
+ })
+ },
+ events: {
+ // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
+ acceptDataFromOpenedPage: function(data) {
+ // _this.matnr = data.data
+ },
+ },
+ });
+ },
+ pakout(item) {
+ let _this = this
+ let items = [item]
+ uni.request({
+ url: `${_this.baseUrl}/out/pakout/auth`,
+ header: { 'token': uni.getStorageSync('token') },
+ data: items,
+ method: 'POST',
+ success(res) {
+ res = res.data
+ console.log(res);
+ if (res.code === 200) {
+
+ } 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' })
+ }
+ }
+ })
+ },
+ // 寮�鍚� / 鍏抽棴涓嬫媺妗�
+ toggleDropdown() {
+ this.isOpen = !this.isOpen
+ },
+ // 閫夋嫨璐ф灦绫诲瀷
+ selected(option) {
+ this.containerType = option
+ },
+ }
+ }
+</script>
+
+<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;
+ }
+ .detl-locNo {
+ font-size: 20px;
+ font-weight: bold;
+ }
+ .out-btn {
+ background-color: #3e82ff;
+ height: 120rpx;
+ width: 120rpx;
+ line-height: 120rpx;
+ text-align: center;
+ border-radius: 50%;
+ margin-left: 20rpx;
+ margin-right: 20rpx;
+ }
+ .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 {
+ position: relative;
+ height: 80rpx;
+ line-height: 80rpx;
+ display: flex;
+ align-items: center;
+ font-size: 14px;
+ }
+ .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;
+ }
+
+ .dropdown {
+ position: relative;
+ display: flex;
+ width: 93%;
+ align-items: center;
+ padding: 0rpx 20rpx;
+ }
+ .dropdown-content {
+ position: absolute;
+ top: calc(100% + 15rpx);
+ left: 0;
+ width: calc(100% - 20rpx);
+ max-height: 300rpx;
+ background-color: #fff;
+ box-shadow: 0 0px 6px rgba(0, 0, 0, 0.3);
+ border-radius: 8rpx;
+ z-index: 10;
+ }
+ .dropdown-item {
+ padding: 12rpx;
+ line-height: 1.2;
+ font-size: 22px;
+ color: #3a3a3a;
+ }
+</style>
diff --git a/pages/phyz/processOrder/processOrder.vue b/pages/phyz/processOrder/processOrder.vue
index 202a013..524cb53 100644
--- a/pages/phyz/processOrder/processOrder.vue
+++ b/pages/phyz/processOrder/processOrder.vue
@@ -203,7 +203,7 @@
}
let _this = this
uni.navigateTo({
- url: './orderList',
+ url: './processList',
success(res) {
res.eventChannel.emit('item', {
item: item
--
Gitblit v1.9.1