From 8d3ebc610d048289f8ca4d8bc86ac11208a60fef Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 29 一月 2026 19:47:27 +0800
Subject: [PATCH] #
---
pages/outbound/orderOutView/orderList.vue | 388 ++++
pages/inspect/check.vue | 466 +++--
locale/zh-Hans.json | 3
pages.json | 1171 ++++---------
components/confirm-modal/confirm-modal.vue | 178 ++
/dev/null | 22
pages/other/transferView/orderList.vue | 388 ++++
pages/login/index.vue | 2
pages/outbound/orderOutView/order_out_type.vue | 250 +++
pages/outbound/orderOut/orderList.vue | 3
pages/outbound/orderOutView/orderDetlList.vue | 367 ++++
pages/inspect/bad.vue | 336 ++-
pages/other/transferView/orderDetlList.vue | 367 ++++
pages/icon.vue | 939 +++++++++++
pages/outbound/orderOut/order_out_type.vue | 2
15 files changed, 3,747 insertions(+), 1,135 deletions(-)
diff --git a/components/confirm-modal/confirm-modal.vue b/components/confirm-modal/confirm-modal.vue
new file mode 100644
index 0000000..d9c5eb4
--- /dev/null
+++ b/components/confirm-modal/confirm-modal.vue
@@ -0,0 +1,178 @@
+<template>
+ <view
+ class="modal-mask"
+ v-if="visible"
+ @click="handleCancel"
+ >
+ <view
+ class="modal-container"
+ @click.stop
+ >
+ <view class="modal-header">
+ <text
+ :class="'cuIcon-' + icon"
+ :style="{ fontSize: '48rpx', color: iconColor }"
+ ></text>
+ <text class="modal-title">{{ title }}</text>
+ </view>
+ <view class="modal-body">
+ <text class="modal-message">
+ {{ message }}
+ </text>
+ </view>
+ <view class="modal-footer">
+ <button
+ class="modal-btn modal-btn-cancel"
+ @click="handleCancel"
+ >
+ {{ cancelText }}
+ </button>
+ <button
+ class="modal-btn modal-btn-confirm"
+ @click="handleConfirm"
+ :disabled="isconfirm"
+ :loading="isconfirm"
+ >
+ {{ confirmText }}
+ </button>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+export default {
+ name: 'ConfirmModal',
+ props: {
+ visible: {
+ type: Boolean,
+ default: false
+ },
+ title: {
+ type: String,
+ default: '鎻愮ず'
+ },
+ message: {
+ type: String,
+ default: ''
+ },
+ icon: {
+ type: String,
+ default: 'deliver'
+ },
+ iconColor: {
+ type: String,
+ default: '#0081ff'
+ },
+ cancelText: {
+ type: String,
+ default: '鍙栨秷'
+ },
+ confirmText: {
+ type: String,
+ default: '纭畾'
+ },
+ isconfirm: {
+ type: Boolean,
+ default: false
+ }
+ },
+ methods: {
+ handleCancel() {
+ this.$emit('update:visible', false)
+ this.$emit('cancel')
+ },
+ handleConfirm() {
+ this.$emit('confirm')
+ }
+ }
+}
+</script>
+
+<style scoped>
+/* 寮圭獥閬僵灞� */
+.modal-mask {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 999;
+}
+/* 寮圭獥瀹瑰櫒 */
+.modal-container {
+ width: 600rpx;
+ background-color: #ffffff;
+ border-radius: 24rpx;
+ overflow: hidden;
+ box-shadow: 0 8rpx 40rpx rgba(0, 0, 0, 0.15);
+}
+
+/* 寮圭獥澶撮儴 */
+.modal-header {
+ padding: 40rpx 30rpx 20rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ background: linear-gradient(135deg, #f0f7ff 0%, #e8f4ff 100%);
+}
+
+.modal-title {
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #333;
+ /* margin-top: 16rpx; */
+}
+
+/* 寮圭獥鍐呭 */
+.modal-body {
+ padding: 30rpx;
+}
+.modal-message {
+ font-size: 30rpx;
+ color: #666;
+ text-align: center;
+ display: block;
+}
+/* 寮圭獥搴曢儴鎸夐挳 */
+.modal-footer {
+ display: flex;
+ border-top: 1rpx solid #eee;
+}
+.modal-btn {
+ flex: 1;
+ height: 100rpx;
+ line-height: 100rpx;
+ font-size: 32rpx;
+ border: none;
+ border-radius: 0;
+ background-color: #fff;
+}
+
+.modal-btn::after {
+ border: none;
+}
+
+.modal-btn-cancel {
+ color: #999;
+ border-right: 1rpx solid #eee;
+}
+
+.modal-btn-confirm {
+ color: #fff;
+ background: linear-gradient(135deg, #0081ff 0%, #1890ff 100%);
+ font-weight: bold;
+}
+
+.modal-btn-confirm:active {
+ background: linear-gradient(135deg, #0070dd 0%, #1480e8 100%);
+}
+
+.modal-btn-cancel:active {
+ background-color: #f5f5f5;
+}
+</style>
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 014c6a6..b4d3ea5 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -54,7 +54,8 @@
"productionMatCall":"鐢熶骇鍙枡",
"matDirectDelivery":"鐢熶骇鐩撮��",
"productDirectDelivery":"鎴愬搧鐩村嚭",
- "matPreparation":"鐢熶骇澶囨枡"
+ "matPreparation":"鐢熶骇澶囨枡",
+ "other":"缁煎悎"
},
diff --git a/pages.json b/pages.json
index 9d562b3..e650f20 100644
--- a/pages.json
+++ b/pages.json
@@ -1,770 +1,405 @@
-{
- "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
- {
- "path": "pages/login/index",
- "style": {
- "navigationBarTitleText": "%page.login%",
- "navigationStyle": "custom"
- }
+{
+ "pages": [
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "%page.login%",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/home/index",
+ "style": {
+ "navigationBarTitleText": "%page.index%"
+ }
},
- {
- "path": "pages/home/index",
- "style": {
- "navigationBarTitleText": "%page.index%"
- }
- },
- {
- "path": "pages/outbound/orderOut/order_out_type",
- "style": {
- "navigationBarTitleText": "鍗曟嵁绫诲瀷"
- }
- },
- {
- "path": "pages/outbound/orderOut/orderList",
- "style": {
- "navigationBarTitleText": "鍗曟嵁鍒楄〃",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/outbound/orderOut/orderDetlList",
- "style": {
- "navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃"
- }
- },
- {
- "path": "pages/outbound/orderOut/outLocView",
- "style": {
- "navigationBarTitleText": "鍑哄簱搴撲綅瑙嗗浘"
- }
- },
- {
- "path": "pages/emptyTray/outBound",
- "style": {
- "navigationBarTitleText": "绌烘墭鍑哄簱"
- }
- },
- {
- "path": "pages/emptyTray/inBound",
- "style": {
- "navigationBarTitleText": "绌烘墭鍏ュ簱"
- }
- },
- {
- "path": "pages/outbound/orderPick",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍑哄簱"
- }
- },
- {
- "path": "pages/outbound/orderOut",
- "style": {
- "navigationBarTitleText": "鍑哄簱璁㈠崟"
- }
- },
- {
- "path": "pages/outbound/orderOutItem",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍑哄簱璇︽儏"
- }
- },
- {
- "path": "pages/outbound/matPreparation",
- "style": {
- "navigationBarTitleText": "鐢熶骇澶囨枡"
- }
- },
- {
- "path": "pages/outbound/matPreparationItem",
- "style": {
- "navigationBarTitleText": "鐢熶骇澶囨枡璇︽儏"
- }
- },
- {
- "path": "pages/inbound/orderIn",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟"
- }
- },
- {
- "path": "pages/inbound/orderInExecute",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟鍒楄〃"
- }
- },
- {
- "path": "pages/inbound/orderInItem",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟璇︽儏"
- }
- },
- {
- "path": "pages/transfer/transferType",
- "style": {
- "navigationBarTitleText": "璋冩嫧绫诲瀷"
- }
- },
- {
- "path": "pages/transfer/orderTransfer",
- "style": {
- "navigationBarTitleText": "璋冩嫧璁㈠崟"
- }
- },
- {
- "path": "pages/transfer/orderTransferItem",
- "style": {
- "navigationBarTitleText": "璋冩嫧璁㈠崟璇︽儏"
- }
- },
- {
- "path": "pages/transfer/matTransfer",
- "style": {
- "navigationBarTitleText": "绉诲簱"
- }
- },
- {
- "path": "pages/workInfo/taskInfo",
- "style": {
- "navigationBarTitleText": "宸ヤ綔浠诲姟"
- }
- },
- {
- "path": "pages/workInfo/stationInfo",
- "style": {
- "navigationBarTitleText": "绔欑偣淇℃伅"
- }
- },
- {
- "path": "pages/workInfo/locInfo",
- "style": {
- "navigationBarTitleText": "搴撲綅淇℃伅"
- }
- },
- {
- "path": "pages/inbound/buffStore",
- "style": {
- "navigationBarTitleText": "鐏屾《鍏ュ簱"
- }
- },
- {
- "path": "pages/outbound/matDirectDelivery",
- "style": {
- "navigationBarTitleText": "鐢熶骇鐩撮��"
- }
- },
- {
- "path": "pages/outbound/productDirectDelivery",
- "style": {
- "navigationBarTitleText": "鎴愬搧鐩村嚭"
- }
- },
- {
- "path": "pages/outbound/productionMatCall",
- "style": {
- "navigationBarTitleText": "鐢熶骇鍙枡"
- }
- },
- {
- "path": "pages/outbound/wavePick",
- "style": {
- "navigationBarTitleText": "娉㈡鎷ｈ揣"
- }
- },
- {
- "path": "pages/check/checkOrder",
- "style": {
- "navigationBarTitleText": "鐩樼偣鍗�"
- }
- },
- {
- "path": "pages/check/checkOrderItem",
- "style": {
- "navigationBarTitleText": "鍒濈洏"
- }
- },
- {
- "path": "pages/check/firstCheck",
- "style": {
- "navigationBarTitleText": "鍒濈洏"
- }
- },
- {
- "path": "pages/outbound/wavePickItem",
- "style": {
- "navigationBarTitleText": "娉㈡鎷ｈ揣"
- }
- },
- {
- "path": "pages/rece/standard",
- "style": {
- "navigationBarTitleText": "鏍囧噯鏀惰揣"
- }
- },
- {
- "path": "pages/rece/other",
- "style": {
- "navigationBarTitleText": "鍗曟嵁鏀惰揣"
- }
- },
- {
- "path": "pages/listing/disc",
- "style": {
- "navigationBarTitleText": "缁勭洏"
- }
- },
- {
- "path": "pages/AGV/AGVStaBind",
- "style": {
- "navigationBarTitleText": "AGV绔欑偣缁戝畾"
- }
- },
- {
- "path": "pages/AGV/StaUnBind",
- "style": {
- "navigationBarTitleText": "AGV绔欑偣瑙ｇ粦"
- }
- },
- {
- "path": "pages/AGV/StartInTask",
- "style": {
- "navigationBarTitleText": "AGV鍏ュ簱"
- }
- },
- {
- "path": "pages/AGV/BindAndInTask",
- "style": {
- "navigationBarTitleText": "AGV缁戝畾&鍏ュ簱"
- }
- },
- {
- "path": "pages/listing/matnrPalletising",
- "style": {
- "navigationBarTitleText": "鍗曟嵁缁勬墭"
- }
- },
- {
- "path": "pages/listing/itemSelect",
- "style": {
- "navigationBarTitleText": "閫夋嫨鐗╂枡",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/listing/untie",
- "style": {
- "navigationBarTitleText": "瑙ｇ粦"
- }
- },
- {
- "path": "pages/inspect/report",
- "style": {
- "navigationBarTitleText": "鎶ユ"
- }
- },
- {
- "path": "pages/inspect/check",
- "style": {
- "navigationBarTitleText": "璐ㄦ瑙ｉ攣"
- }
- },
- {
- "path": "pages/inspect/bad",
- "style": {
- "navigationBarTitleText": "璐ㄦ涓婇攣"
- }
- },
- {
- "path": "pages/listing/labour",
- "style": {
- "navigationBarTitleText": "浜哄伐涓婃灦"
- }
- },
- {
- "path": "pages/listing/upper",
- "style": {
- "navigationBarTitleText": "涓婃灦"
- }
- },
- {
- "path": "pages/outbound/fastPicking",
- "style": {
- "navigationBarTitleText": "蹇�熸嫞璐�"
- }
- },
- {
- "path": "pages/mat/matSelected",
- "style": {
- "navigationBarTitleText": "鐗╂枡"
- }
- },
- {
- "path": "pages/mat/matQuery",
- "style": {
- "navigationBarTitleText": "鐗╂枡"
- }
- },
- {
- "path": "pages/mat/matList",
- "style": {
- "navigationBarTitleText": "鍟嗗搧鍒楄〃"
- }
- },
- {
- "path": "pages/login/logOut",
- "style": {
- "navigationBarTitleText": "閫�鍑虹櫥褰�"
- }
- },
- {
- "path": "pages/home/menuHome",
- "style": {
- "navigationBarTitleText": "涓婚〉",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/home/inOutManage",
- "style": {
- "navigationBarTitleText": "鍏ュ嚭搴撶鐞�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/AGV/AGVPakin",
- "style": {
- "navigationBarTitleText": "AGV缁勬墭",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/orderList",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍒楄〃",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/AGV/AGVPakin2",
- "style": {
- "navigationBarTitleText": "AGV缁勬墭",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/home/orderManage",
- "style": {
- "navigationBarTitleText": "鍗曟嵁绠＄悊",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/purchaseOrder",
- "style": {
- "navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/wrkMast",
- "style": {
- "navigationBarTitleText": "宸ヤ綔妗ｆ煡璇㈢淮鎶�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/home/wrkMastManage",
- "style": {
- "navigationBarTitleText": "浠诲姟绠＄悊",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/waitPakin",
- "style": {
- "navigationBarTitleText": "鍏ュ簱閫氱煡妗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/wrkDetl",
- "style": {
- "navigationBarTitleText": "宸ヤ綔妗ｆ槑缁�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/AGV/emptyPakin",
- "style": {
- "navigationBarTitleText": "绌烘澘鍏ュ簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/stationManage/stationManage",
- "style": {
- "navigationBarTitleText": "绔欑偣鏌ヨ缁存姢",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/outOrder",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/AGV/AGVPakin3",
- "style": {
- "navigationBarTitleText": "缁勬墭鍏ュ簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/preview",
- "style": {
- "navigationBarTitleText": "鍑哄簱棰勮",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/AGV/emptyOut",
- "style": {
- "navigationBarTitleText": "鍛煎彨绌鸿揣鏋�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/wrkMastLog",
- "style": {
- "navigationBarTitleText": "宸ヤ綔鍘嗗彶妗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/waitPakinLog",
- "style": {
- "navigationBarTitleText": "鍏ュ簱閫氱煡鍘嗗彶妗�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/orderList2",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍒楄〃",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/stationManage/stationDetl",
- "style": {
- "navigationBarTitleText": "绔欑偣璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/pakinOrderSelect",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/pakinOrderSelectV2",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璁㈠崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/order/orderCar",
- "style": {
- "navigationBarTitleText": "寰呯粍鎵樺垪琛�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/orderOutSelect",
- "style": {
- "navigationBarTitleText": "鍑哄簱璁㈠崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/orderOutSelectV2",
- "style": {
- "navigationBarTitleText": "鍑哄簱璁㈠崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/orderList",
- "style": {
- "navigationBarTitleText": "寰呭嚭鍒楄〃",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/orderCheck",
- "style": {
- "navigationBarTitleText": "鍑哄簱纭",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/orderCheck_2",
- "style": {
- "navigationBarTitleText": "鍑哄簱纭",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/checkLocDetl",
- "style": {
- "navigationBarTitleText": "鐩樼偣",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/locDetl",
- "style": {
- "navigationBarTitleText": "搴撳瓨鏄庣粏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/locDetlList",
- "style": {
- "navigationBarTitleText": "搴撳瓨鏄庣粏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/mat/mat",
- "style": {
- "navigationBarTitleText": "妫�绱㈢墿鏂�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/mat/matSelected",
- "style": {
- "navigationBarTitleText": "鍟嗗搧璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/stationManage/pickAgain",
- "style": {
- "navigationBarTitleText": "鍐嶆鎷ｆ枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/stationManage/pickAgainDetl",
- "style": {
- "navigationBarTitleText": "鍐嶆鎷ｆ枡鏄庣粏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/bcpOrder",
- "style": {
- "navigationBarTitleText": "鍗婂叆搴撳崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/bcpOrder_xs",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佸叆搴撳崟_鍚稿",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/bcpDbOrder",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佽皟鎷ㄥ崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/bcpDbOrderV2",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佽皟鎷ㄥ崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/orderCar",
- "style": {
- "navigationBarTitleText": "寰呯粍鎵樺垪琛�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/orderCar_xs",
- "style": {
- "navigationBarTitleText": "寰呯粍鎵樺垪琛╛鍚稿",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/home/locMastManage",
- "style": {
- "navigationBarTitleText": "搴撲綅绠＄悊",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/locMove",
- "style": {
- "navigationBarTitleText": "搴撲綅杞Щ",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/bcp/bcpDbList",
- "style": {
- "navigationBarTitleText": "璋冩嫧搴撲綅",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/bcpOrderOutSelect",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佸嚭搴撳崟",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/orderOut/bcpOrderOutSelect_2",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佸嚭搴撳崟_浜屽巶",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/locMoveMast",
- "style": {
- "navigationBarTitleText": "璋冩嫧浠诲姟绠＄悊",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/phyz/wrkMast/DBList",
- "style": {
- "navigationBarTitleText": "璋冩嫧浠诲姟绠＄悊"
- }
- },
- {
- "path": "pages/phyz/processOrder/processOrder",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佸姞宸ュ崟"
- }
- },
- {
- "path": "pages/phyz/processOrder/processList",
- "style": {
- "navigationBarTitleText": "寰呭姞宸ュ垪琛�"
- }
- },
- {
- "path": "pages/phyz/processOrder/orderCheck",
- "style": {
- "navigationBarTitleText": "鍔犲伐鍑哄簱"
- }
- },
- {
- "path": "pages/phyz/backStock/backStocksOrder",
- "style": {
- "navigationBarTitleText": "鍗婃垚鍝佸洖閫�鍗�"
- }
- },
- {
- "path": "pages/phyz/backStock/backStockList",
- "style": {
- "navigationBarTitleText": "鍥炶皟搴撲綅"
- }
- },
- {
- "path": "pages/phyz/stationManage/confirmProcessed",
- "style": {
- "navigationBarTitleText": "宸插姞宸ョ‘璁�"
- }
- },
- {
- "path": "pages/phyz/waitOrder/waitOrderIn",
- "style": {
- "navigationBarTitleText": "寰呭寘瑁呭叆搴撳崟"
- }
- },
- {
- "path": "pages/phyz/waitOrder/waitOrderOut",
- "style": {
- "navigationBarTitleText": "寰呭寘瑁呭嚭搴撳崟"
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/checkLocDetl2",
- "style": {
- "navigationBarTitleText": "搴撲綅鐩樼偣"
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/locDetl2",
- "style": {
- "navigationBarTitleText": "搴撳瓨鏄庣粏"
- }
- },
- {
- "path": "pages/phyz/checkLocDetl/locDetlList2",
- "style": {
- "navigationBarTitleText": "搴撳瓨鏄庣粏"
- }
- },
- {
- "path": "pages/phyz/comOrder/orderIn",
- "style": {
- "navigationBarTitleText": "鍏ュ簱鍗�"
- }
- },
- {
- "path": "pages/phyz/comOrder/orderOut",
- "style": {
- "navigationBarTitleText": "璁㈠崟鍑哄簱"
- }
- },
- {
- "path": "pages/phyz/comOrder/orderCar",
- "style": {
- "navigationBarTitleText": "寰呯粍鎵樺垪琛�"
- }
- },
- {
- "path": "pages/phyz/comOrder/checkOut",
- "style": {
- "navigationBarTitleText": "鍑哄簱纭"
- }
- },
- {
- "path": "pages/phyz/inStock/inStock",
- "style": {
- "navigationBarTitleText": "鍏ュ簱涓婃灦"
- }
- },
- {
- "path": "pages/listing/unPakin",
- "style": {
- "navigationBarTitleText": "缁勬墭瑙ｇ粦"
- }
- }
- ],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
- },
- "uniIdRouter": {}
+ {
+ "path": "pages/icon",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/other/transferView/orderList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/other/transferView/orderDetlList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/outbound/orderOut/order_out_type",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁绫诲瀷"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOut/orderList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/outbound/orderOut/orderDetlList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOutView/order_out_type",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁绫诲瀷"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOutView/orderList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鍒楄〃",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/outbound/orderOutView/orderDetlList",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鏄庣粏鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOut/outLocView",
+ "style": {
+ "navigationBarTitleText": "鍑哄簱搴撲綅瑙嗗浘"
+ }
+ },
+ {
+ "path": "pages/emptyTray/outBound",
+ "style": {
+ "navigationBarTitleText": "绌烘墭鍑哄簱"
+ }
+ },
+ {
+ "path": "pages/emptyTray/inBound",
+ "style": {
+ "navigationBarTitleText": "绌烘墭鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/outbound/orderPick",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟鍑哄簱"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOut",
+ "style": {
+ "navigationBarTitleText": "鍑哄簱璁㈠崟"
+ }
+ },
+ {
+ "path": "pages/outbound/orderOutItem",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟鍑哄簱璇︽儏"
+ }
+ },
+ {
+ "path": "pages/outbound/matPreparation",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇澶囨枡"
+ }
+ },
+ {
+ "path": "pages/outbound/matPreparationItem",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇澶囨枡璇︽儏"
+ }
+ },
+ {
+ "path": "pages/inbound/orderIn",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱璁㈠崟"
+ }
+ },
+ {
+ "path": "pages/inbound/orderInExecute",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱璁㈠崟鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/inbound/orderInItem",
+ "style": {
+ "navigationBarTitleText": "鍏ュ簱璁㈠崟璇︽儏"
+ }
+ },
+ {
+ "path": "pages/transfer/transferType",
+ "style": {
+ "navigationBarTitleText": "璋冩嫧绫诲瀷"
+ }
+ },
+ {
+ "path": "pages/transfer/orderTransfer",
+ "style": {
+ "navigationBarTitleText": "璋冩嫧璁㈠崟"
+ }
+ },
+ {
+ "path": "pages/transfer/orderTransferItem",
+ "style": {
+ "navigationBarTitleText": "璋冩嫧璁㈠崟璇︽儏"
+ }
+ },
+ {
+ "path": "pages/transfer/matTransfer",
+ "style": {
+ "navigationBarTitleText": "绉诲簱"
+ }
+ },
+ {
+ "path": "pages/workInfo/taskInfo",
+ "style": {
+ "navigationBarTitleText": "宸ヤ綔浠诲姟"
+ }
+ },
+ {
+ "path": "pages/workInfo/stationInfo",
+ "style": {
+ "navigationBarTitleText": "绔欑偣淇℃伅"
+ }
+ },
+ {
+ "path": "pages/workInfo/locInfo",
+ "style": {
+ "navigationBarTitleText": "搴撲綅淇℃伅"
+ }
+ },
+ {
+ "path": "pages/inbound/buffStore",
+ "style": {
+ "navigationBarTitleText": "鐏屾《鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/outbound/matDirectDelivery",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇鐩撮��"
+ }
+ },
+ {
+ "path": "pages/outbound/productDirectDelivery",
+ "style": {
+ "navigationBarTitleText": "鎴愬搧鐩村嚭"
+ }
+ },
+ {
+ "path": "pages/outbound/productionMatCall",
+ "style": {
+ "navigationBarTitleText": "鐢熶骇鍙枡"
+ }
+ },
+ {
+ "path": "pages/outbound/wavePick",
+ "style": {
+ "navigationBarTitleText": "娉㈡鎷ｈ揣"
+ }
+ },
+ {
+ "path": "pages/check/checkOrder",
+ "style": {
+ "navigationBarTitleText": "鐩樼偣鍗�"
+ }
+ },
+ {
+ "path": "pages/check/checkOrderItem",
+ "style": {
+ "navigationBarTitleText": "鍒濈洏"
+ }
+ },
+ {
+ "path": "pages/check/firstCheck",
+ "style": {
+ "navigationBarTitleText": "鍒濈洏"
+ }
+ },
+ {
+ "path": "pages/outbound/wavePickItem",
+ "style": {
+ "navigationBarTitleText": "娉㈡鎷ｈ揣"
+ }
+ },
+ {
+ "path": "pages/rece/standard",
+ "style": {
+ "navigationBarTitleText": "鏍囧噯鏀惰揣"
+ }
+ },
+ {
+ "path": "pages/rece/other",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁鏀惰揣"
+ }
+ },
+ {
+ "path": "pages/listing/disc",
+ "style": {
+ "navigationBarTitleText": "缁勭洏"
+ }
+ },
+ {
+ "path": "pages/AGV/AGVStaBind",
+ "style": {
+ "navigationBarTitleText": "AGV绔欑偣缁戝畾"
+ }
+ },
+ {
+ "path": "pages/AGV/StaUnBind",
+ "style": {
+ "navigationBarTitleText": "AGV绔欑偣瑙ｇ粦"
+ }
+ },
+ {
+ "path": "pages/AGV/StartInTask",
+ "style": {
+ "navigationBarTitleText": "AGV鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/AGV/BindAndInTask",
+ "style": {
+ "navigationBarTitleText": "AGV缁戝畾&鍏ュ簱"
+ }
+ },
+ {
+ "path": "pages/listing/matnrPalletising",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁缁勬墭"
+ }
+ },
+ {
+ "path": "pages/listing/itemSelect",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨鐗╂枡",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/listing/untie",
+ "style": {
+ "navigationBarTitleText": "瑙ｇ粦"
+ }
+ },
+ {
+ "path": "pages/inspect/report",
+ "style": {
+ "navigationBarTitleText": "鎶ユ"
+ }
+ },
+ {
+ "path": "pages/inspect/check",
+ "style": {
+ "navigationBarTitleText": "璐ㄦ瑙ｉ攣"
+ }
+ },
+ {
+ "path": "pages/inspect/bad",
+ "style": {
+ "navigationBarTitleText": "璐ㄦ涓婇攣"
+ }
+ },
+ {
+ "path": "pages/listing/labour",
+ "style": {
+ "navigationBarTitleText": "浜哄伐涓婃灦"
+ }
+ },
+ {
+ "path": "pages/listing/upper",
+ "style": {
+ "navigationBarTitleText": "涓婃灦"
+ }
+ },
+ {
+ "path": "pages/outbound/fastPicking",
+ "style": {
+ "navigationBarTitleText": "蹇�熸嫞璐�"
+ }
+ },
+ {
+ "path": "pages/mat/matSelected",
+ "style": {
+ "navigationBarTitleText": "鐗╂枡"
+ }
+ },
+ {
+ "path": "pages/mat/matQuery",
+ "style": {
+ "navigationBarTitleText": "鐗╂枡"
+ }
+ },
+ {
+ "path": "pages/mat/matList",
+ "style": {
+ "navigationBarTitleText": "鍟嗗搧鍒楄〃"
+ }
+ },
+ {
+ "path": "pages/login/logOut",
+ "style": {
+ "navigationBarTitleText": "閫�鍑虹櫥褰�"
+ }
+ },
+ {
+ "path": "pages/home/menuHome",
+ "style": {
+ "navigationBarTitleText": "涓婚〉",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/home/inOutManage",
+ "style": {
+ "navigationBarTitleText": "鍏ュ嚭搴撶鐞�",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/home/orderManage",
+ "style": {
+ "navigationBarTitleText": "鍗曟嵁绠＄悊",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/home/wrkMastManage",
+ "style": {
+ "navigationBarTitleText": "浠诲姟绠＄悊",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/home/locMastManage",
+ "style": {
+ "navigationBarTitleText": "搴撲綅绠＄悊",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/listing/unPakin",
+ "style": {
+ "navigationBarTitleText": "缁勬墭瑙ｇ粦"
+ }
+ }
+ ],
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "uni-app",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8"
+ },
+ "uniIdRouter": {}
}
\ No newline at end of file
diff --git a/pages/icon.vue b/pages/icon.vue
new file mode 100644
index 0000000..7f3ec91
--- /dev/null
+++ b/pages/icon.vue
@@ -0,0 +1,939 @@
+<template>
+ <view>
+ <cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="backText">杩斿洖</block><block slot="content">鍥炬爣</block></cu-custom>
+ <view class="cu-bar bg-white search fixed" :style="[{top:CustomBar + 'px'}]">
+ <view class="search-form round">
+ <text class="cuIcon-search"></text>
+ <input type="text" placeholder="鎼滅储cuIcon" confirm-type="search" @input="searchIcon"></input>
+ </view>
+ </view>
+ <view class="cu-list grid col-3">
+ <view class="cu-item" v-for="(item,index) in cuIcon" :key="index" v-if="item.isShow">
+ <text class="lg text-gray" :class="'cuIcon-' + item.name"></text>
+ <text>{{item.name}}</text>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ CustomBar: this.CustomBar,
+ cuIcon: [{
+ name: 'appreciate',
+ isShow: true
+ }, {
+ name: 'check',
+ isShow: true
+ }, {
+ name: 'close',
+ isShow: true
+ }, {
+ name: 'edit',
+ isShow: true
+ }, {
+ name: 'emoji',
+ isShow: true
+ }, {
+ name: 'favorfill',
+ isShow: true
+ }, {
+ name: 'favor',
+ isShow: true
+ }, {
+ name: 'loading',
+ isShow: true
+ }, {
+ name: 'locationfill',
+ isShow: true
+ }, {
+ name: 'location',
+ isShow: true
+ }, {
+ name: 'phone',
+ isShow: true
+ }, {
+ name: 'roundcheckfill',
+ isShow: true
+ }, {
+ name: 'roundcheck',
+ isShow: true
+ }, {
+ name: 'roundclosefill',
+ isShow: true
+ }, {
+ name: 'roundclose',
+ isShow: true
+ }, {
+ name: 'roundrightfill',
+ isShow: true
+ }, {
+ name: 'roundright',
+ isShow: true
+ }, {
+ name: 'search',
+ isShow: true
+ }, {
+ name: 'taxi',
+ isShow: true
+ }, {
+ name: 'timefill',
+ isShow: true
+ }, {
+ name: 'time',
+ isShow: true
+ }, {
+ name: 'unfold',
+ isShow: true
+ }, {
+ name: 'warnfill',
+ isShow: true
+ }, {
+ name: 'warn',
+ isShow: true
+ }, {
+ name: 'camerafill',
+ isShow: true
+ }, {
+ name: 'camera',
+ isShow: true
+ }, {
+ name: 'commentfill',
+ isShow: true
+ }, {
+ name: 'comment',
+ isShow: true
+ }, {
+ name: 'likefill',
+ isShow: true
+ }, {
+ name: 'like',
+ isShow: true
+ }, {
+ name: 'notificationfill',
+ isShow: true
+ }, {
+ name: 'notification',
+ isShow: true
+ }, {
+ name: 'order',
+ isShow: true
+ }, {
+ name: 'samefill',
+ isShow: true
+ }, {
+ name: 'same',
+ isShow: true
+ }, {
+ name: 'deliver',
+ isShow: true
+ }, {
+ name: 'evaluate',
+ isShow: true
+ }, {
+ name: 'pay',
+ isShow: true
+ }, {
+ name: 'send',
+ isShow: true
+ }, {
+ name: 'shop',
+ isShow: true
+ }, {
+ name: 'ticket',
+ isShow: true
+ }, {
+ name: 'back',
+ isShow: true
+ }, {
+ name: 'cascades',
+ isShow: true
+ }, {
+ name: 'discover',
+ isShow: true
+ }, {
+ name: 'list',
+ isShow: true
+ }, {
+ name: 'more',
+ isShow: true
+ }, {
+ name: 'scan',
+ isShow: true
+ }, {
+ name: 'settings',
+ isShow: true
+ }, {
+ name: 'questionfill',
+ isShow: true
+ }, {
+ name: 'question',
+ isShow: true
+ }, {
+ name: 'shopfill',
+ isShow: true
+ }, {
+ name: 'form',
+ isShow: true
+ }, {
+ name: 'pic',
+ isShow: true
+ }, {
+ name: 'filter',
+ isShow: true
+ }, {
+ name: 'footprint',
+ isShow: true
+ }, {
+ name: 'top',
+ isShow: true
+ }, {
+ name: 'pulldown',
+ isShow: true
+ }, {
+ name: 'pullup',
+ isShow: true
+ }, {
+ name: 'right',
+ isShow: true
+ }, {
+ name: 'refresh',
+ isShow: true
+ }, {
+ name: 'moreandroid',
+ isShow: true
+ }, {
+ name: 'deletefill',
+ isShow: true
+ }, {
+ name: 'refund',
+ isShow: true
+ }, {
+ name: 'cart',
+ isShow: true
+ }, {
+ name: 'qrcode',
+ isShow: true
+ }, {
+ name: 'remind',
+ isShow: true
+ }, {
+ name: 'delete',
+ isShow: true
+ }, {
+ name: 'profile',
+ isShow: true
+ }, {
+ name: 'home',
+ isShow: true
+ }, {
+ name: 'cartfill',
+ isShow: true
+ }, {
+ name: 'discoverfill',
+ isShow: true
+ }, {
+ name: 'homefill',
+ isShow: true
+ }, {
+ name: 'message',
+ isShow: true
+ }, {
+ name: 'addressbook',
+ isShow: true
+ }, {
+ name: 'link',
+ isShow: true
+ }, {
+ name: 'lock',
+ isShow: true
+ }, {
+ name: 'unlock',
+ isShow: true
+ }, {
+ name: 'vip',
+ isShow: true
+ }, {
+ name: 'weibo',
+ isShow: true
+ }, {
+ name: 'activity',
+ isShow: true
+ }, {
+ name: 'friendaddfill',
+ isShow: true
+ }, {
+ name: 'friendadd',
+ isShow: true
+ }, {
+ name: 'friendfamous',
+ isShow: true
+ }, {
+ name: 'friend',
+ isShow: true
+ }, {
+ name: 'goods',
+ isShow: true
+ }, {
+ name: 'selection',
+ isShow: true
+ }, {
+ name: 'explore',
+ isShow: true
+ }, {
+ name: 'present',
+ isShow: true
+ }, {
+ name: 'squarecheckfill',
+ isShow: true
+ }, {
+ name: 'square',
+ isShow: true
+ }, {
+ name: 'squarecheck',
+ isShow: true
+ }, {
+ name: 'round',
+ isShow: true
+ }, {
+ name: 'roundaddfill',
+ isShow: true
+ }, {
+ name: 'roundadd',
+ isShow: true
+ }, {
+ name: 'add',
+ isShow: true
+ }, {
+ name: 'notificationforbidfill',
+ isShow: true
+ }, {
+ name: 'explorefill',
+ isShow: true
+ }, {
+ name: 'fold',
+ isShow: true
+ }, {
+ name: 'game',
+ isShow: true
+ }, {
+ name: 'redpacket',
+ isShow: true
+ }, {
+ name: 'selectionfill',
+ isShow: true
+ }, {
+ name: 'similar',
+ isShow: true
+ }, {
+ name: 'appreciatefill',
+ isShow: true
+ }, {
+ name: 'infofill',
+ isShow: true
+ }, {
+ name: 'info',
+ isShow: true
+ }, {
+ name: 'forwardfill',
+ isShow: true
+ }, {
+ name: 'forward',
+ isShow: true
+ }, {
+ name: 'rechargefill',
+ isShow: true
+ }, {
+ name: 'recharge',
+ isShow: true
+ }, {
+ name: 'vipcard',
+ isShow: true
+ }, {
+ name: 'voice',
+ isShow: true
+ }, {
+ name: 'voicefill',
+ isShow: true
+ }, {
+ name: 'friendfavor',
+ isShow: true
+ }, {
+ name: 'wifi',
+ isShow: true
+ }, {
+ name: 'share',
+ isShow: true
+ }, {
+ name: 'wefill',
+ isShow: true
+ }, {
+ name: 'we',
+ isShow: true
+ }, {
+ name: 'lightauto',
+ isShow: true
+ }, {
+ name: 'lightforbid',
+ isShow: true
+ }, {
+ name: 'lightfill',
+ isShow: true
+ }, {
+ name: 'camerarotate',
+ isShow: true
+ }, {
+ name: 'light',
+ isShow: true
+ }, {
+ name: 'barcode',
+ isShow: true
+ }, {
+ name: 'flashlightclose',
+ isShow: true
+ }, {
+ name: 'flashlightopen',
+ isShow: true
+ }, {
+ name: 'searchlist',
+ isShow: true
+ }, {
+ name: 'service',
+ isShow: true
+ }, {
+ name: 'sort',
+ isShow: true
+ }, {
+ name: 'down',
+ isShow: true
+ }, {
+ name: 'mobile',
+ isShow: true
+ }, {
+ name: 'mobilefill',
+ isShow: true
+ }, {
+ name: 'copy',
+ isShow: true
+ }, {
+ name: 'countdownfill',
+ isShow: true
+ }, {
+ name: 'countdown',
+ isShow: true
+ }, {
+ name: 'noticefill',
+ isShow: true
+ }, {
+ name: 'notice',
+ isShow: true
+ }, {
+ name: 'upstagefill',
+ isShow: true
+ }, {
+ name: 'upstage',
+ isShow: true
+ }, {
+ name: 'babyfill',
+ isShow: true
+ }, {
+ name: 'baby',
+ isShow: true
+ }, {
+ name: 'brandfill',
+ isShow: true
+ }, {
+ name: 'brand',
+ isShow: true
+ }, {
+ name: 'choicenessfill',
+ isShow: true
+ }, {
+ name: 'choiceness',
+ isShow: true
+ }, {
+ name: 'clothesfill',
+ isShow: true
+ }, {
+ name: 'clothes',
+ isShow: true
+ }, {
+ name: 'creativefill',
+ isShow: true
+ }, {
+ name: 'creative',
+ isShow: true
+ }, {
+ name: 'female',
+ isShow: true
+ }, {
+ name: 'keyboard',
+ isShow: true
+ }, {
+ name: 'male',
+ isShow: true
+ }, {
+ name: 'newfill',
+ isShow: true
+ }, {
+ name: 'new',
+ isShow: true
+ }, {
+ name: 'pullleft',
+ isShow: true
+ }, {
+ name: 'pullright',
+ isShow: true
+ }, {
+ name: 'rankfill',
+ isShow: true
+ }, {
+ name: 'rank',
+ isShow: true
+ }, {
+ name: 'bad',
+ isShow: true
+ }, {
+ name: 'cameraadd',
+ isShow: true
+ }, {
+ name: 'focus',
+ isShow: true
+ }, {
+ name: 'friendfill',
+ isShow: true
+ }, {
+ name: 'cameraaddfill',
+ isShow: true
+ }, {
+ name: 'apps',
+ isShow: true
+ }, {
+ name: 'paintfill',
+ isShow: true
+ }, {
+ name: 'paint',
+ isShow: true
+ }, {
+ name: 'picfill',
+ isShow: true
+ }, {
+ name: 'refresharrow',
+ isShow: true
+ }, {
+ name: 'colorlens',
+ isShow: true
+ }, {
+ name: 'markfill',
+ isShow: true
+ }, {
+ name: 'mark',
+ isShow: true
+ }, {
+ name: 'presentfill',
+ isShow: true
+ }, {
+ name: 'repeal',
+ isShow: true
+ }, {
+ name: 'album',
+ isShow: true
+ }, {
+ name: 'peoplefill',
+ isShow: true
+ }, {
+ name: 'people',
+ isShow: true
+ }, {
+ name: 'servicefill',
+ isShow: true
+ }, {
+ name: 'repair',
+ isShow: true
+ }, {
+ name: 'file',
+ isShow: true
+ }, {
+ name: 'repairfill',
+ isShow: true
+ }, {
+ name: 'taoxiaopu',
+ isShow: true
+ }, {
+ name: 'weixin',
+ isShow: true
+ }, {
+ name: 'attentionfill',
+ isShow: true
+ }, {
+ name: 'attention',
+ isShow: true
+ }, {
+ name: 'commandfill',
+ isShow: true
+ }, {
+ name: 'command',
+ isShow: true
+ }, {
+ name: 'communityfill',
+ isShow: true
+ }, {
+ name: 'community',
+ isShow: true
+ }, {
+ name: 'read',
+ isShow: true
+ }, {
+ name: 'calendar',
+ isShow: true
+ }, {
+ name: 'cut',
+ isShow: true
+ }, {
+ name: 'magic',
+ isShow: true
+ }, {
+ name: 'backwardfill',
+ isShow: true
+ }, {
+ name: 'playfill',
+ isShow: true
+ }, {
+ name: 'stop',
+ isShow: true
+ }, {
+ name: 'tagfill',
+ isShow: true
+ }, {
+ name: 'tag',
+ isShow: true
+ }, {
+ name: 'group',
+ isShow: true
+ }, {
+ name: 'all',
+ isShow: true
+ }, {
+ name: 'backdelete',
+ isShow: true
+ }, {
+ name: 'hotfill',
+ isShow: true
+ }, {
+ name: 'hot',
+ isShow: true
+ }, {
+ name: 'post',
+ isShow: true
+ }, {
+ name: 'radiobox',
+ isShow: true
+ }, {
+ name: 'rounddown',
+ isShow: true
+ }, {
+ name: 'upload',
+ isShow: true
+ }, {
+ name: 'writefill',
+ isShow: true
+ }, {
+ name: 'write',
+ isShow: true
+ }, {
+ name: 'radioboxfill',
+ isShow: true
+ }, {
+ name: 'punch',
+ isShow: true
+ }, {
+ name: 'shake',
+ isShow: true
+ }, {
+ name: 'move',
+ isShow: true
+ }, {
+ name: 'safe',
+ isShow: true
+ }, {
+ name: 'activityfill',
+ isShow: true
+ }, {
+ name: 'crownfill',
+ isShow: true
+ }, {
+ name: 'crown',
+ isShow: true
+ }, {
+ name: 'goodsfill',
+ isShow: true
+ }, {
+ name: 'messagefill',
+ isShow: true
+ }, {
+ name: 'profilefill',
+ isShow: true
+ }, {
+ name: 'sound',
+ isShow: true
+ }, {
+ name: 'sponsorfill',
+ isShow: true
+ }, {
+ name: 'sponsor',
+ isShow: true
+ }, {
+ name: 'upblock',
+ isShow: true
+ }, {
+ name: 'weblock',
+ isShow: true
+ }, {
+ name: 'weunblock',
+ isShow: true
+ }, {
+ name: 'my',
+ isShow: true
+ }, {
+ name: 'myfill',
+ isShow: true
+ }, {
+ name: 'emojifill',
+ isShow: true
+ }, {
+ name: 'emojiflashfill',
+ isShow: true
+ }, {
+ name: 'flashbuyfill',
+ isShow: true
+ }, {
+ name: 'text',
+ isShow: true
+ }, {
+ name: 'goodsfavor',
+ isShow: true
+ }, {
+ name: 'musicfill',
+ isShow: true
+ }, {
+ name: 'musicforbidfill',
+ isShow: true
+ }, {
+ name: 'card',
+ isShow: true
+ }, {
+ name: 'triangledownfill',
+ isShow: true
+ }, {
+ name: 'triangleupfill',
+ isShow: true
+ }, {
+ name: 'roundleftfill-copy',
+ isShow: true
+ }, {
+ name: 'font',
+ isShow: true
+ }, {
+ name: 'title',
+ isShow: true
+ }, {
+ name: 'recordfill',
+ isShow: true
+ }, {
+ name: 'record',
+ isShow: true
+ }, {
+ name: 'cardboardfill',
+ isShow: true
+ }, {
+ name: 'cardboard',
+ isShow: true
+ }, {
+ name: 'formfill',
+ isShow: true
+ }, {
+ name: 'coin',
+ isShow: true
+ }, {
+ name: 'cardboardforbid',
+ isShow: true
+ }, {
+ name: 'circlefill',
+ isShow: true
+ }, {
+ name: 'circle',
+ isShow: true
+ }, {
+ name: 'attentionforbid',
+ isShow: true
+ }, {
+ name: 'attentionforbidfill',
+ isShow: true
+ }, {
+ name: 'attentionfavorfill',
+ isShow: true
+ }, {
+ name: 'attentionfavor',
+ isShow: true
+ }, {
+ name: 'titles',
+ isShow: true
+ }, {
+ name: 'icloading',
+ isShow: true
+ }, {
+ name: 'full',
+ isShow: true
+ }, {
+ name: 'mail',
+ isShow: true
+ }, {
+ name: 'peoplelist',
+ isShow: true
+ }, {
+ name: 'goodsnewfill',
+ isShow: true
+ }, {
+ name: 'goodsnew',
+ isShow: true
+ }, {
+ name: 'medalfill',
+ isShow: true
+ }, {
+ name: 'medal',
+ isShow: true
+ }, {
+ name: 'newsfill',
+ isShow: true
+ }, {
+ name: 'newshotfill',
+ isShow: true
+ }, {
+ name: 'newshot',
+ isShow: true
+ }, {
+ name: 'news',
+ isShow: true
+ }, {
+ name: 'videofill',
+ isShow: true
+ }, {
+ name: 'video',
+ isShow: true
+ }, {
+ name: 'exit',
+ isShow: true
+ }, {
+ name: 'skinfill',
+ isShow: true
+ }, {
+ name: 'skin',
+ isShow: true
+ }, {
+ name: 'moneybagfill',
+ isShow: true
+ }, {
+ name: 'usefullfill',
+ isShow: true
+ }, {
+ name: 'usefull',
+ isShow: true
+ }, {
+ name: 'moneybag',
+ isShow: true
+ }, {
+ name: 'redpacket_fill',
+ isShow: true
+ }, {
+ name: 'subscription',
+ isShow: true
+ }, {
+ name: 'loading1',
+ isShow: true
+ }, {
+ name: 'github',
+ isShow: true
+ }, {
+ name: 'global',
+ isShow: true
+ }, {
+ name: 'settingsfill',
+ isShow: true
+ }, {
+ name: 'back_android',
+ isShow: true
+ }, {
+ name: 'expressman',
+ isShow: true
+ }, {
+ name: 'evaluate_fill',
+ isShow: true
+ }, {
+ name: 'group_fill',
+ isShow: true
+ }, {
+ name: 'play_forward_fill',
+ isShow: true
+ }, {
+ name: 'deliver_fill',
+ isShow: true
+ }, {
+ name: 'notice_forbid_fill',
+ isShow: true
+ }, {
+ name: 'fork',
+ isShow: true
+ }, {
+ name: 'pick',
+ isShow: true
+ }, {
+ name: 'wenzi',
+ isShow: true
+ }, {
+ name: 'ellipse',
+ isShow: true
+ }, {
+ name: 'qr_code',
+ isShow: true
+ }, {
+ name: 'dianhua',
+ isShow: true
+ }, {
+ name: 'cuIcon',
+ isShow: true
+ }, {
+ name: 'loading2',
+ isShow: true
+ }, {
+ name: 'btn',
+ isShow: true
+ }]
+
+ };
+ },
+ methods: {
+ searchIcon(e) {
+ let key = e.detail.value.toLowerCase();
+ let list = this.cuIcon;
+ for (let i = 0; i < list.length; i++) {
+ let a = key;
+ let b = list[i].name.toLowerCase();
+ if (b.search(a) != -1) {
+ list[i].isShow = true
+ } else {
+ list[i].isShow = false
+ }
+ }
+ this.cuIcon = list
+ }
+ }
+ }
+</script>
+
+<style>
+ page {
+ padding-top: 50px;
+ }
+</style>
diff --git a/pages/inspect/bad.vue b/pages/inspect/bad.vue
index cbf4133..f03e526 100644
--- a/pages/inspect/bad.vue
+++ b/pages/inspect/bad.vue
@@ -3,33 +3,57 @@
<form>
<view class="cu-form-group margin-top">
<view class="title">鎵樼洏鐮�</view>
- <input placeholder="璇锋壂鎻忔墭鐩樼爜" v-model="container" focus></input>
- <text class='cuIcon-search text-blue' </text>
+ <input
+ placeholder="璇锋壂鎻忔墭鐩樼爜"
+ v-model="container"
+ focus
+ />
</view>
- <view class="cu-form-group ">
+ <view class="cu-form-group">
<view class="title">鐗╂枡鏍囩</view>
- <input placeholder="璇锋壂鎻忕墿鏂欐爣绛�" v-model="barcode"></input>
- <text class='cuIcon-search text-blue' @click="search"></text>
+ <input
+ placeholder="璇锋壂鎻忕墿鏂欐爣绛�"
+ v-model="barcode"
+ />
+ <text
+ class="cuIcon-search text-blue"
+ @click="search"
+ ></text>
</view>
</form>
+ <view class="flex solid-bottom padding-sm justify-between">
+ <view class="text-blue">鐗╂枡绉嶇被:{{ list.length }}</view>
+ <view class="text-red">閿佸畾鏁伴噺:{{ allCount }}</view>
+ </view>
+ <view
+ class="flex solid-bottom padding-sm justify-between"
+ v-if="list.length"
+ >
+ <view class="text-blue">搴撲綅鍙�:{{ list[0].locCode }}</view>
+ </view>
- <view class="cu-list det menu sm-border padding">
- <block v-for="(item, index) in list" :key="index">
+ <view
+ class="cu-list det menu sm-border padding"
+ style="padding-bottom: 60px"
+ >
+ <block
+ v-for="(item, index) in list"
+ :key="index"
+ >
<view class="cu-bar bg-white solid-bottom margin-top-sm">
<view class="action">
<!-- <view class="index">
{{index+1}}
</view> -->
<view class="text-blue">
- {{`${item.maktx}`}}
+ {{ `${item.maktx}` }}
</view>
</view>
- <view class="action">
- <view class='cu-tag radius bg-red'>涓嶅悎鏍�</view>
- </view>
-
+ <!-- <view class="action">
+ <view class="cu-tag radius bg-red">涓嶅悎鏍�</view>
+ </view> -->
<!-- <view class="action" v-if="!isconfirm">
<text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
@@ -41,7 +65,15 @@
<text class="text-black">鐗╂枡缂栫爜:</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.maktxCode}}</text>
+ <text class="text-grey">{{ item.matnrCode }}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">璁″垝璺熻釜鍙�:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.platWorkCode }}</text>
</view>
</view>
@@ -50,17 +82,16 @@
<text class="text-black">鍗曞彿:</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.asnCode}}</text>
+ <text class="text-grey">{{ item.asnCode }}</text>
</view>
</view>
-
<view class="cu-item">
<view class="content">
<text class="text-black">渚涘簲鍟嗘壒娆�:</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.splrBatch}}</text>
+ <text class="text-grey">{{ item.splrBatch }}</text>
</view>
</view>
@@ -69,151 +100,204 @@
<text class="text-black">搴撳瓨鍗曚綅:</text>
</view>
<view class="action">
- <text class="text-grey ">{{item.stockUnit}}</text>
+ <text class="text-grey">{{ item.stockUnit }}</text>
</view>
</view>
-
- <view class="cu-item">
+ <!-- <view class="cu-item">
<view class="content">
<view class="cu-form-group padding-lr-0">
<view class="title text-blue">鏁伴噺:</view>
- <input class="text-right" type="number" placeholder="璇疯緭鍏ユ暟閲�" v-model="item.receiptQty"
- focus></input>
+ <input
+ class="text-right"
+ type="number"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ v-model="item.receiptQty"
+ focus
+ />
</view>
</view>
- </view>
+ </view> -->
<view class="margin-top-sm flex">
- <uni-data-checkbox mode="tag" v-model="item.status" :localdata="types"></uni-data-checkbox>
+ <uni-data-checkbox
+ mode="tag"
+ v-model="item.status"
+ :localdata="types"
+ ></uni-data-checkbox>
</view>
</block>
</view>
<view class="cu-bar btn-group foot">
- <button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm">涓婇攣</button>
+ <button
+ v-if="hasButtonPermission('reset')"
+ class="cu-btn text-blue line-blue shadow"
+ @click="clear"
+ >
+ 娓呯┖
+ </button>
+ <button
+ v-if="hasButtonPermission('submit')"
+ class="cu-btn bg-blue shadow-blur"
+ @click="confirm"
+ >
+ 涓婇攣
+ </button>
</view>
+ <ConfirmModal
+ :visible="showModal"
+ @update:visible="showModal = $event"
+ icon="check"
+ title="涓婇攣纭"
+ message="鏄惁纭畾涓婇攣锛�"
+ cancelText="涓嶉渶瑕�"
+ confirmText="纭畾"
+ :isconfirm="isconfirm"
+ @cancel="handleNo"
+ @confirm="handleYes"
+ ></ConfirmModal>
</view>
</template>
<script>
- import {
- request
- } from '../../common/request.js'
+import { request } from '../../common/request.js'
+import ConfirmModal from '../../components/confirm-modal/confirm-modal.vue'
- export default {
- data() {
- return {
- barcode: '',
- container: '',
- list: [],
- range: [],
- isconfirm: false,
- types: [{
- text: '寰呰繑淇�',
- value: 1
- },
- {
- text: '寰呮姤搴�',
- value: 2
- },
- {
- text: '闄嶇骇浣跨敤',
- value: 3
- },
- {
- text: '寰呭畾',
- value: 4
- },
- ],
- }
+export default {
+ components: {
+ ConfirmModal
+ },
+ data() {
+ return {
+ barcode: '',
+ container: '',
+ list: [],
+ range: [],
+ isconfirm: false,
+ types: [
+ {
+ text: '姝ｅ父',
+ value: 1
+ },
+ {
+ text: '閿佸畾',
+ value: 0
+ }
+ ],
+ showModal: false,
+ buttonPermissions: [] // 鎸夐挳鏉冮檺鍒楄〃
+ }
+ },
+ computed: {
+ allCount() {
+ return this.list.reduce(
+ (acc, row) => (row.status == 0 ? acc + 1 : acc),
+ 0
+ )
+ }
+ },
+ mounted() {
+ this.buttonPermissions = uni.getStorageSync('buttonPermissions') || []
+ },
+ methods: {
+ // 妫�鏌ユ寜閽潈闄�
+ hasButtonPermission(route) {
+ return this.buttonPermissions.includes(route)
},
- computed: {
-
+ handleNo() {
+ this.showModal = false
},
- mounted() {},
- methods: {
- async search() {
- const {
- code,
- data,
- msg
- } = await request('/defect/' + this.barcode, {}, "post")
+ async handleYes() {
+ this.isconfirm = true
+ try {
+ const { code, data, msg } = await request(
+ '/other/inspectConfirm',
+ {
+ matnrList: this.list
+ },
+ 'post'
+ )
if (code === 200) {
- const find = this.list.find(el => el.id === data.id);
- !find && this.list.push(data)
+ uni.showToast({
+ title: '鎻愪氦鎴愬姛'
+ })
+ this.list = []
+ this.barcode = ''
+ this.container = ''
} else {
uni.showToast({
title: msg,
- icon: "none",
+ icon: 'none',
position: 'top'
})
}
- // this.list = [{
- // id: 1,
- // maktx: '鎷夋潌绠�',
- // maktxCode: '312312312',
- // asnCode: 'asn123412',
- // splrBatch: '3123123',
- // stockUnit: '涓�',
- // receiptQty: null
- // }]
- },
- async confirm() {
- // const {
- // code,
- // data,
- // msg
- // } = await request('/waitPakin/unbind', {
- // items: this.list,
- // barcode: this.container
- // })
- // if (code === 200) {
- // uni.showToast({
- // title: '鎻愪氦鎴愬姛'
- // })
- // this.list = []
- // this.barcode = ''
- // this.isconfirm = false
- // } else {
- // uni.showToast({
- // title: msg,
- // icon: "none",
- // position: 'top'
- // })
- // }
-
- },
-
+ } finally {
+ this.showModal = false
+ this.isconfirm = false
+ }
+ },
+ // 鍏抽棴AGV纭寮圭獥
+ closeModal() {
+ this.showModal = false
+ },
+ async search() {
+ const { code, data, msg } = await request(
+ '/other/inspectList',
+ {
+ containerNo: this.container,
+ matnrCode: this.barcode
+ },
+ 'post'
+ )
+ if (code === 200) {
+ this.list = data
+ } else {
+ uni.showToast({
+ title: msg,
+ icon: 'none',
+ position: 'top'
+ })
+ }
+ },
+ async confirm() {
+ if (this.allCount == 0) {
+ uni.showToast({
+ title: '娌℃湁閿佸畾鐨勬槑缁�',
+ icon: 'none',
+ position: 'top'
+ })
+ return
+ }
+ this.showModal = true
}
}
+}
</script>
<style>
- .index {
- border: 1px solid #e54d42;
- color: #e54d42;
- border-radius: 50%;
- display: block;
- width: 50rpx;
- height: 50rpx;
- line-height: 48rpx;
- text-align: center;
- margin-right: 20rpx;
- font-size: 30rpx;
- }
+.index {
+ border: 1px solid #e54d42;
+ color: #e54d42;
+ border-radius: 50%;
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ line-height: 48rpx;
+ text-align: center;
+ margin-right: 20rpx;
+ font-size: 30rpx;
+}
- .text-blue {
- color: #0081ff !important;
+.text-blue {
+ color: #0081ff !important;
+}
- }
-
- .item {
- position: relative;
- display: flex;
- min-height: 80upx;
- align-items: center;
- }
-</style>
\ No newline at end of file
+.item {
+ position: relative;
+ display: flex;
+ min-height: 80upx;
+ align-items: center;
+}
+</style>
diff --git a/pages/inspect/check.vue b/pages/inspect/check.vue
index a8ebbce..c64ce93 100644
--- a/pages/inspect/check.vue
+++ b/pages/inspect/check.vue
@@ -2,258 +2,294 @@
<view class="has-foot">
<form>
<view class="cu-form-group margin-top">
- <view class="title">瀹瑰櫒鍙�</view>
- <input placeholder="璇锋壂鎻忓鍣ㄧ紪鐮�" v-model="isptCode" focus></input>
- <text class='cuIcon-search text-blue' @click="search"></text>
+ <view class="title">鎵樼洏鐮�</view>
+ <input
+ placeholder="璇锋壂鎻忔墭鐩樼爜"
+ v-model="container"
+ focus
+ />
</view>
- <view class="cu-form-group ">
- <view class="title">鐗╂枡鍙�</view>
- <input placeholder="璇锋壂鎻忕墿鏂欑紪鐮�" v-model="barcode"></input>
- <text class='cuIcon-search text-blue' @click="scrollTo"></text>
+ <view class="cu-form-group">
+ <view class="title">鐗╂枡鏍囩</view>
+ <input
+ placeholder="璇锋壂鎻忕墿鏂欐爣绛�"
+ v-model="barcode"
+ />
+ <text
+ class="cuIcon-search text-blue"
+ @click="search"
+ ></text>
</view>
</form>
+ <view class="flex solid-bottom padding-sm justify-between">
+ <view class="text-blue">鐗╂枡绉嶇被:{{ list.length }}</view>
+ <view class="text-red">閿佸畾鏁伴噺:{{ allCount }}</view>
+ </view>
+ <view
+ class="flex solid-bottom padding-sm justify-between"
+ v-if="list.length"
+ >
+ <view class="text-blue">搴撲綅鍙�:{{ list[0].locCode }}</view>
+ </view>
- <view class="padding-lr margin-top-sm">
- <block v-for="(item, index) in list" :key="index">
- <view class="cu-list det menu sm-border margin-bottom-sm " :class="[item.matnrCode===barcode&&'act']"
- :ref="item.matnrCode+'ref'">
-
- <view class="cu-bar bg-white solid-bottom ">
- <view class="action">
- <view class="index">
- {{index+1}}
- </view>
- <view class="text-blue">
- {{`${item.maktx}`}}
- </view>
- </view>
- <view class="action">
- <text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
+ <view
+ class="cu-list det menu sm-border padding"
+ style="padding-bottom: 60px"
+ >
+ <block
+ v-for="(item, index) in list"
+ :key="index"
+ >
+ <view class="cu-bar bg-white solid-bottom margin-top-sm">
+ <view class="action">
+ <!-- <view class="index">
+ {{index+1}}
+ </view> -->
+ <view class="text-blue">
+ {{ `${item.maktx}` }}
</view>
</view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">ASN:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.asnCode}}</text>
+ <!-- <view class="action">
+ <view class="cu-tag radius bg-red">涓嶅悎鏍�</view>
+ </view> -->
+
+ <!-- <view class="action" v-if="!isconfirm">
+ <text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
+ </view> -->
+ </view>
+
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鐗╂枡缂栫爜:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.matnrCode }}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">璁″垝璺熻釜鍙�:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.platWorkCode }}</text>
+ </view>
+ </view>
+
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鍗曞彿:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.asnCode }}</text>
+ </view>
+ </view>
+
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.splrBatch }}</text>
+ </view>
+ </view>
+
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">搴撳瓨鍗曚綅:</text>
+ </view>
+ <view class="action">
+ <text class="text-grey">{{ item.stockUnit }}</text>
+ </view>
+ </view>
+
+ <!-- <view class="cu-item">
+ <view class="content">
+ <view class="cu-form-group padding-lr-0">
+ <view class="title text-blue">鏁伴噺:</view>
+ <input
+ class="text-right"
+ type="number"
+ placeholder="璇疯緭鍏ユ暟閲�"
+ v-model="item.receiptQty"
+ focus
+ />
</view>
</view>
-
- <view class="cu-item">
- <view class="content">
- <text class="text-black">渚涘簲鍟�:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.splrName}}</text>
- </view>
- </view>
-
- <view class="cu-item">
- <view class="content">
- <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.splrBatch}}</text>
- </view>
- </view>
-
-
- <view class="cu-item">
- <view class="content">
- <text class="text-black">鏀惰揣鏁伴噺: <text class="text-grey ">{{item.rcptQty}}</text></text>
- </view>
-
- <view class="content">
- <text class="text-black">閫佽揣鏁伴噺: <text class="text-grey ">{{item.dlyQty}}</text></text>
- </view>
- </view>
-
- <view class="cu-item">
- <view class="content">
- <view class="cu-form-group padding-lr-0">
- <view class="title text-blue">鍚堟牸鏁伴噺:</view>
- <input type="number" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" v-model="item.safeQty"></input>
- </view>
- </view>
- </view>
-
- <view class="cu-item">
- <view class="content">
- <view class="cu-form-group padding-lr-0">
- <view class="title text-blue">涓嶅悎鏍兼暟閲�:</view>
- <input type="number" placeholder="璇疯緭鍏ヤ笉鍚堟牸鏁伴噺" v-model="item.disQty"></input>
- </view>
- </view>
- </view>
-
- <view class="cu-item">
- <view class="content">
- <view class="cu-form-group padding-lr-0">
- <view class="title text-blue">璐ㄦ缁撹:</view>
-
- <uni-data-select placement='top' v-model="item.isptResult" :localdata="range"
- placeholder="璇疯緭鍏ヨ川妫�缁撹"></uni-data-select>
- </view>
- </view>
- </view>
-
- <view class="cu-form-group align-start">
- <view class="title text-blue">澶囨敞</view>
- <textarea v-model="item.memo" placeholder="璇疯緭鍏ュ娉�"></textarea>
- </view>
-
- <!-- <view class="cu-form-group">
- <uni-file-picker limit="9" title="鐓х墖"></uni-file-picker>
</view> -->
-
+ <view class="margin-top-sm flex">
+ <uni-data-checkbox
+ mode="tag"
+ v-model="item.status"
+ :localdata="types"
+ ></uni-data-checkbox>
</view>
</block>
</view>
+
<view class="cu-bar btn-group foot">
- <button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm">瑙ｉ攣</button>
+ <button
+ v-if="hasButtonPermission('reset')"
+ class="cu-btn text-blue line-blue shadow"
+ @click="clear"
+ >
+ 娓呯┖
+ </button>
+ <button
+ v-if="hasButtonPermission('submit')"
+ class="cu-btn bg-blue shadow-blur"
+ @click="confirm"
+ >
+ 瑙ｉ攣
+ </button>
</view>
+ <ConfirmModal
+ :visible="showModal"
+ @update:visible="showModal = $event"
+ icon="check"
+ title="瑙ｉ攣纭"
+ message="鏄惁纭畾瑙ｉ攣锛�"
+ cancelText="涓嶉渶瑕�"
+ confirmText="纭畾"
+ :isconfirm="isconfirm"
+ @cancel="handleNo"
+ @confirm="handleYes"
+ ></ConfirmModal>
</view>
</template>
<script>
- import {
- request
- } from '../../common/request.js'
- import {
- mapState,
- mapMutations,
- mapActions,
- mapGetters
- } from 'vuex';
- export default {
- data() {
- return {
- barcode: '',
- isptCode: '',
- list: [],
- range: [{
- value: '1',
- text: '鍚堟牸'
- }, {
- value: '2',
- text: '涓嶅悎鏍�'
- }, {
- value: '3',
- text: '寰呭畾'
- }, {
- value: '4',
- text: '閮ㄥ垎鍚堟牸'
- }],
- }
- },
- computed: {
- ...mapState('user', ['dynamicFields']),
- },
- mounted() {},
- methods: {
- async search() {
- const {
- code,
- data,
- msg
- } = await request('/inspect/query', {
- isptCode: this.isptCode,
- })
- if (code === 200) {
- this.list = data
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- position: 'top'
- })
+import { request } from '../../common/request.js'
+import ConfirmModal from '../../components/confirm-modal/confirm-modal.vue'
+
+export default {
+ components: {
+ ConfirmModal
+ },
+ data() {
+ return {
+ barcode: '',
+ container: '',
+ list: [],
+ range: [],
+ isconfirm: false,
+ types: [
+ {
+ text: '姝ｅ父',
+ value: 1
+ },
+ {
+ text: '閿佸畾',
+ value: 0
}
-
-
- },
- remove(index) {
- this.list.splice(index, 1);
- },
- clear() {
- this.list = []
- this.barcode = ''
- },
- scrollTo() {
- const ref = this.$refs[`${this.barcode}ref`][0];
- uni.pageScrollTo({
- scrollTop: ref.$el.offsetTop,
- duration: 300
- })
- },
- async confirm() {
- const {
- code,
- data,
- msg
- } = await request('/inspect/check/update', this.list)
+ ],
+ showModal: false,
+ buttonPermissions: [] // 鎸夐挳鏉冮檺鍒楄〃
+ }
+ },
+ computed: {
+ allCount() {
+ return this.list.reduce(
+ (acc, row) => (row.status == 0 ? acc + 1 : acc),
+ 0
+ )
+ }
+ },
+ mounted() {
+ this.buttonPermissions = uni.getStorageSync('buttonPermissions') || []
+ },
+ methods: {
+ // 妫�鏌ユ寜閽潈闄�
+ hasButtonPermission(route) {
+ return this.buttonPermissions.includes(route)
+ },
+ handleNo() {
+ this.showModal = false
+ },
+ async handleYes() {
+ this.isconfirm = true
+ try {
+ const { code, data, msg } = await request(
+ '/other/inspectConfirm2',
+ {
+ matnrList: this.list
+ },
+ 'post'
+ )
if (code === 200) {
uni.showToast({
- title: '璐ㄦ鎴愬姛'
+ title: '鎻愪氦鎴愬姛'
})
this.list = []
this.barcode = ''
+ this.container = ''
} else {
uni.showToast({
title: msg,
- icon: "none",
+ icon: 'none',
+ position: 'top'
})
}
-
-
-
- },
-
+ } finally {
+ this.showModal = false
+ this.isconfirm = false
+ }
+ },
+ // 鍏抽棴AGV纭寮圭獥
+ closeModal() {
+ this.showModal = false
+ },
+ async search() {
+ const { code, data, msg } = await request(
+ '/other/inspectList',
+ {
+ containerNo: this.container,
+ matnrCode: this.barcode
+ },
+ 'post'
+ )
+ if (code === 200) {
+ this.list = data
+ } else {
+ uni.showToast({
+ title: msg,
+ icon: 'none',
+ position: 'top'
+ })
+ }
+ },
+ async confirm() {
+ this.showModal = true
}
}
+}
</script>
<style>
- .index {
- border: 1px solid #e54d42;
- color: #e54d42;
- border-radius: 50%;
- display: block;
- width: 50rpx;
- height: 50rpx;
- line-height: 48rpx;
- text-align: center;
- margin-right: 20rpx;
- font-size: 30rpx;
- }
+.index {
+ border: 1px solid #e54d42;
+ color: #e54d42;
+ border-radius: 50%;
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ line-height: 48rpx;
+ text-align: center;
+ margin-right: 20rpx;
+ font-size: 30rpx;
+}
- .text-blue {
- color: #0081ff !important;
+.text-blue {
+ color: #0081ff !important;
+}
- }
-
- .act {
- border: 1px solid #e54d42;
- }
-
- .item {
- position: relative;
- display: flex;
- min-height: 80upx;
- align-items: center;
- }
-
- .uni-file-picker {
- width: 100%;
- margin-bottom: 10px;
- }
-
- .uni-select__selector {
- z-index: 999;
- }
-</style>
\ No newline at end of file
+.item {
+ position: relative;
+ display: flex;
+ min-height: 80upx;
+ align-items: center;
+}
+</style>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 4169310..0eaa97d 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -2,7 +2,7 @@
<view class="bodyView">
<view>
- <uni-nav-bar :fixed="true" :title="$t('page.login')" right-icon="gear" @clickRight="openSettings"></uni-nav-bar>
+ <uni-nav-bar :fixed="true" :statusBar="true" :title="$t('page.login')" right-icon="gear" @clickRight="openSettings"></uni-nav-bar>
</view>
<view class="topView">
<image src="/static/img/login_top.png" mode="aspectFill">
diff --git a/pages/other/transferView/orderDetlList.vue b/pages/other/transferView/orderDetlList.vue
new file mode 100644
index 0000000..eed2b59
--- /dev/null
+++ b/pages/other/transferView/orderDetlList.vue
@@ -0,0 +1,367 @@
+<template>
+ <view class="page-container">
+ <!-- 璁㈠崟淇℃伅澶撮儴 -->
+ <view class="order-header" v-if="order">
+ <view class="header-content">
+ <view class="header-row">
+ <text class="header-label">鍗曟嵁鍙�</text>
+ <text class="header-value">{{order.code}}</text>
+ </view>
+ <view class="header-row">
+ <text class="header-label">鍗曟嵁绫诲瀷</text>
+ <text class="header-value">{{order.wkType$ || '-'}}</text>
+ </view>
+ </view>
+ </view>
+
+ <!-- 鎼滅储妗� -->
+ <!-- <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆鐗╂枡" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+ </view> -->
+
+ <!-- 鏄庣粏鍒楄〃 -->
+ <view class="padding-lr margin-top-sm">
+ <block v-for="(item, index) in filterList" :key="index">
+ <view class="cu-list menu sm-border margin-bottom-sm" >
+ <view class="cu-bar bg-white solid-bottom">
+ <view class="action">
+ <view class="index">{{index+1}}</view>
+ <view class="text-blue">
+ 缂栫爜: {{item.matnrCode}}
+ </view>
+ </view>
+ <view class="action">
+ <text :class="getRemaining(item) > 0 ? 'text-blue' : 'text-green'">
+ {{getRemaining(item) > 0 ? '鍓╀綑 ' + getRemaining(item) : '宸插畬鎴�'}}
+ </text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鐗╂枡鍚嶇О:</text>
+ <text class="text-grey text-sm margin-left-xs">{{item.maktx || '-'}}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">瑙勬牸:</text>
+ <text class="text-grey margin-left-xs">{{item.specs || '-'}}</text>
+ </view>
+ <view class="action">
+ <text class="text-black">鎵规:</text>
+ <text class="text-grey margin-left-xs">{{item.splrBatch || '-'}}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">璁㈠崟鏁伴噺:</text>
+ <text class="text-blue margin-left-xs">{{item.anfme}}</text>
+ </view>
+ <view class="action">
+ <text class="text-black">宸插畬鎴�:</text>
+ <text class="text-green margin-left-xs">{{item.qty}}</text>
+ </view>
+ </view>
+ </view>
+ </block>
+ </view>
+
+ <!-- 绌虹姸鎬� -->
+ <view class="empty-state" v-if="filterList.length === 0 && !loading">
+ <uni-icons type="info" size="60" color="#CCCCCC"></uni-icons>
+ <text class="empty-text">鏆傛棤鏄庣粏鏁版嵁</text>
+ </view>
+
+ <!-- 缁熻淇℃伅 -->
+ <view class="stats-bar" v-if="menuList.length > 0">
+ <view class="stats-item">
+ <text class="stats-value">{{menuList.length}}</text>
+ <text class="stats-label">鎬绘槑缁�</text>
+ </view>
+ <view class="stats-divider"></view>
+ <view class="stats-item">
+ <text class="stats-value">{{pendingCount}}</text>
+ <text class="stats-label">寰呭鐞�</text>
+ </view>
+ <view class="stats-divider"></view>
+ <view class="stats-item">
+ <text class="stats-value">{{completedCount}}</text>
+ <text class="stats-label">宸插畬鎴�</text>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import { request } from '@/common/request.js'
+ export default {
+ data() {
+ return {
+ data: '',
+ condition: '',
+ menuList: [],
+ order: '',
+ loading: false,
+ }
+ },
+ computed: {
+ // 杩囨护鍚庣殑鍒楄〃锛堜紭鍏堟樉绀烘湁鍓╀綑鏁伴噺鐨勶級
+ filterList() {
+ if (!this.condition.trim()) {
+ // 鎺掑簭锛氭湁鍓╀綑鏁伴噺鐨勬帓鍓嶉潰
+ return [...this.menuList].sort((a, b) => {
+ if (a.ableQty > 0 && b.ableQty <= 0) return -1;
+ if (a.ableQty <= 0 && b.ableQty > 0) return 1;
+ return 0;
+ });
+ }
+ const keyword = this.condition.toLowerCase();
+ return this.menuList.filter(item => {
+ return (item.matnr && item.matnr.toLowerCase().includes(keyword)) ||
+ (item.maktx && item.maktx.toLowerCase().includes(keyword)) ||
+ (item.batch && item.batch.toLowerCase().includes(keyword));
+ });
+ },
+ // 寰呭鐞嗘暟閲�
+ pendingCount() {
+ return this.menuList.filter(item => item.enableQty > 0).length;
+ },
+ // 宸插畬鎴愭暟閲�
+ completedCount() {
+ return this.menuList.filter(item => item.enableQty <= 0).length;
+ }
+ },
+ onLoad() {
+ let that = this;
+ const eventChannel = this.getOpenerEventChannel();
+ if (eventChannel) {
+ eventChannel.on('data', function(data) {
+ that.order = data.data;
+ that.getOrderNoList(that.order);
+ });
+ }
+ },
+ onShow() {
+ if (this.order) {
+ this.getOrderNoList(this.order);
+ }
+ },
+ methods: {
+ // 鑾峰彇鍓╀綑鏁伴噺
+ getRemaining(item) {
+ if (item.ableQty !== undefined && item.ableQty !== null) {
+ return Number(item.ableQty);
+ }
+ // 闄嶇骇閫昏緫锛氳鍗曟暟閲� - 宸插畬鎴愭暟閲�
+ return Number(item.anfme || 0) - Number(item.qty || 0);
+ },
+ // 鎼滅储
+ async search() {
+ if (!this.condition.trim()) {
+ this.getOrderNoList(this.order);
+ return;
+ }
+ this.loading = true;
+ try {
+ const res = await request('/orderDetl/search/pda/auth', {
+ condition: this.condition,
+ order: this.order.code
+ }, 'POST', true);
+
+ if (res.code === 200) {
+ let list = res.data || [];
+ list.forEach(item => {
+ if (item.enableQty === undefined || item.enableQty === null) {
+ item.enableQty = Number(item.anfme || 0) - Number(item.qty || 0);
+ }
+ });
+ this.menuList = list;
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 鍙栨秷鎼滅储
+ onCancelSearch() {
+ this.condition = '';
+ this.getOrderNoList(this.order);
+ },
+ // 鑾峰彇璁㈠崟鏄庣粏鍒楄〃
+ async getOrderNoList(order) {
+ if (!order || !order.code) return;
+ this.loading = true;
+ try {
+ const res = await request('/orderOut/detlList', {
+ orderNo: order.code
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ let list = res.data || [];
+ list.forEach(item => {
+ if (item.enableQty === undefined || item.enableQty === null) {
+ item.enableQty = Number(item.anfme || 0) - Number(item.qty || 0);
+ }
+ });
+ this.menuList = list;
+ } else {
+ this.menuList = res.data || [];
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 閫夋嫨鏄庣粏杩涜鍑哄簱
+ chose(item) {
+ if (item.enableQty <= 0) {
+ uni.showToast({ title: '璇ユ槑缁嗗凡瀹屾垚', icon: "none", position: 'top' });
+ return;
+ }
+ let that = this;
+ uni.navigateTo({
+ url: "./outLocView",
+ success: function(res) {
+ res.eventChannel.emit('orderItem', {
+ item: item
+ });
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ // 杩斿洖鍚庡埛鏂版暟鎹�
+ },
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ /* 寮曞叆鍏叡鏍峰紡 */
+ @import url('@/static/css/common.scss');
+
+ .page-container {
+ padding-bottom: 120rpx;
+ }
+
+ /* 璁㈠崟澶撮儴 */
+ .order-header {
+ background: linear-gradient(135deg, #0081ff 0%, #1890ff 100%);
+ padding: 16rpx 20rpx;
+ }
+
+ .header-content {
+ background: rgba(255, 255, 255, 0.15);
+ border-radius: 10rpx;
+ padding: 12rpx 16rpx;
+ }
+
+ .header-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 4rpx 0;
+ }
+
+ .header-label {
+ font-size: 24rpx;
+ color: rgba(255, 255, 255, 0.7);
+ }
+
+ .header-value {
+ font-size: 26rpx;
+ color: #ffffff;
+ font-weight: 500;
+ }
+
+ /* 鎼滅储鏍� */
+ .search-bar {
+ padding: 0rpx 8rpx;
+ background: #ffffff;
+ box-shadow: 0 2rpx 8rpx rgba(0, 129, 255, 0.08);
+ }
+
+ /* 鍒楄〃鏍峰紡杩佺Щ from rece/other.vue */
+ .index {
+ border: 1px solid #e54d42;
+ color: #e54d42;
+ border-radius: 50%;
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ line-height: 48rpx;
+ text-align: center;
+ margin-right: 20rpx;
+ font-size: 30rpx;
+ }
+
+ .act {
+ border: 1px solid #e54d42;
+ }
+
+ .text-blue {
+ color: #0081ff !important;
+ }
+
+ .text-green {
+ color: #39b54a !important;
+ }
+
+ /* 绌虹姸鎬� */
+ .empty-state {
+ padding: 60rpx 0;
+ }
+
+ .empty-text {
+ margin-top: 20rpx;
+ }
+
+ /* 缁熻鏍� */
+ .stats-bar {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ background: #ffffff;
+ padding: 16rpx 0;
+ box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.06);
+ }
+
+ .stats-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ flex: 1;
+ }
+
+ .stats-value {
+ font-size: 32rpx;
+ color: #303133;
+ font-weight: 600;
+ }
+
+ .stats-label {
+ font-size: 20rpx;
+ color: #909399;
+ margin-top: 4rpx;
+ }
+
+ .stats-divider {
+ width: 1rpx;
+ height: 50rpx;
+ background: #e8e8e8;
+ }
+</style>
diff --git a/pages/other/transferView/orderList.vue b/pages/other/transferView/orderList.vue
new file mode 100644
index 0000000..22371d2
--- /dev/null
+++ b/pages/other/transferView/orderList.vue
@@ -0,0 +1,388 @@
+<template>
+ <view class="page-container">
+ <!-- 鎼滅储妗� -->
+ <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+ </view>
+
+ <!-- 璁㈠崟鍒楄〃 -->
+ <view class="order-list">
+ <view class="order-card" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+ <!-- 鍗＄墖澶撮儴 -->
+ <view class="card-header">
+ <view class="order-badge" :class="getSettleClass(item.exceStatus)">
+ <text class="badge-text">{{item.exceStatus$ || '鏈煡'}}</text>
+ </view>
+ <view class="order-no">
+ <text class="order-no-label">鍗曟嵁鍙�</text>
+ <text class="order-no-value">{{item.code}}</text>
+ </view>
+ </view>
+
+ <!-- 鍗＄墖鍐呭 -->
+ <view class="card-body">
+ <view class="info-row">
+ <view class="info-item">
+ <text class="info-label">鍗曟嵁绫诲瀷</text>
+ <text class="info-value">{{item.wkType$ || '-'}}</text>
+ </view>
+ <!-- <view class="info-item">
+ <text class="info-label">搴斿嚭鏁伴噺</text>
+ <text class="info-value">{{item.anfme || '-'}}</text>
+ </view> -->
+ </view>
+ <view class="info-row">
+ <view class="info-item">
+ <text class="info-label">搴斿嚭鏁伴噺</text>
+ <text class="info-value">{{item.anfme || '-'}}</text>
+ </view>
+ <view class="info-item">
+ <text class="info-label">瀹屾垚鏁伴噺</text>
+ <text class="info-value">{{item.qty || '-'}}</text>
+ </view>
+ </view>
+ </view>
+
+
+ <!-- 鍗＄墖搴曢儴 -->
+ <view class="card-footer">
+ <text class="view-detail">鏌ョ湅璇︽儏</text>
+ <uni-icons type="right" size="14" color="#999"></uni-icons>
+ </view>
+ </view>
+ </view>
+
+ <!-- 绌虹姸鎬� -->
+ <view class="empty-state" v-if="matList.length === 0 && !loading">
+ <uni-icons type="search" size="60" color="#CCCCCC"></uni-icons>
+ <text class="empty-text">鏆傛棤璁㈠崟鏁版嵁</text>
+ <text class="empty-hint">涓嬫媺鍒锋柊璇曡瘯</text>
+ </view>
+
+ <!-- 鍔犺浇鏇村 -->
+ <uni-load-more v-show="matList.length !== 0" :status="status" :icon-size="16" :content-text="contentText" />
+ </view>
+</template>
+
+<script>
+ import { request } from '@/common/request.js'
+ export default {
+ data() {
+ return {
+ tagList: [],
+ matList: [],
+ condition: '',
+ loading: false,
+ curr: 1,
+ limit:5,
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1,
+ orderTypeId:''
+ }
+ },
+ // 涓嬫媺鍒锋柊
+ onPullDownRefresh() {
+ this.refreshData();
+ },
+ // 涓婃媺鍔犺浇鏇村
+ onReachBottom() {
+ if (this.status !== 'noMore') {
+ this.status = 'loading';
+ this.loadMoreData();
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ if (eventChannel) {
+ eventChannel.on('orderTypeId', function(data) {
+ that.orderTypeId = data.orderTypeId
+ console.log(data)
+ })
+ }
+ },
+ onShow() {
+ // 姣忔杩涘叆椤甸潰閲嶆柊鍔犺浇
+ this.refreshData();
+ },
+ methods: {
+ // 鍒锋柊鏁版嵁
+ refreshData() {
+ this.curr = 1;
+ this.matList = [];
+ this.status = 'more';
+ this.loading = true;
+ this.fetchOrderList(true);
+ },
+ // 鍔犺浇鏇村鏁版嵁
+ loadMoreData() {
+ this.fetchOrderList(false);
+ },
+ // 鑾峰彇璁㈠崟鍒楄〃
+ async fetchOrderList(isRefresh) {
+ try {
+ const res = await request('/other/transferPage', {
+ curr: this.curr,
+ limit: this.limit,
+ orderNo: this.condition,
+ orderType: this.orderTypeId
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ let records = res.data.records || [];
+ if (records.length > 0) {
+ if (isRefresh) {
+ this.matList = records;
+ } else {
+ this.matList = this.matList.concat(records);
+ }
+ this.curr = this.curr + 1;
+ this.status = 'more';
+ } else {
+ this.status = 'noMore';
+ }
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ uni.stopPullDownRefresh();
+ }
+ },
+ // 鎼滅储
+ async search() {
+ if (!this.condition.trim()) {
+ this.refreshData();
+ return;
+ }
+ this.loading = true;
+ try {
+ const res = await request('/other/transferPage', {
+ curr: this.curr,
+ limit: this.limit,
+ orderNo: this.condition
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ this.matList = res.data || [];
+ this.status = 'noMore';
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 鍙栨秷鎼滅储
+ onCancelSearch() {
+ this.condition = '';
+ this.refreshData();
+ },
+ // 鏍规嵁鐘舵�佽繑鍥炴牱寮忕被鍚�
+ getSettleClass(settle) {
+ // settle: 1-寰呭鐞�, 2-澶勭悊涓�, 3-宸插畬鎴�, 4-宸插彇娑� (鏍规嵁瀹為檯鎯呭喌璋冩暣)
+ const classMap = {
+ 1: 'badge-pending',
+ 2: 'badge-processing',
+ 3: 'badge-completed',
+ 4: 'badge-cancelled'
+ };
+ return classMap[settle] || 'badge-default';
+ },
+ // 璺宠浆鍒拌鍗曡鎯�
+ toPrint(item) {
+ let that = this;
+ uni.navigateTo({
+ url: "./orderDetlList",
+ success: function(res) {
+ res.eventChannel.emit('data', {
+ data: item
+ });
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data;
+ that.findMat(that.matnr);
+ },
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('@/static/css/wms.css/wms.css');
+
+ .page-container {
+ min-height: 100vh;
+ background: #f5f7fa;
+ padding-bottom: 20rpx;
+ }
+
+ .search-bar {
+ padding: 0rpx 8rpx;
+ background: #ffffff;
+ box-shadow: 0 2rpx 12rpx rgba(0, 129, 255, 0.08);
+ }
+
+ .order-list {
+ padding: 0 24rpx;
+ }
+
+ .order-card {
+ background: #ffffff;
+ border-radius: 16rpx;
+ margin-top: 20rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 129, 255, 0.1);
+ overflow: hidden;
+ transition: transform 0.2s ease, box-shadow 0.2s ease;
+ border: 1rpx solid #e4e7ed;
+ }
+
+ .order-card:active {
+ transform: scale(0.98);
+ box-shadow: 0 2rpx 10rpx rgba(0, 129, 255, 0.15);
+ }
+
+ .card-header {
+ display: flex;
+ align-items: center;
+ padding: 24rpx 28rpx;
+ background: linear-gradient(135deg, #0081ff 0%, #1890ff 100%);
+ }
+
+ .order-badge {
+ padding: 6rpx 16rpx;
+ border-radius: 20rpx;
+ margin-right: 20rpx;
+ }
+
+ .badge-text {
+ font-size: 22rpx;
+ font-weight: 500;
+ color: #ffffff;
+ }
+
+ /* 鐘舵�佸窘绔犻鑹� */
+ .badge-pending {
+ background: rgba(255, 255, 255, 0.3);
+ }
+
+ .badge-processing {
+ background: #ffc107;
+ }
+
+ .badge-completed {
+ background: #28a745;
+ }
+
+ .badge-cancelled {
+ background: #dc3545;
+ }
+
+ .badge-default {
+ background: rgba(255, 255, 255, 0.25);
+ }
+
+ .order-no {
+ flex: 1;
+ }
+
+ .order-no-label {
+ font-size: 22rpx;
+ color: rgba(255, 255, 255, 0.7);
+ display: block;
+ }
+
+ .order-no-value {
+ font-size: 28rpx;
+ color: #ffffff;
+ font-weight: 600;
+ display: block;
+ margin-top: 4rpx;
+ }
+
+ .card-body {
+ padding: 24rpx 28rpx;
+ }
+
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ }
+
+ .info-item {
+ width: 50%;
+ margin-bottom: 16rpx;
+ }
+
+ .info-label {
+ font-size: 24rpx;
+ color: #909399;
+ display: block;
+ }
+
+ .info-value {
+ font-size: 28rpx;
+ color: #303133;
+ font-weight: 500;
+ display: block;
+ margin-top: 6rpx;
+ }
+
+ .card-footer {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ padding: 20rpx 28rpx;
+ border-top: 1rpx solid #f0f0f0;
+ }
+
+ .view-detail {
+ font-size: 26rpx;
+ color: #909399;
+ margin-right: 8rpx;
+ }
+
+ /* 绌虹姸鎬� */
+ .empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 120rpx 0;
+ }
+
+ .empty-text {
+ font-size: 30rpx;
+ color: #909399;
+ margin-top: 30rpx;
+ }
+
+ .empty-hint {
+ font-size: 24rpx;
+ color: #c0c4cc;
+ margin-top: 12rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/outbound/orderOut/orderList.vue b/pages/outbound/orderOut/orderList.vue
index 3e6ad39..60aa96b 100644
--- a/pages/outbound/orderOut/orderList.vue
+++ b/pages/outbound/orderOut/orderList.vue
@@ -130,7 +130,8 @@
const res = await request('/orderOut/list', {
curr: this.curr,
limit: this.limit,
- orderNo: this.condition
+ orderNo: this.condition,
+ orderType: this.orderTypeId
}, 'GET', true);
if (res.code === 200) {
diff --git a/pages/outbound/orderOut/order_out_type.vue b/pages/outbound/orderOut/order_out_type.vue
index 11747cb..e95c0c8 100644
--- a/pages/outbound/orderOut/order_out_type.vue
+++ b/pages/outbound/orderOut/order_out_type.vue
@@ -82,7 +82,7 @@
color: this.colorList[index],
cuIcon: 'round',
url: `/outbound/orderOut/orderList`,
- id: item.id
+ id: item.value
})
})
} else {
diff --git a/pages/outbound/orderOutView/orderDetlList.vue b/pages/outbound/orderOutView/orderDetlList.vue
new file mode 100644
index 0000000..eed2b59
--- /dev/null
+++ b/pages/outbound/orderOutView/orderDetlList.vue
@@ -0,0 +1,367 @@
+<template>
+ <view class="page-container">
+ <!-- 璁㈠崟淇℃伅澶撮儴 -->
+ <view class="order-header" v-if="order">
+ <view class="header-content">
+ <view class="header-row">
+ <text class="header-label">鍗曟嵁鍙�</text>
+ <text class="header-value">{{order.code}}</text>
+ </view>
+ <view class="header-row">
+ <text class="header-label">鍗曟嵁绫诲瀷</text>
+ <text class="header-value">{{order.wkType$ || '-'}}</text>
+ </view>
+ </view>
+ </view>
+
+ <!-- 鎼滅储妗� -->
+ <!-- <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆鐗╂枡" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+ </view> -->
+
+ <!-- 鏄庣粏鍒楄〃 -->
+ <view class="padding-lr margin-top-sm">
+ <block v-for="(item, index) in filterList" :key="index">
+ <view class="cu-list menu sm-border margin-bottom-sm" >
+ <view class="cu-bar bg-white solid-bottom">
+ <view class="action">
+ <view class="index">{{index+1}}</view>
+ <view class="text-blue">
+ 缂栫爜: {{item.matnrCode}}
+ </view>
+ </view>
+ <view class="action">
+ <text :class="getRemaining(item) > 0 ? 'text-blue' : 'text-green'">
+ {{getRemaining(item) > 0 ? '鍓╀綑 ' + getRemaining(item) : '宸插畬鎴�'}}
+ </text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">鐗╂枡鍚嶇О:</text>
+ <text class="text-grey text-sm margin-left-xs">{{item.maktx || '-'}}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">瑙勬牸:</text>
+ <text class="text-grey margin-left-xs">{{item.specs || '-'}}</text>
+ </view>
+ <view class="action">
+ <text class="text-black">鎵规:</text>
+ <text class="text-grey margin-left-xs">{{item.splrBatch || '-'}}</text>
+ </view>
+ </view>
+ <view class="cu-item">
+ <view class="content">
+ <text class="text-black">璁㈠崟鏁伴噺:</text>
+ <text class="text-blue margin-left-xs">{{item.anfme}}</text>
+ </view>
+ <view class="action">
+ <text class="text-black">宸插畬鎴�:</text>
+ <text class="text-green margin-left-xs">{{item.qty}}</text>
+ </view>
+ </view>
+ </view>
+ </block>
+ </view>
+
+ <!-- 绌虹姸鎬� -->
+ <view class="empty-state" v-if="filterList.length === 0 && !loading">
+ <uni-icons type="info" size="60" color="#CCCCCC"></uni-icons>
+ <text class="empty-text">鏆傛棤鏄庣粏鏁版嵁</text>
+ </view>
+
+ <!-- 缁熻淇℃伅 -->
+ <view class="stats-bar" v-if="menuList.length > 0">
+ <view class="stats-item">
+ <text class="stats-value">{{menuList.length}}</text>
+ <text class="stats-label">鎬绘槑缁�</text>
+ </view>
+ <view class="stats-divider"></view>
+ <view class="stats-item">
+ <text class="stats-value">{{pendingCount}}</text>
+ <text class="stats-label">寰呭鐞�</text>
+ </view>
+ <view class="stats-divider"></view>
+ <view class="stats-item">
+ <text class="stats-value">{{completedCount}}</text>
+ <text class="stats-label">宸插畬鎴�</text>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+ import { request } from '@/common/request.js'
+ export default {
+ data() {
+ return {
+ data: '',
+ condition: '',
+ menuList: [],
+ order: '',
+ loading: false,
+ }
+ },
+ computed: {
+ // 杩囨护鍚庣殑鍒楄〃锛堜紭鍏堟樉绀烘湁鍓╀綑鏁伴噺鐨勶級
+ filterList() {
+ if (!this.condition.trim()) {
+ // 鎺掑簭锛氭湁鍓╀綑鏁伴噺鐨勬帓鍓嶉潰
+ return [...this.menuList].sort((a, b) => {
+ if (a.ableQty > 0 && b.ableQty <= 0) return -1;
+ if (a.ableQty <= 0 && b.ableQty > 0) return 1;
+ return 0;
+ });
+ }
+ const keyword = this.condition.toLowerCase();
+ return this.menuList.filter(item => {
+ return (item.matnr && item.matnr.toLowerCase().includes(keyword)) ||
+ (item.maktx && item.maktx.toLowerCase().includes(keyword)) ||
+ (item.batch && item.batch.toLowerCase().includes(keyword));
+ });
+ },
+ // 寰呭鐞嗘暟閲�
+ pendingCount() {
+ return this.menuList.filter(item => item.enableQty > 0).length;
+ },
+ // 宸插畬鎴愭暟閲�
+ completedCount() {
+ return this.menuList.filter(item => item.enableQty <= 0).length;
+ }
+ },
+ onLoad() {
+ let that = this;
+ const eventChannel = this.getOpenerEventChannel();
+ if (eventChannel) {
+ eventChannel.on('data', function(data) {
+ that.order = data.data;
+ that.getOrderNoList(that.order);
+ });
+ }
+ },
+ onShow() {
+ if (this.order) {
+ this.getOrderNoList(this.order);
+ }
+ },
+ methods: {
+ // 鑾峰彇鍓╀綑鏁伴噺
+ getRemaining(item) {
+ if (item.ableQty !== undefined && item.ableQty !== null) {
+ return Number(item.ableQty);
+ }
+ // 闄嶇骇閫昏緫锛氳鍗曟暟閲� - 宸插畬鎴愭暟閲�
+ return Number(item.anfme || 0) - Number(item.qty || 0);
+ },
+ // 鎼滅储
+ async search() {
+ if (!this.condition.trim()) {
+ this.getOrderNoList(this.order);
+ return;
+ }
+ this.loading = true;
+ try {
+ const res = await request('/orderDetl/search/pda/auth', {
+ condition: this.condition,
+ order: this.order.code
+ }, 'POST', true);
+
+ if (res.code === 200) {
+ let list = res.data || [];
+ list.forEach(item => {
+ if (item.enableQty === undefined || item.enableQty === null) {
+ item.enableQty = Number(item.anfme || 0) - Number(item.qty || 0);
+ }
+ });
+ this.menuList = list;
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 鍙栨秷鎼滅储
+ onCancelSearch() {
+ this.condition = '';
+ this.getOrderNoList(this.order);
+ },
+ // 鑾峰彇璁㈠崟鏄庣粏鍒楄〃
+ async getOrderNoList(order) {
+ if (!order || !order.code) return;
+ this.loading = true;
+ try {
+ const res = await request('/orderOut/detlList', {
+ orderNo: order.code
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ let list = res.data || [];
+ list.forEach(item => {
+ if (item.enableQty === undefined || item.enableQty === null) {
+ item.enableQty = Number(item.anfme || 0) - Number(item.qty || 0);
+ }
+ });
+ this.menuList = list;
+ } else {
+ this.menuList = res.data || [];
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 閫夋嫨鏄庣粏杩涜鍑哄簱
+ chose(item) {
+ if (item.enableQty <= 0) {
+ uni.showToast({ title: '璇ユ槑缁嗗凡瀹屾垚', icon: "none", position: 'top' });
+ return;
+ }
+ let that = this;
+ uni.navigateTo({
+ url: "./outLocView",
+ success: function(res) {
+ res.eventChannel.emit('orderItem', {
+ item: item
+ });
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ // 杩斿洖鍚庡埛鏂版暟鎹�
+ },
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ /* 寮曞叆鍏叡鏍峰紡 */
+ @import url('@/static/css/common.scss');
+
+ .page-container {
+ padding-bottom: 120rpx;
+ }
+
+ /* 璁㈠崟澶撮儴 */
+ .order-header {
+ background: linear-gradient(135deg, #0081ff 0%, #1890ff 100%);
+ padding: 16rpx 20rpx;
+ }
+
+ .header-content {
+ background: rgba(255, 255, 255, 0.15);
+ border-radius: 10rpx;
+ padding: 12rpx 16rpx;
+ }
+
+ .header-row {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 4rpx 0;
+ }
+
+ .header-label {
+ font-size: 24rpx;
+ color: rgba(255, 255, 255, 0.7);
+ }
+
+ .header-value {
+ font-size: 26rpx;
+ color: #ffffff;
+ font-weight: 500;
+ }
+
+ /* 鎼滅储鏍� */
+ .search-bar {
+ padding: 0rpx 8rpx;
+ background: #ffffff;
+ box-shadow: 0 2rpx 8rpx rgba(0, 129, 255, 0.08);
+ }
+
+ /* 鍒楄〃鏍峰紡杩佺Щ from rece/other.vue */
+ .index {
+ border: 1px solid #e54d42;
+ color: #e54d42;
+ border-radius: 50%;
+ display: block;
+ width: 50rpx;
+ height: 50rpx;
+ line-height: 48rpx;
+ text-align: center;
+ margin-right: 20rpx;
+ font-size: 30rpx;
+ }
+
+ .act {
+ border: 1px solid #e54d42;
+ }
+
+ .text-blue {
+ color: #0081ff !important;
+ }
+
+ .text-green {
+ color: #39b54a !important;
+ }
+
+ /* 绌虹姸鎬� */
+ .empty-state {
+ padding: 60rpx 0;
+ }
+
+ .empty-text {
+ margin-top: 20rpx;
+ }
+
+ /* 缁熻鏍� */
+ .stats-bar {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-around;
+ background: #ffffff;
+ padding: 16rpx 0;
+ box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.06);
+ }
+
+ .stats-item {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ flex: 1;
+ }
+
+ .stats-value {
+ font-size: 32rpx;
+ color: #303133;
+ font-weight: 600;
+ }
+
+ .stats-label {
+ font-size: 20rpx;
+ color: #909399;
+ margin-top: 4rpx;
+ }
+
+ .stats-divider {
+ width: 1rpx;
+ height: 50rpx;
+ background: #e8e8e8;
+ }
+</style>
diff --git a/pages/outbound/orderOutView/orderList.vue b/pages/outbound/orderOutView/orderList.vue
new file mode 100644
index 0000000..60aa96b
--- /dev/null
+++ b/pages/outbound/orderOutView/orderList.vue
@@ -0,0 +1,388 @@
+<template>
+ <view class="page-container">
+ <!-- 鎼滅储妗� -->
+ <view class="search-bar">
+ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#F5F5F5" @confirm="search" @cancel="onCancelSearch" />
+ </view>
+
+ <!-- 璁㈠崟鍒楄〃 -->
+ <view class="order-list">
+ <view class="order-card" v-for="(item,i) in matList" :key="i" @click="toPrint(item)">
+ <!-- 鍗＄墖澶撮儴 -->
+ <view class="card-header">
+ <view class="order-badge" :class="getSettleClass(item.exceStatus)">
+ <text class="badge-text">{{item.exceStatus$ || '鏈煡'}}</text>
+ </view>
+ <view class="order-no">
+ <text class="order-no-label">鍗曟嵁鍙�</text>
+ <text class="order-no-value">{{item.code}}</text>
+ </view>
+ </view>
+
+ <!-- 鍗＄墖鍐呭 -->
+ <view class="card-body">
+ <view class="info-row">
+ <view class="info-item">
+ <text class="info-label">鍗曟嵁绫诲瀷</text>
+ <text class="info-value">{{item.wkType$ || '-'}}</text>
+ </view>
+ <!-- <view class="info-item">
+ <text class="info-label">搴斿嚭鏁伴噺</text>
+ <text class="info-value">{{item.anfme || '-'}}</text>
+ </view> -->
+ </view>
+ <view class="info-row">
+ <view class="info-item">
+ <text class="info-label">搴斿嚭鏁伴噺</text>
+ <text class="info-value">{{item.anfme || '-'}}</text>
+ </view>
+ <view class="info-item">
+ <text class="info-label">瀹屾垚鏁伴噺</text>
+ <text class="info-value">{{item.qty || '-'}}</text>
+ </view>
+ </view>
+ </view>
+
+
+ <!-- 鍗＄墖搴曢儴 -->
+ <view class="card-footer">
+ <text class="view-detail">鏌ョ湅璇︽儏</text>
+ <uni-icons type="right" size="14" color="#999"></uni-icons>
+ </view>
+ </view>
+ </view>
+
+ <!-- 绌虹姸鎬� -->
+ <view class="empty-state" v-if="matList.length === 0 && !loading">
+ <uni-icons type="search" size="60" color="#CCCCCC"></uni-icons>
+ <text class="empty-text">鏆傛棤璁㈠崟鏁版嵁</text>
+ <text class="empty-hint">涓嬫媺鍒锋柊璇曡瘯</text>
+ </view>
+
+ <!-- 鍔犺浇鏇村 -->
+ <uni-load-more v-show="matList.length !== 0" :status="status" :icon-size="16" :content-text="contentText" />
+ </view>
+</template>
+
+<script>
+ import { request } from '@/common/request.js'
+ export default {
+ data() {
+ return {
+ tagList: [],
+ matList: [],
+ condition: '',
+ loading: false,
+ curr: 1,
+ limit:5,
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1,
+ orderTypeId:''
+ }
+ },
+ // 涓嬫媺鍒锋柊
+ onPullDownRefresh() {
+ this.refreshData();
+ },
+ // 涓婃媺鍔犺浇鏇村
+ onReachBottom() {
+ if (this.status !== 'noMore') {
+ this.status = 'loading';
+ this.loadMoreData();
+ }
+ },
+ onLoad() {
+ let that = this
+ const eventChannel = this.getOpenerEventChannel();
+ if (eventChannel) {
+ eventChannel.on('orderTypeId', function(data) {
+ that.orderTypeId = data.orderTypeId
+ console.log(data)
+ })
+ }
+ },
+ onShow() {
+ // 姣忔杩涘叆椤甸潰閲嶆柊鍔犺浇
+ this.refreshData();
+ },
+ methods: {
+ // 鍒锋柊鏁版嵁
+ refreshData() {
+ this.curr = 1;
+ this.matList = [];
+ this.status = 'more';
+ this.loading = true;
+ this.fetchOrderList(true);
+ },
+ // 鍔犺浇鏇村鏁版嵁
+ loadMoreData() {
+ this.fetchOrderList(false);
+ },
+ // 鑾峰彇璁㈠崟鍒楄〃
+ async fetchOrderList(isRefresh) {
+ try {
+ const res = await request('/orderOut/list', {
+ curr: this.curr,
+ limit: this.limit,
+ orderNo: this.condition,
+ orderType: this.orderTypeId
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ let records = res.data.records || [];
+ if (records.length > 0) {
+ if (isRefresh) {
+ this.matList = records;
+ } else {
+ this.matList = this.matList.concat(records);
+ }
+ this.curr = this.curr + 1;
+ this.status = 'more';
+ } else {
+ this.status = 'noMore';
+ }
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ uni.stopPullDownRefresh();
+ }
+ },
+ // 鎼滅储
+ async search() {
+ if (!this.condition.trim()) {
+ this.refreshData();
+ return;
+ }
+ this.loading = true;
+ try {
+ const res = await request('/orderOut/list', {
+ curr: this.curr,
+ limit: this.limit,
+ orderNo: this.condition
+ }, 'GET', true);
+
+ if (res.code === 200) {
+ this.matList = res.data || [];
+ this.status = 'noMore';
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ setTimeout(() => {
+ uni.reLaunch({ url: '../login/login' });
+ }, 1000);
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' });
+ }
+ } catch (err) {
+ // request.js 宸茬粡澶勭悊浜嗛敊璇彁绀�
+ } finally {
+ this.loading = false;
+ }
+ },
+ // 鍙栨秷鎼滅储
+ onCancelSearch() {
+ this.condition = '';
+ this.refreshData();
+ },
+ // 鏍规嵁鐘舵�佽繑鍥炴牱寮忕被鍚�
+ getSettleClass(settle) {
+ // settle: 1-寰呭鐞�, 2-澶勭悊涓�, 3-宸插畬鎴�, 4-宸插彇娑� (鏍规嵁瀹為檯鎯呭喌璋冩暣)
+ const classMap = {
+ 1: 'badge-pending',
+ 2: 'badge-processing',
+ 3: 'badge-completed',
+ 4: 'badge-cancelled'
+ };
+ return classMap[settle] || 'badge-default';
+ },
+ // 璺宠浆鍒拌鍗曡鎯�
+ toPrint(item) {
+ let that = this;
+ uni.navigateTo({
+ url: "./orderDetlList",
+ success: function(res) {
+ res.eventChannel.emit('data', {
+ data: item
+ });
+ },
+ events: {
+ acceptDataFromOpenedPage: function(data) {
+ that.matnr = data.data;
+ that.findMat(that.matnr);
+ },
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+ @import url('@/static/css/wms.css/wms.css');
+
+ .page-container {
+ min-height: 100vh;
+ background: #f5f7fa;
+ padding-bottom: 20rpx;
+ }
+
+ .search-bar {
+ padding: 0rpx 8rpx;
+ background: #ffffff;
+ box-shadow: 0 2rpx 12rpx rgba(0, 129, 255, 0.08);
+ }
+
+ .order-list {
+ padding: 0 24rpx;
+ }
+
+ .order-card {
+ background: #ffffff;
+ border-radius: 16rpx;
+ margin-top: 20rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 129, 255, 0.1);
+ overflow: hidden;
+ transition: transform 0.2s ease, box-shadow 0.2s ease;
+ border: 1rpx solid #e4e7ed;
+ }
+
+ .order-card:active {
+ transform: scale(0.98);
+ box-shadow: 0 2rpx 10rpx rgba(0, 129, 255, 0.15);
+ }
+
+ .card-header {
+ display: flex;
+ align-items: center;
+ padding: 24rpx 28rpx;
+ background: linear-gradient(135deg, #0081ff 0%, #1890ff 100%);
+ }
+
+ .order-badge {
+ padding: 6rpx 16rpx;
+ border-radius: 20rpx;
+ margin-right: 20rpx;
+ }
+
+ .badge-text {
+ font-size: 22rpx;
+ font-weight: 500;
+ color: #ffffff;
+ }
+
+ /* 鐘舵�佸窘绔犻鑹� */
+ .badge-pending {
+ background: rgba(255, 255, 255, 0.3);
+ }
+
+ .badge-processing {
+ background: #ffc107;
+ }
+
+ .badge-completed {
+ background: #28a745;
+ }
+
+ .badge-cancelled {
+ background: #dc3545;
+ }
+
+ .badge-default {
+ background: rgba(255, 255, 255, 0.25);
+ }
+
+ .order-no {
+ flex: 1;
+ }
+
+ .order-no-label {
+ font-size: 22rpx;
+ color: rgba(255, 255, 255, 0.7);
+ display: block;
+ }
+
+ .order-no-value {
+ font-size: 28rpx;
+ color: #ffffff;
+ font-weight: 600;
+ display: block;
+ margin-top: 4rpx;
+ }
+
+ .card-body {
+ padding: 24rpx 28rpx;
+ }
+
+ .info-row {
+ display: flex;
+ flex-wrap: wrap;
+ }
+
+ .info-item {
+ width: 50%;
+ margin-bottom: 16rpx;
+ }
+
+ .info-label {
+ font-size: 24rpx;
+ color: #909399;
+ display: block;
+ }
+
+ .info-value {
+ font-size: 28rpx;
+ color: #303133;
+ font-weight: 500;
+ display: block;
+ margin-top: 6rpx;
+ }
+
+ .card-footer {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ padding: 20rpx 28rpx;
+ border-top: 1rpx solid #f0f0f0;
+ }
+
+ .view-detail {
+ font-size: 26rpx;
+ color: #909399;
+ margin-right: 8rpx;
+ }
+
+ /* 绌虹姸鎬� */
+ .empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 120rpx 0;
+ }
+
+ .empty-text {
+ font-size: 30rpx;
+ color: #909399;
+ margin-top: 30rpx;
+ }
+
+ .empty-hint {
+ font-size: 24rpx;
+ color: #c0c4cc;
+ margin-top: 12rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/outbound/orderOutView/order_out_type.vue b/pages/outbound/orderOutView/order_out_type.vue
new file mode 100644
index 0000000..b594865
--- /dev/null
+++ b/pages/outbound/orderOutView/order_out_type.vue
@@ -0,0 +1,250 @@
+<template>
+ <view>
+ <scroll-view
+ scroll-y
+ class="page"
+ >
+ <view class="list-container">
+ <view
+ class="list-item"
+ @click="toPage(item)"
+ :class="'bg-' + item.color"
+ :style="[
+ { animation: 'show ' + ((index + 1) * 0.2 + 1) + 's 1' }
+ ]"
+ v-for="(item, index) in elements"
+ :key="index"
+ >
+ <view class="item-icon">
+ <text :class="'cuIcon-' + item.cuIcon"></text>
+ </view>
+ <view class="item-content">
+ <view class="item-title">{{ item.title }}</view>
+ <view class="item-desc">{{ item.name }}</view>
+ </view>
+ <view class="item-arrow">
+ <text class="cuIcon-right"></text>
+ </view>
+ </view>
+ </view>
+ <view class="cu-tabbar-height"></view>
+ </scroll-view>
+ </view>
+</template>
+
+<script>
+import { request } from '@/common/request.js'
+export default {
+ data() {
+ return {
+ buttonPermissions: [],
+ elements: [
+
+ ],
+ colorList: [
+ 'cyan',
+ 'blue',
+ 'purple',
+ 'mauve',
+ 'pink',
+ 'brown',
+ 'red',
+ 'orange',
+ 'yellow',
+ 'olive'
+ ]
+ }
+ },
+ onLoad(option) {
+ this.backGroundRepeat()
+ },
+ mounted() {
+ // 鑾峰彇鎸夐挳鏉冮檺
+ this.buttonPermissions = uni.getStorageSync('buttonPermissions') || []
+ console.log('褰撳墠椤甸潰鎸夐挳鏉冮檺:', this.buttonPermissions)
+ this.getType(this.buttonPermissions)
+ },
+ methods: {
+ async getType(type) {
+ const { code, data, msg } = await request(
+ '/orderOut/getType',
+ {
+ type
+ },
+ 'post'
+ )
+ if (code === 200) {
+ data.map((item,index) => {
+ console.log(item,index)
+ this.elements.unshift({
+ title: item.label,
+ name: '',
+ color: this.colorList[index],
+ cuIcon: 'round',
+ url: `/outbound/orderOutView/orderList`,
+ id: item.value
+ })
+ })
+ } else {
+ uni.showToast({
+ title: msg,
+ icon: 'none',
+ position: 'top'
+ })
+ }
+ },
+ backGroundRepeat() {
+ let len = this.colorList.length
+ let i = 0
+ for (let k in this.elements) {
+ if (i == len) {
+ i = 0
+ }
+ this.elements[k].color = this.colorList[i]
+ i++
+ }
+ },
+ toPage(item) {
+ console.log(item)
+ uni.navigateTo({
+ url: `/pages${item.url}`,
+ success(res) {
+ res.eventChannel.emit('orderTypeId', {
+ orderTypeId: item.id
+ })
+ }
+ })
+ }
+ }
+}
+</script>
+
+<style>
+.page {
+ height: 100vh;
+ background-color: #f5f5f5;
+}
+
+.list-container {
+ padding: 20rpx 30rpx;
+}
+
+.list-item {
+ display: flex;
+ align-items: center;
+ padding: 30rpx;
+ margin-bottom: 20rpx;
+ border-radius: 16rpx;
+ box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
+}
+
+.item-icon {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ background-color: rgba(255, 255, 255, 0.3);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 24rpx;
+}
+
+.item-icon text {
+ font-size: 40rpx;
+}
+
+.item-content {
+ flex: 1;
+}
+
+.item-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ margin-bottom: 8rpx;
+}
+
+.item-desc {
+ font-size: 24rpx;
+ opacity: 0.8;
+}
+
+.item-arrow {
+ font-size: 32rpx;
+ opacity: 0.6;
+}
+
+.bg-red {
+ background-color: #e54d42;
+ color: #ffffff;
+}
+
+.bg-orange {
+ background-color: #f37b1d;
+ color: #ffffff;
+}
+
+.bg-yellow {
+ background-color: #fbbd08;
+ color: #333333;
+}
+
+.bg-olive {
+ background-color: #8dc63f;
+ color: #ffffff;
+}
+
+.bg-green {
+ background-color: #39b54a;
+ color: #ffffff;
+}
+
+.bg-cyan {
+ background-color: #1cbbb4;
+ color: #ffffff;
+}
+
+.bg-blue {
+ background-color: #0081ff;
+ color: #ffffff;
+}
+
+.bg-purple {
+ background-color: #6739b6;
+ color: #ffffff;
+}
+
+.bg-mauve {
+ background-color: #9c26b0;
+ color: #ffffff;
+}
+
+.bg-pink {
+ background-color: #e03997;
+ color: #ffffff;
+}
+
+.bg-brown {
+ background-color: #a5673f;
+ color: #ffffff;
+}
+
+.bg-grey {
+ background-color: #8799a3;
+ color: #ffffff;
+}
+
+.bg-gray {
+ background-color: #f0f0f0;
+ color: #333333;
+}
+
+.bg-black {
+ background-color: #333333;
+ color: #ffffff;
+}
+
+.bg-white {
+ background-color: #ffffff;
+ color: #666666;
+}
+</style>
diff --git a/pages/phyz/AGV/AGVPakin.vue b/pages/phyz/AGV/AGVPakin.vue
deleted file mode 100644
index 15ce7ba..0000000
--- a/pages/phyz/AGV/AGVPakin.vue
+++ /dev/null
@@ -1,647 +0,0 @@
-<template>
- <view>
- <view class="code">
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()">
- </view>
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
- </view>
- <view class="item">
- <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>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
- </view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">绠辩爜锛�</view>
- <view class="left-item">
- <input type="text" v-model="item.containerCode">
- <uni-tag :text="item.containerCode" type="primary"></uni-tag>
- </view>
- </view> -->
- <!-- <view class="list-left-item">
- <view class="desc">閿�鍞崟鍙凤細</view>
- <view class="left-item">
- <input type="text" v-model="item.csocode">
- </view>
- </view> -->
- <!-- <view class="list-left-item">
- <view class="desc">璁㈠崟琛屽彿锛�</view>
- <view class="left-item">
- <input type="text" v-model="item.isoseq">
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <view>
-
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view> -->
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁勬墭 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- orderNo: '',
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- orderNoFocus: false,
- barcodeFocus: true,
- matFocus: false,
- matData: '',
- removeNum: 0,
- tempOrderInfo: {csocode: '',isoseq: ''},
- hide: true,
- hidebg: 'kb-bgtr'
- }
- },
- onLoad() {
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
- },
- onBackPress() {
- this.hide = false
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- // 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
- findOrder() {
- let that = this
- that.tempOrderInfo.csocode = ''
- that.tempOrderInfo.isoseq = ''
- uni.request({
- url: that.baseUrl + '/mobile/order/search/orderNo/auth',
- header: {'token': uni.getStorageSync('token')},
- data: {
- orderNo: that.orderNo
- },
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- if(res.data && res.data[0].combMats) {
- for (let i = 0; i < res.data[0].combMats.length; i++) {
- that.checkMat(res.data[0].combMats[i])
- }
- that.orderNoFocus = false
- setTimeout(() => {
- that.barcodeFocus = true
- }, 10);
- } else {
- // uni.showToast({
- // title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
- // icon: "none",
- // position: 'top'
- // })
- }
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
- }
- })
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- // barcode input 浜嬩欢
- orderNoInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- this.barcodeFocuss()
- }, 200)
- },
- barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- if (this.barcode.split('_')[1]) {
- this.barcode = this.barcode.split('_')[1]
- }
- // this.barcode = this.barcode.split('_')[1]
- setTimeout(() => {
- let len = this.barcode.length
- if (len != 10) {
- uni.showToast({
- title: '鏂欑鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.focuss()
- }, 200)
- },
- // 鎵樼洏鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- // 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
- // if (that.dataList.length >= 1) {
- // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- // this.messageToggle('warn')
- // that.matnr = ''
- // return
- // }
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: { matnr: that.matnr },
- header: { 'token': uni.getStorageSync('token') },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data,
- // tempOrderInfo: that.tempOrderInfo
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- data.data['csocode'] = ''
- data.data['isoseq'] = ''
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb() {
- uni.vibrateShort();
- let that = this;
- if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
- return;
- }
- if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
- return;
- }
- // if (that.dataList.length > 1) {
- // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- // this.messageToggle('error')
- // return;
- // }
- for (var i = 0; i < that.dataList.length; i++) {
- if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
- return;
- }
- }
- console.log(that.dataList);
- console.log(that.barcode);
- console.log(that.orderNo);
- // return
- uni.request({
- url: that.baseUrl + '/agvMobile/comb/auth',
- data: JSON.stringify({
- orderNo: that.orderNo,
- barcode: that.barcode,
- combMats: that.dataList
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.dataList = []
- that.findOrder()
- // that.resst();
- that.barcode = ''
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
- const innerAudioContext = uni.createInnerAudioContext();
- innerAudioContext.src = '/static/music/pakinOk.mp3';
- innerAudioContext.play()
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.barcode = ''
- this.orderNo = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.orderNo = ''
- this.barcodeFocuss()
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
-
- .keyboard{
- width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
- top: 5px;right: 5px; border-radius: 50%;
- display: flex;align-items: center;justify-content: center;
- }
- .kb-bgtr {
- background-color: #55557f;
- }
- .kb-bgfa {
- background-color: #00aeec;
- }
-
- .list:first-child {
- margin-top: 340rpx;
- }
- .code {
- width: 100%;
- position: fixed;
- min-height: 200rpx;
- background-color: #FFF;
- z-index: 10;
- }
-
- .item {
- display: flex;
- align-items: center;
- height: 70rpx;
- margin-left: 20rpx;
- border-bottom: 1px solid #DCDFE6;
- }
- .item input {
- flex: 1;
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 210rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- 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
deleted file mode 100644
index 5dd4e47..0000000
--- a/pages/phyz/AGV/AGVPakin2.vue
+++ /dev/null
@@ -1,651 +0,0 @@
-<template>
- <view>
- <view class="code">
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()" disabled>
- </view>
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
- </view>
- <!-- <view class="item">
- <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>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view> -->
- </view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">绠辩爜锛�</view>
- <view class="left-item">
- <input type="text" v-model="item.containerCode">
- <uni-tag :text="item.containerCode" type="primary"></uni-tag>
- </view>
- </view> -->
- <!-- <view class="list-left-item">
- <view class="desc">閿�鍞崟鍙凤細</view>
- <view class="left-item">
- <input type="text" v-model="item.csocode">
- </view>
- </view> -->
- <!-- <view class="list-left-item">
- <view class="desc">璁㈠崟琛屽彿锛�</view>
- <view class="left-item">
- <input type="text" v-model="item.isoseq">
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <!-- <view class="list-left-item">
- <view class="desc">閲嶉噺锛�</view>
- <view class="left-item">
- <uni-tag :text="item.weight" type="warning"></uni-tag>
- </view>
- </view> -->
- <view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <view>
-
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view> -->
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁勬墭 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- orderNo: '',
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- orderNoFocus: false,
- barcodeFocus: true,
- matFocus: false,
- matData: '',
- removeNum: 0,
- tempOrderInfo: {csocode: '',isoseq: ''},
- hide: true,
- hidebg: 'kb-bgtr'
- }
- },
- onLoad() {
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
- let that = this
- // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
- const eventChannel = this.getOpenerEventChannel();
-
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('mats', function(data) {
- console.log(data);
- that.orderNo = data.mats[0].orderNo
- that.dataList = data.mats
- })
- },
- onBackPress() {
- this.hide = false
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- // 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
- findOrder() {
- let that = this
- that.tempOrderInfo.csocode = ''
- that.tempOrderInfo.isoseq = ''
- uni.request({
- url: that.baseUrl + '/mobile/order/search/orderNo/auth',
- header: {'token': uni.getStorageSync('token')},
- data: {
- orderNo: that.orderNo
- },
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- if(res.data && res.data[0].combMats) {
- for (let i = 0; i < res.data[0].combMats.length; i++) {
- that.checkMat(res.data[0].combMats[i])
- }
- that.orderNoFocus = false
- setTimeout(() => {
- that.barcodeFocus = true
- }, 10);
- } else {
- // uni.showToast({
- // title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
- // icon: "none",
- // position: 'top'
- // })
- }
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
- }
- })
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- // barcode input 浜嬩欢
- orderNoInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- this.barcodeFocuss()
- }, 200)
- },
- barcodeInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- if (this.barcode.split('_')[1]) {
- this.barcode = this.barcode.split('_')[1]
- }
- // this.barcode = this.barcode.split('_')[1]
- setTimeout(() => {
- let len = this.barcode.length
- if (len != 10) {
- uni.showToast({
- title: '鏂欑鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.focuss()
- }, 200)
- },
- // 鎵樼洏鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- // 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
- // if (that.dataList.length >= 1) {
- // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- // this.messageToggle('warn')
- // that.matnr = ''
- // return
- // }
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: { matnr: that.matnr },
- header: { 'token': uni.getStorageSync('token') },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data,
- // tempOrderInfo: that.tempOrderInfo
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- data.data['csocode'] = ''
- data.data['isoseq'] = ''
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb() {
- uni.vibrateShort();
- let that = this;
- if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
- return;
- }
- if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
- return;
- }
- // if (that.dataList.length > 1) {
- // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- // this.messageToggle('error')
- // return;
- // }
- for (var i = 0; i < that.dataList.length; i++) {
- if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
- return;
- }
- }
- uni.request({
- url: that.baseUrl + '/agvMobile/comb/auth',
- data: JSON.stringify({
- orderNo: that.orderNo,
- barcode: that.barcode,
- combMats: that.dataList
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.dataList = []
- that.barcode = ''
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
- uni.navigateBack({
- delta: 2
- });
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.barcode = ''
- this.orderNo = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.orderNo = ''
- this.barcodeFocuss()
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
-
- .keyboard{
- width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
- top: 5px;right: 5px; border-radius: 50%;
- display: flex;align-items: center;justify-content: center;
- }
- .kb-bgtr {
- background-color: #55557f;
- }
- .kb-bgfa {
- background-color: #00aeec;
- }
-
- .list:first-child {
- margin-top: 270rpx;
- }
- .code {
- width: 100%;
- position: fixed;
- min-height: 100rpx;
- background-color: #FFF;
- z-index: 10;
- }
-
- .item {
- display: flex;
- align-items: center;
- height: 70rpx;
- margin-left: 20rpx;
- border-bottom: 1px solid #DCDFE6;
- }
- .item input {
- flex: 1;
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 140rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.5);
- }
-</style>
diff --git a/pages/phyz/AGV/AGVPakin3.vue b/pages/phyz/AGV/AGVPakin3.vue
deleted file mode 100644
index abd2248..0000000
--- a/pages/phyz/AGV/AGVPakin3.vue
+++ /dev/null
@@ -1,789 +0,0 @@
-<template>
- <view>
- <view class="code">
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璁㈠崟鍙�" v-model="orderNo" :focus="orderNoFocus"
- @input="findOrder()">
- </view>
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
- </view>
- <!-- <view class="item">
- <view class="dropdown" @click="toggleDropdown()">
- <input type="text" style="width: 650rpx;" v-model="containerType" placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
- <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
- <view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
- </scroll-view>
- </view>
- </view> -->
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
- @input="stationCodeInput()">
- </view>
- </view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">璁㈠崟鍙凤細</view>
- <view class="left-item">
- <input type="text" v-model="item.csocode">
- <!-- <uni-tag :text="item.csocode" type="primary"></uni-tag> -->
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鑷敱椤癸細</view>
- <view class="left-item">
- <input type="text" v-model="item.isoseq">
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">缂栫爜锛�</view>
- <view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">瑙勬牸锛�</view>
- <view class="left-item">{{item.specs}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鎵瑰彿锛�</view>
- <view class="left-item">
- <uni-tag :text="item.batch" type="warning"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">鏁伴噺锛�</view>
- <view class="left-item">{{item.anfme}}</view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <view style="width: 10rpx;"></view>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="agvStart('warn')">鍚姩鍏ュ簱</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">缂栫爜:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁勬墭 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb(1)" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 鍚姩鍏ュ簱 -->
- <view>
- <uni-popup ref="agvStartConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="agvStartConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- orderNo: '',
- stationCode: '',
- containerType: '',
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- barcodeFocus: true,
- stationCodeFocus: false,
- matFocus: false,
- orderNoFocus: false,
- matData: '',
- removeNum: 0,
- devNo: [],
- flag: 0,
- tempOrderInfo: {csocode: '',isoseq: ''},
- hide: false,
- hidebg: 'kb-bgtr',
- isOpen: false,
- selects: [1,2,3,4],
- kind: 'pakin'
- }
- },
- onLoad() {
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
- let that = this
- // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
- const eventChannel = this.getOpenerEventChannel();
-
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('mats', function(data) {
- console.log(data);
- that.orderNo = data.mats[0].orderNo
- for (let k of data.mats) {
- k.anfme = 0
- }
- that.dataList = data.mats
- })
- },
- onBackPress() {
- this.hide = false
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- toggleDropdown() {
- this.isOpen = !this.isOpen
- },
- selected(option) {
- this.containerType = option
- },
- findOrder() {
- let that = this
- that.tempOrderInfo.csocode = ''
- that.tempOrderInfo.isoseq = ''
- uni.request({
- url: that.baseUrl + '/mobile/order/search/orderNo/auth',
- header: {'token': uni.getStorageSync('token')},
- data: {
- orderNo: that.orderNo
- },
- success(res) {
- res = res.data
- if (res.code === 200) {
- if(res.data && res.data[0].combMats) {
- for (let i = 0; i < res.data[0].combMats.length; i++) {
- that.checkMat(res.data[0].combMats[i])
- }
- that.orderNoFocus = false
- setTimeout(() => {
- that.barcodeFocus = true
- }, 10);
- } else {
- uni.showToast({
- title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
- icon: "none",
- position: 'top'
- })
- }
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
- }
- })
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- stationCodeInput() {
- setTimeout(() => {
- var len = this.stationCode.length
- if (len != 7) {
- this.stationCode = ''
- this.stationCodeFocus = true
- uni.showToast({
- title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- return;
- }
- this.focuss()
- }, 200)
- },
- // 绗﹀悎鏉′欢鐨勮烦杞埌涓嬩竴鏍忕洰
- orderNoInput() {
- // 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- setTimeout(() => {
- var len = this.orderNo.length
- this.barcodeFocuss()
- }, 200)
- },
- barcodeInput() {
- let val = this.barcode.substring(0,2)
- if (val == '10') {
- this.containerType = 1
- } else if(val == '20') {
- this.containerType = 2
- } else if (val == '21') {
- this.containerType = 3
- } else if (val == '30') {
- this.containerType = 4
- }
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 6) {
- this.barcode = ''
- this.barcodeFocus = true
- uni.showToast({
- title: '鏂欑鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- return;
- }
- this.stationCodeFocuss()
- }, 200)
- },
- // 鏂欑鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鏆傚瓨浣嶆湁璇噸缃�
- stationCodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.stationCodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- // if (that.dataList.length >= 1) {
- // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
- // this.messageToggle('warn')
- // that.matnr = ''
- // return
- // }
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- data.data['csocode'] = ''
- data.data['isoseq'] = ''
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type) {
- if (this.dataList.length < 1) {
- return
- }
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb(e) {
- uni.vibrateShort();
- let that = this;
- if (that.barcode === '') {
- this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
- this.messageToggle('error')
- return;
- }
- if (that.dataList.length === 0) {
- this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
- this.messageToggle('error')
- return;
- }
- for (var i = 0; i < that.dataList.length; i++) {
- if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
- this.messageToggle('error')
- return;
- }
- }
- uni.request({
- url: that.baseUrl + '/agvMobile/comb/auth',
- data: JSON.stringify({
- orderNo: that.orderNo,
- barcode: that.barcode,
- locno: that.stationCode,
- // containerType: this.containerType,
- combMats: that.dataList
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.flag = 1
- if (e == 1) {
- that.resst();
- that.messageText = "缁勬墭鎴愬姛"
- that.messageToggle('success')
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- }
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- that.flag = 0
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- that.flag = 0
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.barcodeFocus = true
- },
- // 鍚姩鍏ュ簱
- agvStart(type) {
- if (this.dataList.length < 1) {
- return
- }
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪鍚姩鍏ュ簱!'
- this.$refs.agvStartConfirm.open()
- },
- agvStartConfirm() {
- uni.showLoading()
- this.devNo = []
- this.devNo.push(this.stationCode)
- this.comb(2)
- setTimeout(()=>{
- if (this.flag != 1) {
- uni.hideLoading()
- return
- }
- this.start()
- uni.hideLoading()
- },500)
-
- },
- start() {
- let that = this
- let params = []
- if (this.kind == 'pakin') {
- let param = {
- devNo: this.stationCode,
- containerCode: this.barcode,
- // containerType: this.containerType,
- }
- params.push(param)
- } else {
- let param = {
- devNo: this.stationCode,
- containerType: this.containerType,
- }
- params.push(param)
- }
- uni.request({
- url: that.baseUrl + '/agvMobile/pakin/empty/auth',
- data: {pad: params},
- method: 'POST',
- header: {'token': uni.getStorageSync('token')},
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.resst();
- that.messageText = "鍚姩鎴愬姛"
- that.messageToggle('success')
- setTimeout(()=>{
- uni.navigateBack({
- delta: 2
- });
- },700)
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
- .list:first-child {
- margin-top: 400rpx;
- }
-
- .code {
- width: 100%;
- position: fixed;
- min-height: 210rpx;
- background-color: #FFF;
- z-index: 10;
- }
-
- .item {
- display: flex;
- align-items: center;
- height: 70rpx;
- margin-left: 20rpx;
- border-bottom: 1px solid #DCDFE6;
- }
-
- .item input {
- height: 50rpx;
- line-height: 50rpx;
- /* font-family: PingFang SC; uniapp 榛樿瀛椾綋涓嶅眳涓� */
- font-family: PingFang SC;
-
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 210rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
- }
- .dropdown {
- position: relative;
- display: flex;
- 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: 12rpx;
- color: #3a3a3a;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/AGV/emptyOut.vue b/pages/phyz/AGV/emptyOut.vue
deleted file mode 100644
index 257bed5..0000000
--- a/pages/phyz/AGV/emptyOut.vue
+++ /dev/null
@@ -1,632 +0,0 @@
-<template>
- <view>
- <view class="code">
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
- @input="stationCodeInput()" readonly>
- <view class="item-right">
- <button></button>
- <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
- <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
- </view>
- </view>
- <view class="item">
- <view class="dropdown" @click="toggleDropdown()">
- <input type="text" style="width: 650rpx;" v-model="containerType" placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
- <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
- <view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
- </scroll-view>
- </view>
- </view>
- </view>
- <view class="mat-list-title">
- 鏆傚瓨浣嶅垪琛�
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">宸ヤ綔绔欑紪鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.stationCode" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">宸ヤ綔浣嶇紪鍙凤細</view>
- <view class="left-item">{{item.devNo}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">璐т綅鐘舵�侊細</view>
- <view class="left-item">{{item.locSts$}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鏉″舰鐮侊細</view>
- <view class="left-item">
- <uni-tag :text="item.barcode" type="warning"></uni-tag>
- </view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn','pakout')">鍑哄簱</button>
- <!-- <button size="mini" type="primary" @click="combConfirm('warn','pakin')">鍏ュ簱</button> -->
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view> -->
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁戝畾 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- stationCode: '',
- stationCodeFocus: false,
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- barcodeFocus: true,
- matFocus: false,
- matData: '',
- removeNum: 0,
- hide: true,
- hidebg: 'kb-bgtr',
- kind: '',
- containerType: '',
- selects: [123],
- option: '',
- isOpen: false
- }
- },
- onLoad() {
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
- },
- onBackPress() {
- this.hide = false
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- getContainerType() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agvMobile/pakout/empty/container/selector/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: JSON.stringify({devNo: this.stationCode}),
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.selects = res.data
- }
- console.log(res);
- }
- })
- },
- toggleDropdown() {
- this.isOpen = !this.isOpen
- },
- selected(option) {
- this.containerType = option
- },
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- stationCodeInput() {
- setTimeout(() => {
- var len = this.stationCode.length
- if (len != 7) {
- this.stationCode = ''
- this.stationCodeFocus = true
- uni.showToast({
- title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- return;
- }
- this.getBasDevp(this.stationCode)
- this.getContainerType()
- }, 200)
- },
- // 鑾峰彇鏆傚瓨浣�
- getBasDevp(devNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- dev_no: devNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data.records
- }
- }
- })
- },
- // barcode input 浜嬩欢
- barcodeInput() {
- let val = this.barcode.substring(0,2)
- if (val == '10') {
- this.containerType = 1
- } else if(val == '20') {
- this.containerType = 2
- } else if (val == '21') {
- this.containerType = 3
- } else if (val == '30') {
- this.containerType = 4
- }
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 6) {
- uni.showToast({
- title: '鏂欑鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.stationCodeFocuss()
- }, 200)
- },
- // 鏆傚瓨浣嶆湁璇噸缃�
- stationCodeFocuss() {
- let that = this;
- that.stationCodeFocus = false;
- setTimeout(() => {
- that.stationCodeFocus = true;
- }, 100);
- },
- // 鏂欑鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type,kind) {
- if (kind == 'pakin') {
- this.content = '鏄惁鐜板湪鍏ュ簱!'
- this.kind = 'pakin'
- } else {
- this.content = '鏄惁鐜板湪鍑哄簱!'
- this.kind = 'pakout'
- }
- this.msgType = type
- this.title = '璀﹀憡'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb() {
- let that = this;
- let params = []
- if (this.kind == 'pakin') {
- let param = {
- devNo: this.dataList[0].devNo,
- containerCode: this.barcode,
- containerType: this.containerType,
- }
- params.push(param)
- } else {
- let param = {
- devNo: this.dataList[0].devNo,
- containerType: this.containerType,
- }
- params.push(param)
- }
-
- uni.request({
- url: `${that.baseUrl}/agvMobile/${that.kind}/empty/auth`,
- data: {
- pad: params
- },
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.resst();
- that.messageText = "鍚姩鎴愬姛"
- that.messageToggle('success')
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.barcodeFocuss()
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
-
- .list:first-child {
- margin-top: 280rpx;
- }
- .code {
- width: 100%;
- position: fixed;
- min-height: 140rpx;
- background-color: #FFF;
- z-index: 10;
- }
-
- .item {
- display: flex;
- align-items: center;
- height: 70rpx;
- 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;
-
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 140rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
- }
- .dropdown {
- position: relative;
- display: flex;
- 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/AGV/emptyPakin.vue b/pages/phyz/AGV/emptyPakin.vue
deleted file mode 100644
index d4b4f7a..0000000
--- a/pages/phyz/AGV/emptyPakin.vue
+++ /dev/null
@@ -1,577 +0,0 @@
-<template>
- <view>
- <view class="code">
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 璐ф灦鐮�" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()" readonly>
- </view>
- <view class="item">
- <input type="text" placeholder=" 鎵爜 / 杈撳叆 鏆傚瓨浣�" v-model="stationCode" :focus="stationCodeFocus"
- @input="stationCodeInput()" readonly>
- <view class="item-right">
- <button></button>
- <!-- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> -->
- <!-- <uni-icons type="right" color="#c1c1c1"></uni-icons> -->
- </view>
- </view>
- </view>
- <view class="mat-list-title">
- 鏆傚瓨浣嶅垪琛�
- </view>
- <scroll-view>
- <view class="list" v-for="(item,i) in dataList" :key="i">
- <view class="list-left">
- <view class="list-left-item">
- <view class="desc">宸ヤ綔绔欑紪鍙凤細</view>
- <view class="left-item">
- <uni-tag :text="item.stationCode" type="primary"></uni-tag>
- </view>
- </view>
- <view class="list-left-item">
- <view class="desc">宸ヤ綔浣嶇紪鍙凤細</view>
- <view class="left-item">{{item.devNo}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">璐т綅鐘舵�侊細</view>
- <view class="left-item">{{item.locSts$}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鏉″舰鐮侊細</view>
- <view class="left-item">
- <uni-tag :text="item.barcode" type="warning"></uni-tag>
- </view>
- </view>
- </view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
- </view>
- </scroll-view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <!-- <button size="mini" type="primary" @click="combConfirm('warn','pakout')">鍑哄簱</button> -->
- <button size="mini" type="primary" @click="combConfirm('warn','pakin')">鍏ュ簱</button>
- </view>
- <!-- 寮圭獥 -->
- <!-- 淇敼鏁伴噺 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼</view>
- <view class="popup-item">
- <view class="popup-item-left">鏂欏彿:</view>
- <view class="popup-item-right">
- <input type="text" v-model="matnr" disabled="true"
- style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
- </view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">閲嶉噺:</view>
- <view class="popup-item-right"><input type="text" v-model="weight"></view>
- </view> -->
- <view class="popup-item">
- <view class="popup-item-left">鏁伴噺:</view>
- <view class="popup-item-right" style="border: none;justify-content: center;">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 绉婚櫎纭 -->
- <view>
- <!-- 鎻愮ず绐楃ず渚� -->
- <uni-popup ref="alertDialog" type="dialog">
- <uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
- @confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <view>
- <!-- 鎻愮ず淇℃伅寮圭獥 -->
- <uni-popup ref="message" type="message">
- <uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
- </uni-popup>
- </view>
- <!-- 纭缁戝畾 -->
- <view>
- <uni-popup ref="combConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="comb" @close="combClose"></uni-popup-dialog>
- </uni-popup>
- </view>
- <!-- 纭閲嶇疆 -->
- <view>
- <uni-popup ref="resetConfirm" type="dialog">
- <uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
- @confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
- </uni-popup>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- barcode: '',
- stationCode: '',
- stationCodeFocus: false,
- dataList: [],
- count: 0,
- rowNum: '',
- matnr: '',
- batch: '',
- weight: '',
- msgType1: 'success',
- msgType: 'success',
- messageText: '',
- title: '',
- content: '',
- barcodeFocus: true,
- matFocus: false,
- matData: '',
- removeNum: 0,
- hide: true,
- hidebg: 'kb-bgtr',
- kind: '',
- containerType: 0
- }
- },
- onLoad() {
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
- },
- onBackPress() {
- this.hide = false
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- },
- methods: {
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- messageToggle(type) {
- this.msgType1 = type
- this.$refs.message.open()
- },
- stationCodeInput() {
- setTimeout(() => {
- var len = this.stationCode.length
- if (len != 7) {
- this.stationCode = ''
- this.stationCodeFocus = true
- uni.showToast({
- title: '鏆傚瓨鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- return;
- }
- this.getBasDevp(this.stationCode)
- }, 200)
- },
- // 鑾峰彇鏆傚瓨浣�
- getBasDevp(devNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- dev_no: devNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data.records
- }
- }
- })
- },
- // barcode input 浜嬩欢
- barcodeInput() {
- let val = this.barcode.substring(0,2)
- if (val == '10') {
- this.containerType = 1
- } else if(val == '20') {
- this.containerType = 2
- } else if (val == '21') {
- this.containerType = 3
- } else if (val == '30') {
- this.containerType = 4
- }
- setTimeout(() => {
- var len = this.barcode.length
- if (len != 6) {
- uni.showToast({
- title: '鏂欑鐮佹湁璇閲嶈瘯',
- icon: "none",
- position: 'top'
- });
- this.barcodeFocuss()
- return;
- }
- this.stationCodeFocuss()
- }, 200)
- },
- // 鏆傚瓨浣嶆湁璇噸缃�
- stationCodeFocuss() {
- let that = this;
- that.stationCodeFocus = false;
- setTimeout(() => {
- that.stationCodeFocus = true;
- }, 100);
- },
- // 鏂欑鐮佹湁璇噸缃�
- barcodeFocuss() {
- let that = this;
- that.barcodeFocus = false;
- setTimeout(() => {
- that.barcode = '';
- that.barcodeFocus = true;
- }, 100);
- },
- // 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
- focuss() {
- this.focus = false;
- setTimeout(() => {
- this.matnr = '';
- this.matFocus = true;
- }, 100);
- },
- // 鎼滅储鐗╂枡
- findMat() {
- let that = this
- uni.request({
- url: that.baseUrl + '/mat/auth',
- data: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- result = result.data
- if (result.code === 200 && result.data) {
- that.matData = result.data
- that.matnr = ''
- that.matData['batch'] = ''
- uni.navigateTo({
- url: "../mat/matSelected",
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- success: function(res) {
- res.eventChannel.emit('mat', {
- data: result.data
- })
- },
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- events: {
- matList: function(data) {
- that.checkMat(data.data)
- that.focuss()
- },
- },
- });
- } else if (res.code == 403) {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- }
-
- }
- });
-
- },
- selectMat() {
- let that = this
- uni.navigateTo({
- url: "../mat/matQuery",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {
- commonUrl: ''
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.findMat(that.matnr)
- },
- },
-
-
- });
- that.matnr = ''
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.batch == this.dataList[j].batch) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.batch != this.dataList[i].batch) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].anfme += mat.anfme
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- // 淇敼鎵瑰彿
- revise(item, i) {
- this.matnr = this.dataList[i].matnr
- this.count = this.dataList[i].anfme
- this.batch = this.dataList[i].batch
- this.weight = this.dataList[i].weight
- this.rowNum = i
- this.eject()
- },
- eject(type) {
- this.type = type
- this.$refs.revise.open(type)
- },
- // 鍒楄〃绉婚櫎鎸夐挳
- remove(item, i, type) {
- this.removeNum = i
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
- this.$refs.alertDialog.open(i)
- },
- // 纭绉婚櫎
- removeConfirm() {
- this.messageText = "绉婚櫎鎴愬姛"
- this.messageToggle('success')
- this.dataList.splice(this.removeNum, 1)
- },
- // 鍙栨秷绉婚櫎
- removeClose() {
- this.$refs.alertDialog.close()
- },
- reviseConfirm() {
- this.dataList[this.rowNum].anfme = this.count
- this.dataList[this.rowNum].batch = this.batch
- this.dataList[this.rowNum].weight = this.weight
- this.matnr = ''
- this.messageText = "淇敼鎴愬姛"
- this.messageToggle('success')
- this.$refs.revise.close()
- },
- reviseClose() {
- this.$refs.revise.close()
- },
- changeValue(value) {
- this.count = value
- },
- combConfirm(type,kind) {
- if (kind == 'pakin') {
- this.content = '鏄惁鐜板湪鍏ュ簱!'
- this.kind = 'pakin'
- } else {
- this.content = '鏄惁鐜板湪鍑哄簱!'
- this.kind = 'pakout'
- }
- this.msgType = type
- this.title = '璀﹀憡'
- this.$refs.combConfirm.open()
- },
- combClose() {
- this.$refs.combConfirm.close()
- },
- comb() {
- let that = this;
- let params = []
- if (this.kind == 'pakin') {
- let param = {
- devNo: this.dataList[0].devNo,
- containerCode: this.barcode,
- containerType: this.containerType,
- }
- params.push(param)
- } else {
- let param = {
- devNo: this.dataList[0].devNo,
- containerType: this.containerType,
- }
- params.push(param)
- }
-
- uni.request({
- url: `${that.baseUrl}/agvMobile/${that.kind}/empty/auth`,
- data: {
- pad: params
- },
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.resst();
- that.messageText = "鍚姩鎴愬姛"
- that.messageToggle('success')
- } else if (res.code == 403) {
- that.messageText = res.msg
- that.messageToggle('error')
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- that.messageText = res.msg
- that.messageToggle('error')
- }
- }
- });
- },
- reset(type) {
- this.msgType = type
- this.title = '璀﹀憡'
- this.content = '鏄惁閲嶇疆!'
- this.$refs.resetConfirm.open()
- },
- // 纭閲嶇疆
- resetConfirm() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.messageText = "閲嶇疆瀹屾垚"
- this.messageToggle('success')
- },
- // 鍙栨秷閲嶇疆
- resetClose() {
-
- },
- // 娓呯┖
- resst() {
- this.dataList = []
- this.barcode = ''
- this.stationCode = ''
- this.barcodeFocuss()
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
-
- .list:first-child {
- margin-top: 280rpx;
- }
- .code {
- width: 100%;
- position: fixed;
- min-height: 140rpx;
- background-color: #FFF;
- z-index: 10;
- }
-
- .item {
- display: flex;
- align-items: center;
- height: 70rpx;
- 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;
-
- }
-
- .code-decs {
- width: 20vw;
- font-size: 18px;
- color: #303133;
- }
-
- .item-right {
- margin-left: auto;
- margin-right: 20rpx;
- }
-
- .mat-list-title {
- height: 80rpx;
- line-height: 80rpx;
- width: 100%;
- background-color: white;
- position: fixed;
- margin-top: 140rpx;
- z-index: 9;
- /* border-top: 1px solid #DCDFE6; */
- text-align: center;
- box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
- }
-</style>
diff --git a/pages/phyz/backStock/backStockList.vue b/pages/phyz/backStock/backStockList.vue
deleted file mode 100644
index 322e620..0000000
--- a/pages/phyz/backStock/backStockList.vue
+++ /dev/null
@@ -1,478 +0,0 @@
-<template>
- <view style="font-size: 13px;">
- <view class="station station-wrk" v-if="station">
- <view class="mt-flex">
- <view class="station-title" style="flex: 4;">{{station.threeCode}}</view>
- <view class="station-title" style="flex: 1;">
- <button size="mini" @click="allChecked()">{{allCheckBtnTitle}}</button>
- </view>
- </view>
- <view>璋冩嫧鍗曞彿锛歿{station.orderNo}}</view>
- <view>鐗╂枡缂栧彿锛歿{station.matnr}}</view>
- <view style="width: 100%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">鐗╂枡鍚嶇О锛歿{station.maktx}}</view>
- <view style="display: flex;">
- <view style="flex: 2;">璋冩嫧鏁伴噺锛歿{station.anfme}}</view>
- <view style="flex: 3;">搴撳瓨鏁伴噺锛歿{station.stock}}</view>
- </view>
- <view style="display: flex;">
- <view style="flex: 2;">宸茶皟鎷ㄦ暟閲忥細{{station.qty}}</view>
- <view style="flex: 3;">褰撳墠閫夋嫨璋冩嫧鏁伴噺锛歿{station.count ? station.count : 0}}</view>
- </view>
- </view>
- <!-- 鍨珮 -->
- <!-- <view style="height: 330rpx;text-align: center;color: #b9b9b9;">
- </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-locNo">{{orderDetl.locNo}}</view>
- <view class="detl-locNo">璐ф灦鐮侊細{{orderDetl.suppCode}}</view>
- </view>
- <!-- 涓� -->
- <view style="display: flex;">
- <view style="flex: 1;">
- <view>搴撲綅鐘舵�侊細{{orderDetl.locSts$}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
- </view>
- </view>
- <!-- 涓� -->
- </view>
- <view class="list-right" @click="checkboxChange(orderDetl)">
- <label >
- <checkbox :value="orderDetl.orderNo" :checked="orderDetl.checked" v-show="orderDetl.locSts == 'F'" style="transform:scale(0.7)" /><text></text>
- </label>
- </view>
- </view>
-
- <!-- 鍨珮 -->
- <view style="height: 160rpx;text-align: center;color: #b9b9b9;">
- - 宸茬粡鍒板簳浜� -
- </view>
- <!-- 閫夋嫨妤煎眰寮圭獥 -->
- <view>
- <uni-popup ref="filter" type="dialog">
- <view class="filter-popup">
- <!-- 鏍囬 -->
- <view class="title">璋冩嫧妤煎眰</view>
- <view class="popup-item" style="width: 100%;display: flex;justify-content: center;">
- <view style="margin-top: 50rpx;width: 60%;">
- <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor"></uni-combox>
- </view>
- </view>
- <view class="btn filter-btn">
- <button class="btn-right" @click="filterConfirm()" :disabled="isAutoDis">寮�濮嬭皟鎷�</button>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="isAuto('auto')" >寮�濮嬪洖璋�</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- dataList: [],
- dbList: [],
- count: 0,
- containerType: '',
- isOpen: true,
- option: '',
- selects: [],
- orderId: '',
- station: '',
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- floorList: ['2妤�','3妤�'],
- floor: '',
- moveType: '',
- isAutoDis: false,
- orderNo: ''
- }
- },
- 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);
- data.item['count'] = 0
- _this.station = data.item
- _this.orderId = data.item.id
- _this.orderNo = data.item.orderNo
- _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/v3`,
- 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
- },
- checkboxChange(e) {
- console.log(e);
- let items = this.dataList,
- values = e.orderNo;
- if (e.checked) {
- this.$set(e,'checked',false)
- } else {
- if (e.locSts != "F") {
- this.$set(e,'checked',false)
- } else {
- this.$set(e,'checked',true)
- }
- }
- let num = 0
- for (let k of items) {
- if (k.checked) {
- num++
- }
- if (num == items.length) {
- this.allCheck = true
- this.allCheckBtnTitle = '鍙栨秷'
- } else {
- this.allCheck = false
- this.allCheckBtnTitle = '鍏ㄩ��'
- }
- }
- this.upDateCount()
- },
- upDateCount() {
- let num = 0
- for (let k of this.dataList) {
- if (k.checked) {
- num = num + k.anfme
- }
- }
- this.station.count = num
- },
- allChecked() {
- if (this.allCheck) {
- this.allCheck = false
- this.allCheckBtnTitle = '鍏ㄩ��'
- } else {
- this.allCheck = true
- this.allCheckBtnTitle = '鍙栨秷'
- }
- for (let item of this.dataList) {
- if (this.allCheck) {
- // if (item.locSts == "F")
- if (item.locSts != "F") {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- this.upDateCount()
- },
- isAuto() {
- let _this = this
- this.dbList = []
- for (let k of this.dataList) {
- if (k.checked) {
- this.dbList.push(k)
- }
- }
- let param = {dbList: this.dbList,orderNo:this.orderNo}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/agv/v3/locMove`,
- header: {'token': uni.getStorageSync('token'),},
- data: param,
- method: 'POST',
- success(res) {
- _this.isAutoDis = false
- console.log(res);
- res = res.data
- if (res.code === 200) {
- uni.navigateBack({
- delta: 1
- });
- } 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' })
- }
- },
- fail(res) {
- _this.isAutoDis = false
- }
- })
- this.$refs.filter.close('bottom')
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
-
- .station {
- /* position: fixed; */
- font-size: 18px;
- width: 96%;
- padding: 24rpx;
- z-index: 999;
- font-size: 14px;
- }
- .station-title {
- font-size: 32px;
- font-weight: bold;
- /* padding: 2rpx 0; */
- }
- .station-barcode {
- font-size: 24px;
- font-weight: bold;
- padding: 24rpx 0;
- }
- .station-wrk {
- background-color: #ff7356;
- color: #fff;
- }
- .station-nowrk {
- background-color: #3eb689;
- color: #fff;
- }
- .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;
- 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;
- }
- .filter-popup {
- width: 100%;
- height: 40vh;
- 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;
-
- }
- .filter-btn {
- position: absolute;
- left: 0;
- bottom: 0;
- width: 100%;
- background-color: #FFF;
- }
-
-
-</style>
diff --git a/pages/phyz/backStock/backStocksOrder.vue b/pages/phyz/backStock/backStocksOrder.vue
deleted file mode 100644
index 2449c28..0000000
--- a/pages/phyz/backStock/backStocksOrder.vue
+++ /dev/null
@@ -1,470 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璋冩嫧鎬婚噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸茶皟鎷ㄦ暟閲忥細{{orderDetl.qty}}</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>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :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(){
- 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('backThreeCode');
- 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}/order/backStocks/detls/pakin/page/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('backThreeCode', 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('backThreeCode'),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.orderNo
- 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()
- },
- goToLocDetl(item) {
- let _this = this
- uni.navigateTo({
- url: './backStockList',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
-
- }
- }
-
-</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;
- }
- .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/bcp/bcpDbList.vue b/pages/phyz/bcp/bcpDbList.vue
deleted file mode 100644
index fdfda8c..0000000
--- a/pages/phyz/bcp/bcpDbList.vue
+++ /dev/null
@@ -1,493 +0,0 @@
-<template>
- <view style="font-size: 13px;">
- <view class="station station-wrk" v-if="station">
- <view class="mt-flex">
- <view class="station-title" style="flex: 4;">{{station.threeCode}}</view>
- <view class="station-title" style="flex: 1;">
- <button size="mini" @click="allChecked()">{{allCheckBtnTitle}}</button>
- </view>
- </view>
- <view>璋冩嫧鍗曞彿锛歿{station.orderNo}}</view>
- <view>鐗╂枡缂栧彿锛歿{station.matnr}}</view>
- <view style="width: 100%;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">鐗╂枡鍚嶇О锛歿{station.maktx}}</view>
- <view style="display: flex;">
- <view style="flex: 2;">璋冩嫧鏁伴噺锛歿{station.anfme}}</view>
- <view style="flex: 3;">搴撳瓨鏁伴噺锛歿{station.stock}}</view>
- </view>
- <view style="display: flex;">
- <view style="flex: 2;">宸茶皟鎷ㄦ暟閲忥細{{station.qty}}</view>
- <view style="flex: 3;">褰撳墠閫夋嫨璋冩嫧鏁伴噺锛歿{station.count ? station.count : 0}}</view>
- </view>
- </view>
- <!-- 鍨珮 -->
- <!-- <view style="height: 330rpx;text-align: center;color: #b9b9b9;">
- </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-locNo">{{orderDetl.locNo}}</view>
- <view class="detl-locNo">璐ф灦鐮侊細{{orderDetl.suppCode}}</view>
- </view>
- <!-- 涓� -->
- <view style="display: flex;">
- <view style="flex: 1;">
- <view>搴撲綅鐘舵�侊細{{orderDetl.locSts$}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
- </view>
- </view>
- <!-- 涓� -->
- </view>
- <view class="list-right" @click="checkboxChange(orderDetl)">
- <label >
- <checkbox :value="orderDetl.orderNo" :checked="orderDetl.checked" v-show="orderDetl.locSts == 'F'" style="transform:scale(0.7)" /><text></text>
- </label>
- </view>
- </view>
-
- <!-- 鍨珮 -->
- <view style="height: 160rpx;text-align: center;color: #b9b9b9;">
- - 宸茬粡鍒板簳浜� -
- </view>
- <!-- 閫夋嫨妤煎眰寮圭獥 -->
- <view>
- <uni-popup ref="filter" type="dialog">
- <view class="filter-popup">
- <!-- 鏍囬 -->
- <view class="title">璋冩嫧妤煎眰</view>
- <view class="popup-item" style="width: 100%;display: flex;justify-content: center;">
- <view style="margin-top: 50rpx;width: 60%;">
- <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor"></uni-combox>
- </view>
- </view>
- <view class="btn filter-btn">
- <button class="btn-right" @click="filterConfirm()" :disabled="isAutoDis">寮�濮嬭皟鎷�</button>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="isAuto('unAuto')">鎵嬪姩</button>
- <button size="mini" type="primary" @click="isAuto('auto')" >鑷姩</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- dataList: [],
- dbList: [],
- count: 0,
- containerType: '',
- isOpen: true,
- option: '',
- selects: [],
- orderId: '',
- station: '',
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- floorList: ['2妤�','3妤�'],
- floor: '',
- moveType: '',
- isAutoDis: false,
- orderNo: ''
- }
- },
- 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);
- data.item['count'] = 0
- _this.station = data.item
- _this.orderId = data.item.id
- _this.orderNo = data.item.orderNo
- _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,
- floor: "F1"
- },
- 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
- },
- checkboxChange(e) {
- console.log(e);
- let items = this.dataList,
- values = e.orderNo;
- if (e.checked) {
- this.$set(e,'checked',false)
- } else {
- if (e.locSts != "F") {
- this.$set(e,'checked',false)
- } else {
- this.$set(e,'checked',true)
- }
- }
- let num = 0
- for (let k of items) {
- if (k.checked) {
- num++
- }
- if (num == items.length) {
- this.allCheck = true
- this.allCheckBtnTitle = '鍙栨秷'
- } else {
- this.allCheck = false
- this.allCheckBtnTitle = '鍏ㄩ��'
- }
- }
- this.upDateCount()
- },
- upDateCount() {
- let num = 0
- for (let k of this.dataList) {
- if (k.checked) {
- num = num + k.anfme
- }
- }
- this.station.count = num
- },
- allChecked() {
- if (this.allCheck) {
- this.allCheck = false
- this.allCheckBtnTitle = '鍏ㄩ��'
- } else {
- this.allCheck = true
- this.allCheckBtnTitle = '鍙栨秷'
- }
- for (let item of this.dataList) {
- if (this.allCheck) {
- // if (item.locSts == "F")
- if (item.locSts != "F") {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- this.upDateCount()
- },
- isAuto(type) {
- this.dbList = []
- for (let k of this.dataList) {
- if (k.checked) {
- this.dbList.push(k)
- }
- }
- if (this.dbList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨璋冩嫧搴撲綅', icon: "error", position: 'top' })
- return
- }
- this.moveType = type
- this.$refs.filter.open('bottom')
- },
- filterConfirm() {
- this.isAutoDis = true
- if (this.floor == '') {
- uni.showToast({ title: '璇烽�夋嫨璋冩嫧妤煎眰', icon: "error", position: 'top' })
- return
- }
- let _this = this
- let param = {floor: this.floor,orderNo:this.orderNo,dbList: this.dbList,moveType: this.moveType}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/agv/v2/locMove`,
- header: {'token': uni.getStorageSync('token'),},
- data: param,
- method: 'POST',
- success(res) {
- _this.isAutoDis = false
- console.log(res);
- res = res.data
- if (res.code === 200) {
- uni.navigateBack({
- delta: 1
- });
- } 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' })
- }
- },
- fail(res) {
- _this.isAutoDis = false
- }
- })
- this.$refs.filter.close('bottom')
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
-
- .station {
- /* position: fixed; */
- font-size: 18px;
- width: 96%;
- padding: 24rpx;
- z-index: 999;
- font-size: 14px;
- }
- .station-title {
- font-size: 32px;
- font-weight: bold;
- /* padding: 2rpx 0; */
- }
- .station-barcode {
- font-size: 24px;
- font-weight: bold;
- padding: 24rpx 0;
- }
- .station-wrk {
- background-color: #ff7356;
- color: #fff;
- }
- .station-nowrk {
- background-color: #3eb689;
- color: #fff;
- }
- .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;
- 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;
- }
- .filter-popup {
- width: 100%;
- height: 40vh;
- 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;
-
- }
- .filter-btn {
- position: absolute;
- left: 0;
- bottom: 0;
- width: 100%;
- background-color: #FFF;
- }
-
-
-</style>
diff --git a/pages/phyz/bcp/bcpDbOrder.vue b/pages/phyz/bcp/bcpDbOrder.vue
deleted file mode 100644
index af5dcee..0000000
--- a/pages/phyz/bcp/bcpDbOrder.vue
+++ /dev/null
@@ -1,470 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璋冩嫧鎬婚噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸茶皟鎷ㄦ暟閲忥細{{orderDetl.qty}}</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>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :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(){
- 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('bcpDbThreeCode');
- 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}/order/bcpDb/detls/pakin/page/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('bcpDbThreeCode', 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('bcpDbThreeCode'),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()
- },
- goToLocDetl(item) {
- let _this = this
- uni.navigateTo({
- url: './bcpDbList',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
-
- }
- }
-
-</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;
- }
- .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/bcp/bcpDbOrderV2.vue b/pages/phyz/bcp/bcpDbOrderV2.vue
deleted file mode 100644
index 9b78f68..0000000
--- a/pages/phyz/bcp/bcpDbOrderV2.vue
+++ /dev/null
@@ -1,487 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璋冩嫧鎬婚噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸茶皟鎷ㄦ暟閲忥細{{orderDetl.qty}}</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>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :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(){
- 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: '',
- orderType: []
- },
- index: 0,
- count: 0,
- mask: false
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- let _this = this
- const eventChannel = this.getOpenerEventChannel();
- eventChannel.on('param', function(data) {
- var orderType = data.param.orderType
- if (orderType != [] || orderType != null) {
- uni.setStorageSync('dataOrderTypeBcpDb', orderType);
- _this.data.orderType = orderType
- } else {
- orderType = uni.getStorageSync('dataOrderTypeBcpDb');
- if (orderType != [] || orderType != null) {
- _this.data.orderType = orderType
- } else {
- _this.data.orderType = []
- }
- }
- _this.baseUrl = uni.getStorageSync('baseUrl');
- _this.token = uni.getStorageSync('token');
- _this.searchValue = uni.getStorageSync('threeCode');
- _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}/order/bcpDb/detls/pakin/page/auth/v2`,
- 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('bcpDbThreeCode', 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('bcpDbThreeCode'),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()
- },
- goToLocDetl(item) {
- let _this = this
- uni.navigateTo({
- url: './bcpDbList',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
-
- }
- }
-
-</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;
- }
- .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/bcp/bcpOrder.vue b/pages/phyz/bcp/bcpOrder.vue
deleted file mode 100644
index 05d1f2b..0000000
--- a/pages/phyz/bcp/bcpOrder.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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='0.01' :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(){
- 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.searchValue = ''
- this.getOrderDetlList(this.searchValue,10)
- console.log("onLoad");
- },
- onShow() {
- this.searchValue = ''
- this.getOrderDetlList(this.searchValue,10)
- },
- 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}/order/bcp/detls/pakin/page/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: './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.orderNo
- 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>
- @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/bcp/bcpOrder_xs.vue b/pages/phyz/bcp/bcpOrder_xs.vue
deleted file mode 100644
index 4e547c2..0000000
--- a/pages/phyz/bcp/bcpOrder_xs.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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='0.01' :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(){
- 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.searchValue = ''
- this.getOrderDetlList(this.searchValue,10)
- console.log("onLoad");
- },
- onShow() {
- this.searchValue = ''
- this.getOrderDetlList(this.searchValue,10)
- },
- 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}/order/bcp/detls/pakin/page/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: './orderCar_xs',
- 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.orderNo
- 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>
- @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/bcp/orderCar.vue b/pages/phyz/bcp/orderCar.vue
deleted file mode 100644
index 8da9397..0000000
--- a/pages/phyz/bcp/orderCar.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
- <view>
- <view class="list list-font-color shop-car" :class="orderDetl.color" v-for="(orderDetl,index) in orderCarList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>鎵瑰彿锛歿{orderDetl.batch}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>鍏ュ簱鏁伴噺锛歿{orderDetl.pakinQty}}</view>
- </view>
- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view>
- </view>
- <!-- 鍨珮 -->
- <view style="height: 120rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="agvStart('warn')">鍚姩鍏ュ簱</button>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <!-- <view class="popup-item-left">鍏ュ簱鏁伴噺:</view> -->
- <view class="popup-item-right" style="border: none;"><uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" /></view>
-
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎鐗╂枡</view>
- <view class="btn-right" @click="changeCount()">淇敼鏁伴噺</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="agvStart" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍚姩鍏ュ簱</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">绔欑偣鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="agvStartClose()">鍙栨秷</button>
- <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">鍏ュ簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
- export default {
- data() {
- return {
- orderCarList: [],
- batch: '',
- count: 0,
- index: 0,
- barcode: '',
- agvDevp: '',
- agvStartDis: false
- }
- },
- 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) {
- _this.orderCarList = data.item
- console.log(data.item);
- })
- },
- methods: {
- chageDetl(index) {
- this.index = index
- this.count = this.orderCarList[index].pakinQty
- this.batch = this.orderCarList[index].batch
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- if (this.count > this.orderCarList[this.index].anfme) {
- uni.showToast({ title: '鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
- return
- }
- this.orderCarList[this.index].pakinQty = this.count
- this.orderCarList[this.index].batch = this.batch
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.orderCarList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- changeValue(value) {
- this.count = value
- },
- agvStart() {
- this.$refs.agvStart.open()
- },
- agvStartClose() {
- this.barcode = ''
- this.agvDevp = ''
- this.$refs.agvStart.close()
- },
- agvStartConfirm() {
- this.barcode = this.barcode.replace(/\s+/g, '')
- this.agvDevp = this.agvDevp.replace(/\s+/g, '')
- let _this = this
- if (_this.barcode === '') {
- uni.showToast({ title: '璐ф灦鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.agvDevp === '') {
- uni.showToast({ title: '绔欑偣鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.orderCarList.length === 0) {
- uni.showToast({ title: '缁勬墭鍒楄〃涓虹┖锛�', icon: "error", position: 'top' })
- return;
- }
- for (let k of _this.orderCarList) {
- if (k.pakinQty == 0) {
- uni.showToast({ title: `${k.matnr}鏁伴噺涓嶈兘涓� 0 锛乣, icon: "error", position: 'top' })
- return;
- }
- }
- let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
- let combMats = []
- for (let item of _this.orderCarList) {
- combMat.orderNo = item.orderNo
- 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,processSts: item.processSts}
- combMat.combMats.push(combM)
- combMats.push({...combMat})
- }
- this.comb(combMats)
-
- },
- comb(combMats) {
- let _this = this;
- this.agvStartDis = true
- uni.request({
- url: _this.baseUrl + '/agvMobile/start/pakin/auth',
- data: JSON.stringify({
- barcode: _this.barcode,
- containerCode: _this.barcode,
- devNo: _this.agvDevp,
- combParams: combMats
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- _this.agvStartDis = false
- if (res.code === 200) {
- _this.orderCarList = []
- _this.$refs.agvStart.close()
- uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
- setTimeout(()=> {
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
- uni.navigateBack({delta:2})
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.agvStartDis = false
- }
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .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 {
- max-width: 20vw;
- 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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/bcp/orderCar_xs.vue b/pages/phyz/bcp/orderCar_xs.vue
deleted file mode 100644
index e120117..0000000
--- a/pages/phyz/bcp/orderCar_xs.vue
+++ /dev/null
@@ -1,310 +0,0 @@
-<template>
- <view>
- <view class="list list-font-color shop-car" :class="orderDetl.color" v-for="(orderDetl,index) in orderCarList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>鎵瑰彿锛歿{orderDetl.batch}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>鍏ュ簱鏁伴噺锛歿{orderDetl.pakinQty}}</view>
- </view>
- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view>
- </view>
- <!-- 鍨珮 -->
- <view style="height: 120rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="agvStart('warn')">鍚姩鍏ュ簱</button>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <!-- <view class="popup-item-left">鍏ュ簱鏁伴噺:</view> -->
- <view class="popup-item-right" style="border: none;"><uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" /></view>
-
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎鐗╂枡</view>
- <view class="btn-right" @click="changeCount()">淇敼鏁伴噺</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="agvStart" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍚姩鍏ュ簱</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">绔欑偣鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鐩爣妤煎眰:</view>
- <view class="popup-item-right" style="border: none;">
- <uni-combox style="height: 50rpx;" :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor">
- </uni-combox></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="agvStartClose()">鍙栨秷</button>
- <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">鍏ュ簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
- export default {
- data() {
- return {
- orderCarList: [],
- batch: '',
- count: 0,
- index: 0,
- barcode: '',
- agvDevp: '',
- agvStartDis: false,
- floorList:['浜屽巶','涓夊巶'],
- floor: '',
- }
- },
- 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) {
- _this.orderCarList = data.item
- for (let k of _this.orderCarList) {
- if (k.threeCode) {
- if (k.threeCode.includes("B")) {
- _this.floor = '浜屽巶'
- } else if (k.threeCode.includes("G")) {
- _this.floor = '涓夊巶'
- } else {
- _this.floor = ''
- }
- }
- }
- })
- },
- methods: {
- chageDetl(index) {
- this.index = index
- this.count = this.orderCarList[index].pakinQty
- this.batch = this.orderCarList[index].batch
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- if (this.count > this.orderCarList[this.index].anfme) {
- uni.showToast({ title: '鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
- return
- }
- this.orderCarList[this.index].pakinQty = this.count
- this.orderCarList[this.index].batch = this.batch
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.orderCarList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- changeValue(value) {
- this.count = value
- },
- agvStart() {
- this.$refs.agvStart.open()
- },
- agvStartClose() {
- this.barcode = ''
- this.agvDevp = ''
- this.$refs.agvStart.close()
- },
- agvStartConfirm() {
- this.barcode = this.barcode.replace(/\s+/g, '')
- this.agvDevp = this.agvDevp.replace(/\s+/g, '')
- let _this = this
- if (_this.barcode === '') {
- uni.showToast({ title: '璐ф灦鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.agvDevp === '') {
- uni.showToast({ title: '绔欑偣鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.orderCarList.length === 0) {
- uni.showToast({ title: '缁勬墭鍒楄〃涓虹┖锛�', icon: "error", position: 'top' })
- return;
- }
- for (let k of _this.orderCarList) {
- if (k.pakinQty == 0) {
- uni.showToast({ title: `${k.matnr}鏁伴噺涓嶈兘涓� 0 锛乣, icon: "error", position: 'top' })
- return;
- }
- }
- let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
- let combMats = []
- for (let item of _this.orderCarList) {
- combMat.orderNo = item.orderNo
- 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,processSts: item.processSts}
- combMat.combMats.push(combM)
- combMats.push({...combMat})
- }
- this.comb(combMats)
-
- },
- comb(combMats) {
- let _this = this;
- let factor = ''
- if (!this.floor) {
- uni.showToast({ title: '璇烽�夋嫨妤煎眰', icon: "error", position: 'top' })
- return
- }
- if (this.floor == '浜屽巶') {
- factor = 'B'
- } else if (this.floor == '涓夊巶') {
- factor = 'G'
- }
- this.agvStartDis = true
- uni.request({
- url: _this.baseUrl + '/agvMobile/start/pakin/auth/v2',
- data: JSON.stringify({
- barcode: _this.barcode,
- containerCode: _this.barcode,
- devNo: _this.agvDevp,
- combParams: combMats,
- factory: factor
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- _this.agvStartDis = false
- if (res.code === 200) {
- _this.orderCarList = []
- _this.$refs.agvStart.close()
- uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
- setTimeout(()=> {
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
- uni.navigateBack({delta:2})
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.agvStartDis = false
- }
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .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 {
- max-width: 20vw;
- 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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
deleted file mode 100644
index a720194..0000000
--- a/pages/phyz/checkLocDetl/checkLocDetl.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clearVal" placeholder="杈撳叆 / 鎵弿 璐ф灦鐮�">
- </uni-search-bar>
- <view style="display: flex;padding: 10rpx 20rpx;">
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="row1" placeholder="鎺�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('row1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="bay1" placeholder="鍒�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('bay1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="lev1" placeholder="灞�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('lev1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="floor" placeholder="妤煎眰" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('floor')"></uni-icons>
- </view>
- </view>
- </view>
-
-
- <view class="list list-font-color" :class="locMast.color" v-for="(locMast,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{locMast.locNo}}</view>
- <view>搴撲綅鐘舵�侊細{{locMast.locSts$}}</view>
- <view>搴撲綅绫诲瀷锛歿{locMast.locType1$}}</view>
- <view>璐ф灦鐮侊細{{locMast.barcode}}</view>
- <view style="display: flex;">
- <view style="flex:1">鎺掞細<text style="font-size: 22px;font-weight: bold;">{{locMast.row1}}</text></view>
- <view style="flex:1">鍒楋細<text style="font-size: 22px;font-weight: bold;">{{locMast.bay1}}</text></view>
- <view style="flex:1">灞傦細<text style="font-size: 22px;font-weight: bold;">{{locMast.lev1}}</text></view>
- </view>
- </view>
- <view class="list-right" @click="goToLocDetl(locMast)">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="check" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">褰撳墠搴撲綅璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="checkClose">鍙栨秷</view>
- <view class="btn-right" @click="checkConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- searchValue1: '',
- baseUrl: '',
- token: '',
- barcode: '',
- locNo: '123123',
- row1: '',
- bay1: '',
- lev1: '',
- floor: '',
- dataList: [],
- item: ''
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- if (uni.getStorageSync('lev1')) {
- // this.lev1 = uni.getStorageSync('lev1');
- } else {
- this.lev1 = ''
- }
-
- this.getLocMastList()
- this.barcode = ''
- },
- methods: {
- clear(e) {
- switch (e) {
- case 'row1':
- setTimeout(() => {
- this.row1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'bay1':
- setTimeout(() => {
- this.bay1 = ''
- this.getLocMastList('')
- }, 100);
-
- break;
- case 'lev1':
- setTimeout(() => {
- this.lev1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'floor':
- setTimeout(() => {
- this.floor = ''
- this.getLocMastList('')
- }, 100);
- break;
- }
- },
- clearVal() {
- this.getLocMastList('')
- },
- searchValueInput1() {
- setTimeout(() => {
- this.row1 = ''
- this.bay1 = ''
- this.lev1 = ''
- this.floor = ''
- this.getLocMastList(this.searchValue1)
- }, 100);
- },
- getLocMastList(barcode) {
- let _this = this
- // uni.setStorageSync('lev1', this.lev1);
- this.dataList = []
- uni.request({
- url: `${_this.baseUrl}/agv/locMast/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 100,
- row1: _this.row1,
- bay1: _this.bay1,
- lev1: _this.lev1,
- floor: _this.floor,
- barcode: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data.records) {
- if (k.locSts == 'F') {
- k['color'] = 'locSts-F'
- } else if (k.locSts == 'D') {
- k['color'] = 'locSts-D'
- } else if (k.locSts == 'O') {
- k['color'] = 'locSts-O'
- } else if (k.locSts == 'R') {
- k['color'] = 'locSts-R'
- } else if (k.locSts == 'S') {
- k['color'] = 'locSts-S'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- } else if (k.locSts == 'Q') {
- k['color'] = 'locSts-Q'
- } else if (k.locSts == 'P') {
- k['color'] = 'locSts-P'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- }
- }
- _this.dataList = res.data.records
- } 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' })
- }
- }
- })
- },
- goToLocDetl(e) {
- this.locNo = e.locNo
- this.item = e
- if (e.locSts == 'S' || e.locSts == 'R') {
- uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
- return
- }
- this.$refs.check.open()
- },
- checkClose() {
- this.$refs.check.close()
- },
- checkConfirm() {
- let _this = this
- let param = {
- barcode : _this.barcode,
- locNo : _this.locNo,
- item: _this.item
- }
- uni.navigateTo({
- url: "./locDetl",
- success: function(res) {
- _this.$refs.check.close()
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: param
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.$refs.check.close()
- _this.getLocMastList()
- }
- },
- });
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .list-font-color {
- color: #fff;
- /* background-color: #2299ff; */
- }
- .dropdown {
- border: 1px solid #a7a7a7;
- border-radius: 8rpx;
- margin: 2px;
- padding: 6px;
- }
- .dropdown:first-child {
- margin-left: 2px;
- }
- .dropdown:last-child {
- margin-right: 2px;
- }
- .locSts-F {
- background-color: #d82f2f;
- }
- .locSts-D {
- background-color: #daad25;
- }
- .locSts-O {
- background-color: #55aaff;
- }
- .locSts-R {
- background-color: #aaaaff;
- }
- .locSts-S {
- background-color: #d86d66;
- }
- .locSts-P {
- background-color: #ffaa00;
- }
- .locSts-Q {
- background-color: #47a301;
- }
- .locSts-X {
- background-color: #767676;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/checkLocDetl2.vue b/pages/phyz/checkLocDetl/checkLocDetl2.vue
deleted file mode 100644
index 31e9c1d..0000000
--- a/pages/phyz/checkLocDetl/checkLocDetl2.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clearVal" placeholder="杈撳叆 / 鎵弿 璐ф灦鐮�">
- </uni-search-bar>
- <view style="display: flex;padding: 10rpx 20rpx;">
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="row1" placeholder="鎺�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('row1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="bay1" placeholder="鍒�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('bay1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="lev1" placeholder="灞�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('lev1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="floor" placeholder="妤煎眰" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('floor')"></uni-icons>
- </view>
- </view>
- </view>
-
-
- <view class="list list-font-color" :class="locMast.color" v-for="(locMast,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{locMast.locNo}}</view>
- <view>搴撲綅鐘舵�侊細{{locMast.locSts$}}</view>
- <view>搴撲綅绫诲瀷锛歿{locMast.locType1$}}</view>
- <view>璐ф灦鐮侊細{{locMast.barcode}}</view>
- <view style="display: flex;">
- <view style="flex:1">鎺掞細<text style="font-size: 22px;font-weight: bold;">{{locMast.row1}}</text></view>
- <view style="flex:1">鍒楋細<text style="font-size: 22px;font-weight: bold;">{{locMast.bay1}}</text></view>
- <view style="flex:1">灞傦細<text style="font-size: 22px;font-weight: bold;">{{locMast.lev1}}</text></view>
- </view>
- </view>
- <view class="list-right" @click="goToLocDetl(locMast)">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="check" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">褰撳墠搴撲綅璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="checkClose">鍙栨秷</view>
- <view class="btn-right" @click="checkConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- searchValue1: '',
- baseUrl: '',
- token: '',
- barcode: '',
- locNo: '123123',
- row1: '',
- bay1: '',
- lev1: '',
- floor: '',
- dataList: [],
- item: ''
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- if (uni.getStorageSync('lev1')) {
- // this.lev1 = uni.getStorageSync('lev1');
- } else {
- this.lev1 = ''
- }
-
- this.getLocMastList()
- this.barcode = ''
- },
- methods: {
- clear(e) {
- switch (e) {
- case 'row1':
- setTimeout(() => {
- this.row1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'bay1':
- setTimeout(() => {
- this.bay1 = ''
- this.getLocMastList('')
- }, 100);
-
- break;
- case 'lev1':
- setTimeout(() => {
- this.lev1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'floor':
- setTimeout(() => {
- this.floor = ''
- this.getLocMastList('')
- }, 100);
- break;
- }
- },
- clearVal() {
- this.getLocMastList('')
- },
- searchValueInput1() {
- setTimeout(() => {
- this.row1 = ''
- this.bay1 = ''
- this.lev1 = ''
- this.floor = ''
- this.getLocMastList(this.searchValue1)
- }, 100);
- },
- getLocMastList(barcode) {
- let _this = this
- // uni.setStorageSync('lev1', this.lev1);
- this.dataList = []
- uni.request({
- url: `${_this.baseUrl}/agv/locMast/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 100,
- row1: _this.row1,
- bay1: _this.bay1,
- lev1: _this.lev1,
- floor: _this.floor,
- barcode: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data.records) {
- if (k.locSts == 'F') {
- k['color'] = 'locSts-F'
- } else if (k.locSts == 'D') {
- k['color'] = 'locSts-D'
- } else if (k.locSts == 'O') {
- k['color'] = 'locSts-O'
- } else if (k.locSts == 'R') {
- k['color'] = 'locSts-R'
- } else if (k.locSts == 'S') {
- k['color'] = 'locSts-S'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- } else if (k.locSts == 'Q') {
- k['color'] = 'locSts-Q'
- } else if (k.locSts == 'P') {
- k['color'] = 'locSts-P'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- }
- }
- _this.dataList = res.data.records
- } 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' })
- }
- }
- })
- },
- goToLocDetl(e) {
- this.locNo = e.locNo
- this.item = e
- if (e.locSts == 'S' || e.locSts == 'R') {
- uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
- return
- }
- this.$refs.check.open()
- },
- checkClose() {
- this.$refs.check.close()
- },
- checkConfirm() {
- let _this = this
- let param = {
- barcode : _this.barcode,
- locNo : _this.locNo,
- item: _this.item
- }
- uni.navigateTo({
- url: "./locDetl2",
- success: function(res) {
- _this.$refs.check.close()
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: param
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.$refs.check.close()
- _this.getLocMastList()
- }
- },
- });
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .list-font-color {
- color: #fff;
- /* background-color: #2299ff; */
- }
- .dropdown {
- border: 1px solid #a7a7a7;
- border-radius: 8rpx;
- margin: 2px;
- padding: 6px;
- }
- .dropdown:first-child {
- margin-left: 2px;
- }
- .dropdown:last-child {
- margin-right: 2px;
- }
- .locSts-F {
- background-color: #d82f2f;
- }
- .locSts-D {
- background-color: #daad25;
- }
- .locSts-O {
- background-color: #55aaff;
- }
- .locSts-R {
- background-color: #aaaaff;
- }
- .locSts-S {
- background-color: #d86d66;
- }
- .locSts-P {
- background-color: #ffaa00;
- }
- .locSts-Q {
- background-color: #47a301;
- }
- .locSts-X {
- background-color: #767676;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
deleted file mode 100644
index 0717a80..0000000
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ /dev/null
@@ -1,351 +0,0 @@
-<template>
- <view>
- <view style="padding: 16rpx 32rpx;font-size: 20px;font-weight: bold;">
- <view>褰撳墠搴撲綅鍙凤細{{locNo}}</view>
- <view>褰撳墠璐ф灦鐮侊細{{barcode}}</view>
- </view>
- <view class="list locSts-O">
- <view class="list-left">
- <view>瀹為檯搴撳瓨</view>
- <view>搴撲綅鍙凤細{{containerDetl.locNo}}</view>
- <view>璐ф灦鐮侊細{{containerDetl.barcode}}</view>
- <view>搴撳瓨鍝佺被锛歿{containerDetl.count}}</view>
- </view>
- <view class="list-right" @click="goToLocDetl(containerDetl,'con')">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="list locSts-D" v-if="locDetlShow">
- <view class="list-left">
- <view>鏁版嵁搴撳瓨</view>
- <view>搴撲綅鍙凤細{{locDetl.locNo}}</view>
- <view>璐ф灦鐮侊細{{locDetl.barcode}}</view>
- <view>搴撳瓨鍝佺被锛歿{locDetl.count}}</view>
- </view>
- <view class="list-right" @click="goToLocDetl(locDetl,'loc')">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼搴撲綅鐘舵��</view>
- <view class="popup-item">
- <view class="dropdown" @click="toggleDropdown()">
- <input type="text" style="width: 270rpx;" v-model="locSts" placeholder="鏇存敼涓�">
- <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
- <view class="dropdown-item" v-for="option in locStss" @click="selected(option)">{{option.title}}</view>
- </scroll-view>
- </view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="changeClose()">鍙栨秷</button>
- <button class="btn-right" @click="changeCount()" :disabled="changeDis">淇敼</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="changeSts('warn')">鏇存敼搴撲綅鐘舵��</button>
- <button size="mini" type="primary" @click="changeStart('warn')" :disabled="changeStartDis">绾犳搴撲綅</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- locNo: '',
- barcode: '',
- containerDetl: {
- locNo: '',
- barcode: '',
- count: '',
- data: []
- },
- locDetl: {
- locNo: '',
- barcode: '',
- count: '',
- data: []
- },
- dataList: [],
- locDetlShow: true,
- isOpen: false,
- locSts: '',
- locSts2: '',
- locStss: [
- {title: 'F.鍦ㄥ簱',val: 'F'},
- {title: 'D.绌烘《/绌烘爤鏉�',val: 'D'},
- {title: 'O.绌哄簱浣�',val: 'O'},
- {title: 'X.绂佺敤',val: 'X'},
- ],
- sourceLoc: '',
- changeDis: false,
- changeStartDis: false
- }
- },
- 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);
- _this.locNo = data.item.locNo
- _this.barcode = data.item.barcode
- _this.sourceLoc = data.item.item
- console.log(_this.sourceLoc);
- _this.getLocDetl(data.item.locNo,data.item.barcode)
- })
- },
- methods: {
- getLocDetl(locNo,barcode) {
- let _this = this
- let param = {locNo:locNo,containerCode: barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- if (res.data.containerCode.length > 0) {
- _this.dataList = res.data.containerCode
- if (res.data.containerCode[0].locNo) {
- _this.containerDetl.locNo = res.data.containerCode[0].locNo
- _this.containerDetl.barcode = res.data.containerCode[0].suppCode
- _this.containerDetl.count = res.data.containerCode.length
- _this.containerDetl.data = res.data.containerCode
- }
- }
-
-
- if (res.data.locNo.length > 0) {
- _this.locDetl.locNo = res.data.locNo[0].locNo
- _this.locDetl.barcode = res.data.locNo[0].suppCode
- _this.locDetl.count = res.data.locNo.length
- _this.locDetl.data = res.data.locNo
- }
-
-
- } 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' })
- }
- }
- })
- },
- goToLocDetl(item,type) {
- let _this = this
- if (item.data.length <= 0) {
- uni.showToast({ title: '娌℃湁搴撳瓨', icon: "error", position: 'top' })
- return
- }
- uni.navigateTo({
- url: "./locDetlList",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- // res.eventChannel.emit('item', {
- // item: item
- // })
- res.eventChannel.emit('baseInfo', {
- info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.getLocDetl(_this.locNo,_this.barcode)
- }
- },
- });
- },
- toggleDropdown() {
- this.isOpen = !this.isOpen;
- },
- changeSts() {
- this.$refs.chageDetl.open()
- },
- selected(option) {
- this.locSts = option.title
- this.locSts2 = option.val
- },
- changeClose() {
- this.$refs.chageDetl.close()
- },
- changeCount() {
- let _this = this
- _this.sourceLoc.locSts = this.locSts2
- let barcode = _this.barcode
- if (this.locSts2 == 'O') {
- barcode = ''
- }
- let param = {
- locNo: _this.sourceLoc.locNo,
- locSts: _this.sourceLoc.locSts,
- barcode: _this.barcode,
- row1: _this.sourceLoc.row1,
- bay1: _this.sourceLoc.bay1,
- lev1: _this.sourceLoc.lev1,
- floor: _this.sourceLoc.floor
- }
- Object.keys(_this.sourceLoc).forEach(function(key){
- if (_this.sourceLoc[key] == null) {
- _this.sourceLoc[key] = ''
- }
- })
- _this.changeDis = true
- uni.request({
- url: `${_this.baseUrl}/agv/locMast/update/auth`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- _this.changeDis = false
- if (res.code === 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.changeDis = false
- }
- })
- },
- changeStart() {
- let _this = this
- _this.changeStartDis = true
- let param = {locNo:_this.locNo,containerCode: _this.barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/update/detl/v1`,
- header: { 'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- _this.changeStartDis = false
- if (res.code === 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.changeStartDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .locSts-D {
- color: #FFF;
- background-color: #daad25;
- }
- .locSts-O {
- color: #FFF;
- background-color: #55aaff;
- }
- .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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/locDetl2.vue b/pages/phyz/checkLocDetl/locDetl2.vue
deleted file mode 100644
index 1f6a53a..0000000
--- a/pages/phyz/checkLocDetl/locDetl2.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
- <view>
- <view style="padding: 16rpx 32rpx;font-size: 20px;font-weight: bold;">
- <view>褰撳墠搴撲綅鍙凤細{{locNo}}</view>
- <view>褰撳墠璐ф灦鐮侊細{{barcode}}</view>
- </view>
- <view class="list locSts-O">
- <view class="list-left">
- <view>瀹為檯搴撳瓨</view>
- <view>搴撲綅鍙凤細{{containerDetl.locNo}}</view>
- <view>璐ф灦鐮侊細{{containerDetl.barcode}}</view>
- <view>搴撳瓨鍝佺被锛歿{containerDetl.count}}</view>
- </view>
- <view class="list-right" @click="goToLocDetl(containerDetl,'con')">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="list locSts-D" v-if="locDetlShow">
- <view class="list-left">
- <view>鏁版嵁搴撳瓨</view>
- <view>搴撲綅鍙凤細{{locDetl.locNo}}</view>
- <view>璐ф灦鐮侊細{{locDetl.barcode}}</view>
- <view>搴撳瓨鍝佺被锛歿{locDetl.count}}</view>
- </view>
- <view class="list-right" @click="goToLocDetl(locDetl,'loc')">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">淇敼搴撲綅鐘舵��</view>
- <view class="popup-item">
- <view class="dropdown" @click="toggleDropdown()">
- <input type="text" style="width: 270rpx;" v-model="locSts" placeholder="鏇存敼涓�">
- <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
- <view class="dropdown-item" v-for="option in locStss" @click="selected(option)">{{option.title}}</view>
- </scroll-view>
- </view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="changeClose()">鍙栨秷</button>
- <button class="btn-right" @click="changeCount()" :disabled="changeDis">淇敼</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" type="primary" @click="changeSts('warn')">鏇存敼搴撲綅鐘舵��</button>
- <button size="mini" type="primary" @click="changeStart('warn')" :disabled="changeStartDis">绾犳搴撲綅</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- locNo: '',
- barcode: '',
- containerDetl: {
- locNo: '',
- barcode: '',
- count: '',
- data: []
- },
- locDetl: {
- locNo: '',
- barcode: '',
- count: '',
- data: []
- },
- dataList: [],
- locDetlShow: true,
- isOpen: false,
- locSts: '',
- locSts2: '',
- locStss: [
- {title: 'F.鍦ㄥ簱',val: 'F'},
- {title: 'D.绌烘《/绌烘爤鏉�',val: 'D'},
- {title: 'O.绌哄簱浣�',val: 'O'},
- {title: 'X.绂佺敤',val: 'X'},
- ],
- sourceLoc: '',
- changeDis: false,
- changeStartDis: false
- }
- },
- 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);
- _this.locNo = data.item.locNo
- _this.barcode = data.item.barcode
- _this.sourceLoc = data.item.item
- console.log(_this.sourceLoc);
- _this.getLocDetl(data.item.locNo,data.item.barcode)
- })
- },
- methods: {
- getLocDetl(locNo,barcode) {
- let _this = this
- let param = {locNo:locNo,containerCode: barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- if (res.data.containerCode.length > 0) {
- _this.dataList = res.data.containerCode
- if (res.data.containerCode[0].locNo) {
- _this.containerDetl.locNo = res.data.containerCode[0].locNo
- _this.containerDetl.barcode = res.data.containerCode[0].suppCode
- _this.containerDetl.count = res.data.containerCode.length
- _this.containerDetl.data = res.data.containerCode
- }
- }
-
-
- if (res.data.locNo.length > 0) {
- _this.locDetl.locNo = res.data.locNo[0].locNo
- _this.locDetl.barcode = res.data.locNo[0].suppCode
- _this.locDetl.count = res.data.locNo.length
- _this.locDetl.data = res.data.locNo
- }
-
-
- } 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' })
- }
- }
- })
- },
- goToLocDetl(item,type) {
- let _this = this
- if (item.data.length <= 0) {
- uni.showToast({ title: '娌℃湁搴撳瓨', icon: "error", position: 'top' })
- return
- }
- uni.navigateTo({
- url: "./locDetlList2",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- // res.eventChannel.emit('item', {
- // item: item
- // })
- res.eventChannel.emit('baseInfo', {
- info: {locNo:_this.locNo,barcode:_this.barcode,type: type}
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.getLocDetl(_this.locNo,_this.barcode)
- }
- },
- });
- },
- toggleDropdown() {
- this.isOpen = !this.isOpen;
- },
- changeSts() {
- this.$refs.chageDetl.open()
- },
- selected(option) {
- this.locSts = option.title
- this.locSts2 = option.val
- },
- changeClose() {
- this.$refs.chageDetl.close()
- },
- changeCount() {
- let _this = this
- _this.sourceLoc.locSts = this.locSts2
- let barcode = _this.barcode
- if (this.locSts2 == 'O') {
- barcode = ''
- }
- let param = {
- locNo: _this.sourceLoc.locNo,
- locSts: _this.sourceLoc.locSts,
- barcode: _this.barcode,
- row1: _this.sourceLoc.row1,
- bay1: _this.sourceLoc.bay1,
- lev1: _this.sourceLoc.lev1,
- floor: _this.sourceLoc.floor
- }
- Object.keys(_this.sourceLoc).forEach(function(key){
- if (_this.sourceLoc[key] == null) {
- _this.sourceLoc[key] = ''
- }
- })
- _this.changeDis = true
- uni.request({
- url: `${_this.baseUrl}/agv/locMast/update/auth`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- _this.changeDis = false
- if (res.code === 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.changeDis = false
- }
- })
- },
- changeStart() {
- let _this = this
- _this.changeStartDis = true
- let param = {locNo:_this.locNo,containerCode: _this.barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/update/detl/v1`,
- header: { 'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- _this.changeStartDis = false
- if (res.code === 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.changeStartDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .locSts-D {
- color: #FFF;
- background-color: #daad25;
- }
- .locSts-O {
- color: #FFF;
- background-color: #55aaff;
- }
- .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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
-
diff --git a/pages/phyz/checkLocDetl/locDetlList.vue b/pages/phyz/checkLocDetl/locDetlList.vue
deleted file mode 100644
index 5935ffc..0000000
--- a/pages/phyz/checkLocDetl/locDetlList.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-<template>
- <view>
- <view style="padding: 16rpx 32rpx;font-size: 20px;font-weight: bold;">
- <view>褰撳墠搴撲綅鍙凤細{{locNo}}</view>
- <view>褰撳墠璐ф灦鐮侊細{{barcode}}</view>
- </view>
- <view class="list list-font-color" :class="locDetl.color" v-for="(locDetl,index) in dataList" :key="index">
- <view class="list-left">
- <view>閿�鍞鍗曞彿锛歿{locDetl.threeCode}}</view>
- <view>涓昏鍗曞彿锛歿{locDetl.orderNo}}</view>
- <view>鍟嗗搧缂栫爜锛歿{locDetl.matnr}}</view>
- <view>鍟嗗搧鍚嶇О锛歿{locDetl.maktx}}</view>
- <view>宸ュ簭锛歿{locDetl.processSts$}}</view>
- <view>搴撳瓨锛歿{locDetl.count}}</view>
- </view>
- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view>
- </view>
- <view style="height: 100rpx;display: flex;align-items: center;justify-content: center;" @click="add()">
- <uni-icons type="folder-add" size="25" color="#000" style="padding-right: 20rpx;"></uni-icons> 娣诲姞鐗╂枡
- </view>
-
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍟嗗搧淇℃伅</view>
- <view class="popup-item">
- <view style="width: 70px;">璁㈠崟鍙�</view>
- <view style="margin-left: 20rpx;border-bottom: 1px solid #d8d8d8;"> <input type="text" v-model="orderNo"> </view>
- </view>
- <view class="popup-item">
- <view style="width: 70px;">閿�鍞崟鍙�</view>
- <view style="margin-left: 20rpx;border-bottom: 1px solid #d8d8d8;"> <input type="text" v-model="threeCode"> </view>
- </view>
- <view class="popup-item">
- <view style="width: 70px;">宸ュ簭</view>
- <uni-combox style="height: 20px;" :candidates="processSts$List" placeholder="璇烽�夋嫨宸ュ簭" v-model="processSts$"></uni-combox>
- </view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎</view>
- <view class="btn-right" @click="changeCount()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="adjust('warn')">璋冩暣搴撳瓨</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- dataList: [],
- count: '',
- index: 0,
- locNo: '',
- barcode: '',
- orderNo: '',
- threeCode: '',
- processSts$: '',
- type: '',
- processSts$List: ['寰呭姞宸�','宸插姞宸�','鏃犻渶鍔犲伐']
- }
- },
- 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);
- // _this.locNo = data.item.locNo
- // _this.barcode = data.item.barcode
- // for (let k of data.item.data) {
- // k['count'] = k.anfme
- // }
- // _this.dataList = data.item.data
- // })
- eventChannel.on('baseInfo', function(data) {
- _this.getLocDetl(data.info.locNo,data.info.barcode)
- _this.locNo = data.info.locNo
- _this.barcode = data.info.barcode
- _this.type = data.info.type
- })
- },
- methods: {
- getLocDetl(locNo,barcode) {
- let _this = this
- let param = {locNo:locNo,containerCode: barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- if (_this.type == 'con') {
- _this.dataList = res.data.containerCode
- } else {
- _this.dataList = res.data.locNo
- }
- // for (let k of _this.dataList) {
- // k['count'] = k.anfme
- // }
- } 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' })
- }
- }
- })
- },
- add() {
- let _this = this
- uni.navigateTo({
- url: "../mat/mat",
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- console.log(data.data);
- setTimeout(()=> {
- _this.findMat(data.data)
- },100)
- }
- },
- });
- },
- findMat(mat) {
- let _this = this
- uni.navigateTo({
- url: "../mat/matSelected",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: mat
- })
- },
- events: {
- matList: function(data) {
- data.data.suppCode = _this.barcode
- _this.checkMat(data.data)
- },
- },
- });
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.threeCode == this.dataList[j].threeCode) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.threeCode != this.dataList[i].threeCode) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].count += mat.count
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- chageDetl(index) {
- this.index = index
- this.count = this.dataList[index].count
- this.threeCode = this.dataList[index].threeCode
- this.orderNo = this.dataList[index].orderNo
- this.processSts$ = this.dataList[index].processSts$
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- this.dataList[this.index].count = this.count
- this.dataList[this.index].threeCode = this.threeCode
- this.dataList[this.index].orderNo = this.orderNo
- this.dataList[this.index].processSts$ = this.processSts$
- switch(this.processSts$) {
- case '寰呭姞宸�':
- this.dataList[this.index].processSts = 1
- break;
- case '宸插姞宸�':
- this.dataList[this.index].processSts = 2
- break;
- case '鏃犻渶鍔犲伐':
- this.dataList[this.index].processSts = 3
- break;
- }
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.dataList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- adjust() {
- let _this = this
- let param = {
- locNo: _this.locNo,
- list: _this.dataList
- }
- uni.request({
- url: `${_this.baseUrl}/agv/locDdetl/adjust/start`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code == 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: this.mat});
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- }
- })
- },
- changeValue(value) {
- this.count = value
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-font-color {
- color: #fff;
- background-color: #2299ff;
- }
- .order-sts-start {
- background-color: #3eb689;
- }
- .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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/locDetlList2.vue b/pages/phyz/checkLocDetl/locDetlList2.vue
deleted file mode 100644
index c20aa19..0000000
--- a/pages/phyz/checkLocDetl/locDetlList2.vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<template>
- <view>
- <view style="padding: 16rpx 32rpx;font-size: 20px;font-weight: bold;">
- <view>褰撳墠搴撲綅鍙凤細{{locNo}}</view>
- <view>褰撳墠璐ф灦鐮侊細{{barcode}}</view>
- </view>
- <view class="list list-font-color" :class="locDetl.color" v-for="(locDetl,index) in dataList" :key="index">
- <view class="list-left">
- <view>閿�鍞鍗曞彿锛歿{locDetl.threeCode}}</view>
- <view>涓昏鍗曞彿锛歿{locDetl.orderNo}}</view>
- <view>鍟嗗搧缂栫爜锛歿{locDetl.matnr}}</view>
- <view>鍟嗗搧鍚嶇О锛歿{locDetl.maktx}}</view>
- <view>宸ュ簭锛歿{locDetl.processSts$}}</view>
- <view>搴撳瓨锛歿{locDetl.count}}</view>
- </view>
- <!-- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view> -->
- </view>
- <!-- <view style="height: 100rpx;display: flex;align-items: center;justify-content: center;" @click="add()">
- <uni-icons type="folder-add" size="25" color="#000" style="padding-right: 20rpx;"></uni-icons> 娣诲姞鐗╂枡
- </view> -->
-
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍟嗗搧淇℃伅</view>
- <view class="popup-item">
- <view style="width: 70px;">璁㈠崟鍙�</view>
- <view style="margin-left: 20rpx;border-bottom: 1px solid #d8d8d8;"> <input type="text" v-model="orderNo"> </view>
- </view>
- <view class="popup-item">
- <view style="width: 70px;">閿�鍞崟鍙�</view>
- <view style="margin-left: 20rpx;border-bottom: 1px solid #d8d8d8;"> <input type="text" v-model="threeCode"> </view>
- </view>
- <view class="popup-item">
- <view style="width: 70px;">宸ュ簭</view>
- <uni-combox style="height: 20px;" :candidates="processSts$List" placeholder="璇烽�夋嫨宸ュ簭" v-model="processSts$"></uni-combox>
- </view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎</view>
- <view class="btn-right" @click="changeCount()">淇敼</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" type="primary" @click="adjust('warn')">璋冩暣搴撳瓨</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- dataList: [],
- count: '',
- index: 0,
- locNo: '',
- barcode: '',
- orderNo: '',
- threeCode: '',
- processSts$: '',
- processSts$List: ['寰呭姞宸�','宸插姞宸�','鏃犻渶鍔犲伐']
- }
- },
- 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);
- // _this.locNo = data.item.locNo
- // _this.barcode = data.item.barcode
- // for (let k of data.item.data) {
- // k['count'] = k.anfme
- // }
- // _this.dataList = data.item.data
- // })
- eventChannel.on('baseInfo', function(data) {
- console.log(data);
- _this.getLocDetl(data.info.locNo,data.info.barcode)
- _this.locNo = data.info.locNo
- _this.barcode = data.info.barcode
- _this.type = data.info.type
- })
- },
- methods: {
- getLocDetl(locNo,barcode) {
- let _this = this
- let param = {locNo:locNo,containerCode: barcode}
- uni.request({
- url: `${_this.baseUrl}/agvMobile/check/detl/v1`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- if (_this.type == 'con') {
- _this.dataList = res.data.containerCode
- } else {
- _this.dataList = res.data.locNo
- }
- // for (let k of _this.dataList) {
- // k['count'] = k.anfme
- // }
- } 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' })
- }
- }
- })
- },
- add() {
- let _this = this
- uni.navigateTo({
- url: "../mat/mat",
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- console.log(data.data);
- setTimeout(()=> {
- _this.findMat(data.data)
- },100)
- }
- },
- });
- },
- findMat(mat) {
- let _this = this
- uni.navigateTo({
- url: "../mat/matSelected",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: mat
- })
- },
- events: {
- matList: function(data) {
- data.data.suppCode = _this.barcode
- _this.checkMat(data.data)
- },
- },
- });
- },
- checkMat(mat) {
- var len = this.dataList.length
- var add = true ,sameItem = false
- for (var i = 0; i < len; i++) {
- if (mat.matnr == this.dataList[i].matnr) {
- for (var j = 0; j < len; j++) {
- if (mat.threeCode == this.dataList[j].threeCode) {
- sameItem = true
- }
- }
- // 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿 鏂板姞鍒楄〃
- if (mat.threeCode != this.dataList[i].threeCode) {
- this.$forceUpdate() // 寮哄埗鍒锋柊
- if (sameItem) {
- add = false
- } else {
- add = true
- }
-
- } else {
- // 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
- this.dataList[i].count += mat.count
- this.$forceUpdate() // 寮哄埗鍒锋柊
- add = false
- }
- }
- }
- if (add) {
- this.dataList.unshift(mat)
- }
- },
- chageDetl(index) {
- this.index = index
- this.count = this.dataList[index].count
- this.threeCode = this.dataList[index].threeCode
- this.orderNo = this.dataList[index].orderNo
- this.processSts$ = this.dataList[index].processSts$
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- this.dataList[this.index].count = this.count
- this.dataList[this.index].threeCode = this.threeCode
- this.dataList[this.index].orderNo = this.orderNo
- this.dataList[this.index].processSts$ = this.processSts$
- switch(this.processSts$) {
- case '寰呭姞宸�':
- this.dataList[this.index].processSts = 1
- break;
- case '宸插姞宸�':
- this.dataList[this.index].processSts = 2
- break;
- case '鏃犻渶鍔犲伐':
- this.dataList[this.index].processSts = 3
- break;
- }
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.dataList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- adjust() {
- let _this = this
- let param = {
- locNo: _this.locNo,
- list: _this.dataList
- }
- uni.request({
- url: `${_this.baseUrl}/agv/locDdetl/adjust/start`,
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code == 200) {
- uni.showToast({ title: res.msg, icon: "success", position: 'top' })
- _this.$refs.chageDetl.close()
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: this.mat});
- setTimeout(()=> {
- uni.navigateBack()
- },1000)
- } 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' })
- }
- }
- })
- },
- changeValue(value) {
- this.count = value
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-font-color {
- color: #fff;
- background-color: #2299ff;
- }
- .order-sts-start {
- background-color: #3eb689;
- }
- .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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/checkLocDetl/locMove.vue b/pages/phyz/checkLocDetl/locMove.vue
deleted file mode 100644
index f2e5f8b..0000000
--- a/pages/phyz/checkLocDetl/locMove.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clearVal" placeholder="杈撳叆 / 鎵弿 璐ф灦鐮�">
- </uni-search-bar>
- <view style="display: flex;padding: 10rpx 20rpx;">
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="row1" placeholder="鎺�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('row1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="bay1" placeholder="鍒�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('bay1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="lev1" placeholder="灞�" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('lev1')"></uni-icons>
- </view>
- <view class="dropdown">
- <input type="text" style="flex: 1;" v-model="floorNum" placeholder="妤煎眰" placeholder-style="font-size:10px" @confirm="getLocMastList('')">
- <uni-icons type="close" color="#c1c1c1" style="margin-left: 10rpx;" @click="clear('floor')"></uni-icons>
- </view>
- </view>
- </view>
-
-
- <view class="list list-font-color" :class="locMast.color" v-for="(locMast,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{locMast.locNo}}</view>
- <view>搴撲綅鐘舵�侊細{{locMast.locSts$}}</view>
- <view>搴撲綅绫诲瀷锛歿{locMast.locType1$}}</view>
- <view>璐ф灦鐮侊細{{locMast.barcode}}</view>
- <view style="display: flex;">
- <view style="flex:1">鎺掞細<text style="font-size: 22px;font-weight: bold;">{{locMast.row1}}</text></view>
- <view style="flex:1">鍒楋細<text style="font-size: 22px;font-weight: bold;">{{locMast.bay1}}</text></view>
- <view style="flex:1">灞傦細<text style="font-size: 22px;font-weight: bold;">{{locMast.lev1}}</text></view>
- </view>
- </view>
- <view class="list-right" @click="goToLocDetl(locMast)">
- <uni-icons type="right" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="check" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鐩爣妤煎眰</view>
- <view class="popup-item">
- <view class="popup-item-left">妤煎眰:</view>
- <view class="popup-item-right">
- <uni-combox :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor"></uni-combox>
- </view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="checkClose">鍙栨秷</view>
- <view class="btn-right" @click="checkConfirm()" :disabled="checkDis">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- searchValue1: '',
- baseUrl: '',
- token: '',
- barcode: '',
- locNo: '123123',
- row1: '',
- bay1: '',
- lev1: '',
- dataList: [],
- item: '',
- floorNum: '',
- floorList: ['1F01','1F02','2F','3F'],
- floor: '',
- locMast: null,
- checkDis: false
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- if (uni.getStorageSync('lev1')) {
- this.lev1 = uni.getStorageSync('lev1');
- } else {
- this.lev1 = 2
- }
- this.getLocMastList()
- },
- methods: {
- clear(e) {
- switch (e) {
- case 'row1':
- setTimeout(() => {
- this.row1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'bay1':
- setTimeout(() => {
- this.bay1 = ''
- this.getLocMastList('')
- }, 100);
-
- break;
- case 'lev1':
- setTimeout(() => {
- this.lev1 = ''
- this.getLocMastList('')
- }, 100);
- break;
- case 'floor':
- setTimeout(() => {
- this.floor = ''
- this.getLocMastList('')
- }, 100);
- break;
- }
- },
- clearVal() {
- this.getLocMastList('')
- },
- searchValueInput1() {
- setTimeout(() => {
- this.row1 = ''
- this.bay1 = ''
- this.lev1 = ''
- this.getLocMastList(this.searchValue1)
- }, 100);
- },
- getLocMastList(barcode) {
- let _this = this
- this.dataList = []
- uni.setStorageSync('lev1', this.lev1);
- uni.request({
- url: `${_this.baseUrl}/agv/locMast/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 50,
- row1: _this.row1,
- bay1: _this.bay1,
- lev1: _this.lev1,
- floor: _this.floorNum,
- barcode: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data.records) {
- if (k.locSts == 'F') {
- k['color'] = 'locSts-F'
- } else if (k.locSts == 'D') {
- k['color'] = 'locSts-D'
- } else if (k.locSts == 'O') {
- k['color'] = 'locSts-O'
- } else if (k.locSts == 'R') {
- k['color'] = 'locSts-R'
- } else if (k.locSts == 'S') {
- k['color'] = 'locSts-S'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- } else if (k.locSts == 'Q') {
- k['color'] = 'locSts-Q'
- } else if (k.locSts == 'P') {
- k['color'] = 'locSts-P'
- } else if (k.locSts == 'X') {
- k['color'] = 'locSts-X'
- }
- }
- _this.dataList = res.data.records
- } 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' })
- }
- }
- })
- },
- goToLocDetl(e) {
- this.locNo = e.locNo
- this.item = e
- if (e.locSts == 'S' || e.locSts == 'R') {
- uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
- return
- }
- if (e.locSts == 'O') {
- uni.showToast({ title: '褰撳墠搴撲綅涓虹┖搴撲綅', icon: "error", position: 'top' })
- return
- }
- this.locMast = e
- this.$refs.check.open()
- },
- checkClose() {
- this.$refs.check.close()
- },
- checkConfirm() {
- let _this = this
- _this.checkDis = true
- uni.request({
- url: `${_this.baseUrl}/agvMobile/hand/control/locMove`,
- header: {'token': uni.getStorageSync('token'),
- },
- data: JSON.stringify({
- locNo: this.locMast.locNo,
- floor: _this.floor
- }),
- method: 'POST',
- success(res) {
- _this.checkDis = false
- res = res.data
- if (res.code === 200) {
- uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- _this.$refs.check.close()
- _this.getLocMastList()
- } 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' })
- }
- },
- fail(res) {
- _this.checkDis = false
- }
-
- })
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .list-font-color {
- color: #fff;
- /* background-color: #2299ff; */
- }
- .dropdown {
- border: 1px solid #a7a7a7;
- border-radius: 8rpx;
- margin: 2px;
- padding: 6px;
- }
- .dropdown:first-child {
- margin-left: 2px;
- }
- .dropdown:last-child {
- margin-right: 2px;
- }
- .locSts-F {
- background-color: #d82f2f;
- }
- .locSts-D {
- background-color: #daad25;
- }
- .locSts-O {
- background-color: #55aaff;
- }
- .locSts-R {
- background-color: #aaaaff;
- }
- .locSts-S {
- background-color: #d86d66;
- }
- .locSts-P {
- background-color: #ffaa00;
- }
- .locSts-Q {
- background-color: #47a301;
- }
- .locSts-X {
- background-color: #767676;
- }
-
- .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; */
- margin-top: 30rpx;
- margin-bottom: 60rpx;
- 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;
- }
-</style>
-
diff --git a/pages/phyz/comOrder/checkOut.vue b/pages/phyz/comOrder/checkOut.vue
deleted file mode 100644
index 1e1b67e..0000000
--- a/pages/phyz/comOrder/checkOut.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
- <view>
- <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
- <view>搴撲綅锛歿{item.locNo}}</view>
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>鑷敱椤癸細{{item.containerCode}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view>搴撳瓨鏁伴噺锛歿{item.count}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍑哄簱鏁伴噺锛歿{item.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise(item)">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 20px;">鍑哄簱绔欙細
- <!-- @click="toggleDropdown(item)" -->
- <view class="dropdown" >
- <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 16px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
- <view style="font-size: 10px;">鍙敮鎸佹壂鐮�</view>
- <!-- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons> -->
- <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view> -->
- </view>
- </view>
- <button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </view>
- <view class="btn">
- <view class="btn-left" @click="addClose">鍙栨秷</view>
- <view class="btn-right" @click="addConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <view style="height: 100rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- data: {},
- dataList: [],
- option: '',
- options: [],
- combDis: false,
- maxCount: 0,
- orderType: ''
- }
- },
- 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('mat', function(data) {
- // let ids = [data.mat.id]
- // _this.getPakoutList(ids,data.mat.locNo)
- // })
- eventChannel.on('item', function(data) {
- let ids = [data.item.id]
- _this.getPakoutList(ids)
- })
- eventChannel.on('type', function(data) {
- console.log(data);
- if (data) {
- _this.orderType = data.type
- }
- })
- },
- methods: {
- max() {
- this.data.anfme = this.data.count
- },
- toggleDropdown(item) {
- this.options = []
- item.isOpen = !item.isOpen;
- for (let k of item.agvStaNos) {
- this.options.push(k)
- }
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- staInput(item,items,index) {
- var flag = false
- for (let k of items) {
- if (k == item) flag = true
- }
- if(!flag) {
- uni.showToast({ title: '褰撳墠绔欑偣鏃犳硶浣跨敤锛屽凡澶嶄綅', icon: "error", position: 'top' })
- setTimeout(() => {
- this.dataList[index].agvStaNo = ''
- }, 100);
- }
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids,locNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/out/pakout/preview/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- if (k.locNo != null) {
- k['isOpen'] = false
- k['count'] = k.anfme
- k.agvStaNo = ''
- k.anfme = 0
- if (_this.orderType == 'bcp') {
- if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
- continue
- }
- }
- _this.dataList.push(k)
- }
- }
- } 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' })
- }
- }
- })
- },
- revise(item) {
- this.data = item
- this.maxCount = item.count
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- combConfirm(item) {
- let _this = this
- _this.combDis = true
- if (_this.data.anfme == 0) {
- uni.showToast({ title: '鍑哄簱鏁伴噺涓嶈兘涓�0锛�', icon: "error", position: 'top'})
- return
- }
- uni.showLoading({})
- let combList = []
- combList.push(item)
- uni.request({
- url: `${_this.baseUrl}/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- _this.combDis = false
- res = res.data
- if (res.code === 200) {
- uni.hideLoading({})
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- _this.combDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style scoped>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 34px;
- font-weight: bold;
- }
- .dropdown-item {
- font-size: 20px;
- font-weight: bold;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/comOrder/orderCar.vue b/pages/phyz/comOrder/orderCar.vue
deleted file mode 100644
index 97fa8fc..0000000
--- a/pages/phyz/comOrder/orderCar.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
- <view>
- <view class="list list-font-color shop-car" :class="orderDetl.color" v-for="(orderDetl,index) in orderCarList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>鍏ュ簱鏁伴噺锛歿{orderDetl.pakinQty}}</view>
- </view>
- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view>
- </view>
- <!-- 鍨珮 -->
- <view style="height: 120rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="agvStart('warn')">鍚姩鍏ュ簱</button>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
- </view>
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎鐗╂枡</view>
- <view class="btn-right" @click="changeCount()">淇敼鏁伴噺</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="agvStart" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍚姩鍏ュ簱</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">绔欑偣鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="agvStartClose()">鍙栨秷</button>
- <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">鍏ュ簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
- export default {
- data() {
- return {
- orderCarList: [],
- count: 0,
- index: 0,
- barcode: '',
- agvDevp: '',
- agvStartDis: false
- }
- },
- 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) {
- _this.orderCarList = data.item
- console.log(data.item);
- })
- },
- methods: {
- chageDetl(index) {
- this.index = index
- this.count = this.orderCarList[index].pakinQty
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- if (this.count > this.orderCarList[this.index].anfme) {
- uni.showToast({ title: '鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
- return
- }
- this.orderCarList[this.index].pakinQty = this.count
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.orderCarList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- changeValue(value) {
- this.count = value
- },
- agvStart() {
- this.$refs.agvStart.open()
- },
- agvStartClose() {
- this.barcode = ''
- this.agvDevp = ''
- this.$refs.agvStart.close()
- },
- agvStartConfirm() {
- this.barcode = this.barcode.replace(/\s+/g, '')
- this.agvDevp = this.agvDevp.replace(/\s+/g, '')
- let _this = this
- if (_this.barcode === '') {
- uni.showToast({ title: '璐ф灦鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.agvDevp === '') {
- uni.showToast({ title: '绔欑偣鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.orderCarList.length === 0) {
- uni.showToast({ title: '缁勬墭鍒楄〃涓虹┖锛�', icon: "error", position: 'top' })
- return;
- }
- for (let k of _this.orderCarList) {
- if (k.pakinQty == 0) {
- uni.showToast({ title: `${k.matnr}鏁伴噺涓嶈兘涓� 0 锛乣, icon: "error", position: 'top' })
- return;
- }
- }
- let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
- let combMats = []
- for (let item of _this.orderCarList) {
- combMat.orderNo = item.orderNo
- 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,processSts: item.processSts}
- combMat.combMats.push(combM)
- combMats.push({...combMat})
- }
- this.comb(combMats)
-
- },
- comb(combMats) {
- let _this = this;
- this.agvStartDis = true
- uni.request({
- url: _this.baseUrl + '/agvMobile/start/pakin/auth',
- data: JSON.stringify({
- barcode: _this.barcode,
- containerCode: _this.barcode,
- devNo: _this.agvDevp,
- combParams: combMats
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- _this.agvStartDis = false
- if (res.code === 200) {
- _this.orderCarList = []
- _this.$refs.agvStart.close()
- uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
- setTimeout(()=> {
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
- uni.navigateBack({})
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.agvStartDis = false
- }
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .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: 20vw;
- 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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/comOrder/orderIn.vue b/pages/phyz/comOrder/orderIn.vue
deleted file mode 100644
index 144ccd5..0000000
--- a/pages/phyz/comOrder/orderIn.vue
+++ /dev/null
@@ -1,508 +0,0 @@
-<template>
- <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;"><text style="color: #0055ff;">{{docType}}</text> 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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='0.01' :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>
- <hr>
- <view class="popup-item" >
- <view class="item-cl" >
- <view>鍗曟嵁绫诲瀷锛�</view>
- <view>
- <uni-combox style="height: 30rpx;" :candidates="docTypes" placeholder="绫诲瀷" v-model="docType" @input="getDocType"></uni-combox>
- </view>
-
- </view>
- </view>
- <view class="popup-item" >
- <view class="item-cl">
- <view>閿�鍞鍗曪細</view>
- <input type="text" v-model="searchValue">
- </view>
- </view>
- <view class="popup-item" >
- <view class="item-cl">
- <view>涓昏鍗曞彿锛�</view>
- <input type="text" v-model="orderNo">
- </view>
- </view>
- <view class="popup-item" >
- <view class="item-cl">
- <view>鍟嗗搧缂栧彿锛�</view>
- <input type="text" v-model="matnr">
- </view>
- </view>
- <view class="popup-item" >
- <view class="item-cl">
- <view>鍟嗗搧鍚嶇О锛�</view>
- <input type="text" v-model="maktx">
- </view>
- </view>
- <view class="popup-item" >
- <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(){
- 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: '',
- docType: 0
- },
- index: 0,
- count: 0,
- mask: false,
- docTypes: [],
- srDocTypes: [],
- docType: ''
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue = uni.getStorageSync('orderThreeCode');
- this.getOrderDetlList(this.searchValue,10)
- this.getDocTypes()
- },
- onShow() {
- console.log(uni.getStorageSync('pakinOrderCar'));
- },
- onHide() {
- uni.setStorageSync('pakinOrderCar', this.orderCarList);
- },
- methods: {
- getDocTypes() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/doc/type/list`,
- header: {'token': uni.getStorageSync('token')},
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- _this.docTypes.push(k.docName)
- }
- _this.srDocTypes = res.data
- }
- }
- })
- },
- getOrderDetlList(threeCode,limit) {
- uni.showLoading({})
- console.log(this.srDocTypes);
- console.log(this.docType);
- let _this = this
- for (let k of this.srDocTypes) {
- if (k.docName == this.docType) {
- _this.data.docType = k.docId
- }
- }
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = limit
- uni.request({
- url: `${_this.baseUrl}/order/detls/pakin`,
- 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('orderThreeCode', 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()
- },
- getDocType() {
- },
- // 鐐瑰嚮鍓嶅線 寰呯粍鎵樺垪琛�
- orderCar() {
- let _this = this
- if (_this.orderCarList.length === 0) {
- uni.showToast({ title: '璇锋坊鍔犲叆搴撳晢鍝侊紒', icon: "none", position: 'top' })
- return
- }
- uni.navigateTo({
- url: './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('threeCode'),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.data.docType = 0
- this.docType = ''
- this.searchValue = ''
- this.maktx = ''
- this.matnr = ''
- this.orderNo = ''
- this.brand = ''
- this.getOrderDetlList(this.searchValue,10)
- this.$refs.filter.close()
- }
-
- }
- }
-
-</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;
- }
- .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/comOrder/orderOut.vue b/pages/phyz/comOrder/orderOut.vue
deleted file mode 100644
index 71069ed..0000000
--- a/pages/phyz/comOrder/orderOut.vue
+++ /dev/null
@@ -1,410 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;"><text style="color: #0055ff;">{{docType}}</text> 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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 class="buttom">
- <view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
- 鍚嶇О
- </view>
- <uni-search-bar v-model="searchValue2" style="width: 100%;"
- maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- </view> -->
- <!-- 绛涢�夊脊绐� -->
- <view>
- <uni-popup ref="filter" type="dialog">
- <view class="filter-popup">
- <!-- 鏍囬 -->
- <view class="title">绛涢��</view>
- <hr>
- <view class="popup-item" >
- <view class="item-cl" >
- <view>鍗曟嵁绫诲瀷锛�</view>
- <view>
- <uni-combox style="height: 30rpx;" :candidates="docTypes" placeholder="绫诲瀷" v-model="docType" @input="getDocType"></uni-combox>
- </view>
-
- </view>
- </view>
- <view class="popup-item">
- <view class="item-cl">
- <view>閿�鍞鍗曪細</view>
- <input type="text" v-model="searchValue1">
- </view>
- </view>
- <view class="popup-item">
- <view class="item-cl">
- <view>涓昏鍗曞彿锛�</view>
- <input type="text" v-model="orderNo">
- </view>
- </view>
- <view class="popup-item">
- <view class="item-cl">
- <view>鍟嗗搧缂栧彿锛�</view>
- <input type="text" v-model="matnr">
- </view>
- </view>
- <view class="popup-item">
- <view class="item-cl">
- <view>鍟嗗搧鍚嶇О锛�</view>
- <input type="text" v-model="maktx">
- </view>
- </view>
- <view class="popup-item">
- <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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: '',
- docType: 0
- },
- docTypes: [],
- srDocTypes: [],
- docType: ''
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('threeCodeOut1');
- this.searchValue2 = uni.getStorageSync('threeCodeOut2');
- this.getOrderDetlList(this.searchValue1,10)
- this.getDocTypes()
- },
- methods: {
- getDocTypes() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/doc/type/out/list`,
- header: {'token': uni.getStorageSync('token')},
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- _this.docTypes.push(k.docName)
- }
- _this.srDocTypes = res.data
- }
- }
- })
- },
- getOrderDetlList(threeCode,limit) {
- uni.showLoading({})
- let _this = this
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = limit
- for (let k of this.srDocTypes) {
- if (k.docName == this.docType) {
- _this.data.docType = k.docId
- }
- }
- uni.request({
- url: `${_this.baseUrl}/orderDetl/pakout/list/authV193`,
- 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.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' })
- }
- }
- })
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- uni.navigateTo({
- url: './checkOut',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.orderNo
- this.data.brand = this.brand
- this.getOrderDetlList(this.searchValue1,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.data.docType = 0
- this.docType = ''
- this.searchValue = ''
- this.maktx = ''
- this.matnr = ''
- this.orderNo = ''
- this.brand = ''
- this.getOrderDetlList(this.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/inStock/inStock.vue b/pages/phyz/inStock/inStock.vue
deleted file mode 100644
index ce7b76b..0000000
--- a/pages/phyz/inStock/inStock.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
- <view class="has-foot">
- <form>
- <view class="cu-form-group margin-top">
- <view class="title">瀹瑰櫒缂栧彿</view>
- <input placeholder="璇锋壂瀹瑰櫒缂栧彿" v-model="barcode"></input>
- <text class='cuIcon-search text-blue' @click="search"></text>
- </view>
- <view class="cu-form-group margin-bottom">
- <view class="title">鐩爣绔欑偣</view>
- <uni-data-select v-model="value" :localdata="range" placement="bottom"
- @change="selChange"></uni-data-select>
- </view>
- <view class="cu-form-group ">
- <view class="title">鐩爣搴撲綅</view>
- <input placeholder="璇烽�夋嫨鐩爣搴撲綅" v-model="curCode"></input>
- <text class='cu-btn bg-red tj' @click="open">鎺ㄨ崘</text>
- </view>
- </form>
- <view class="cu-list det menu sm-border padding">
- <block v-for="(item, index) in list" :key="index">
- <view class="cu-bar bg-white solid-bottom margin-top-sm">
- <view class="action">
- <view class="index">
- {{index+1}}
- </view>
- <view class="text-blue">
- {{`${item.maktx}`}}
- </view>
- </view>
- <!-- <view class="action" >
- <text @click="remove(index)" class="cuIcon-close text-red" style="font-size: 24px;"></text>
- </view> -->
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">ASN:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.asnCode}}</text>
- </view>
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">渚涘簲鍟嗘壒娆�:</text>
- </view>
- <view class="action">
- <text class="text-grey">{{item.splrBatch}}</text>
- </view>
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">搴撳瓨鎵规:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.batch}}</text>
- </view>
- </view>
- <view class="cu-item">
- <view class="content">
- <text class="text-black">鏀惰揣鏁伴噺:</text>
- </view>
- <view class="action">
- <text class="text-grey ">{{item.anfme}}</text>
- </view>
- </view>
-
- </block>
- </view>
- <view class="cu-bar btn-group foot">
- <button class="cu-btn text-blue line-blue shadow" @click="clear">娓呯┖</button>
- <button class="cu-btn bg-blue shadow-blur" @click="confirm">涓婃灦</button>
- </view>
- <uni-popup ref="popup" class="cu-popup">
- <view class="popup-content">
- <view class="head">
- <text>鎺ㄨ崘</text>
- <text class='cuIcon-close text-red close' @click="close"></text>
- </view>
- <div class="body">
- <view class="cu-list grid col-3 no-border">
- <view class="item" v-for="el in locs">
- <view class="cu-btn round sm" :class="[el===curCode?'bg-blue':'line-blue']"
- @click="itemChange(el)">{{el.text}}</view>
- </view>
- </view>
- </div>
-<!-- <view class="cu-bar btn-group ">
- <button class="cu-btn bg-blue shadow-blur" @click="popupSubmit">鎻愪氦</button>
- </view> -->
- </view>
- </uni-popup>
- </view>
-</template>
-
-<script>
- import {
- request
- } from '../../../common/request.js'
- import {
- mapState,
- mapMutations,
- mapActions,
- mapGetters
- } from 'vuex';
- export default {
- data() {
- return {
- barcode: '',
- areaName: '',
- locCode: '',
- container: '',
- list: [],
- range: [],
- locs: [],
- curCode: '',
- selectSite: '',
- }
- },
- computed: {
- ...mapState('user', ['dynamicFields']),
- },
- mounted() {
- this.getRece();
- this.getLocs();
- // this.whAreaId = uni.getStorageSync('whAreaId')
-
- },
- methods: {
- async search() {
- const {
- code,
- data,
- msg
- } = await request(`/pakin/info/${this.barcode}`)
- if (code === 200) {
- this.list = data;
- // this.range = data.locArea.locs.map(el => el.code)
- // this.curCode = this.range[0]
- // this.areaName = data.locArea.areaName
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- })
- }
- },
-
- remove(index) {
- this.list.splice(index, 1);
- },
- clear() {
- this.list = []
- this.range = []
- this.locs = []
- this.curCode = ''
- this.areaName = ''
- this.barcode = ''
- },
-
- open() {
- this.$refs.popup.open()
- },
-
- close() {
- this.$refs.popup.close()
- },
-
- popupSubmit() {
- this.$refs.popup.close()
- },
- itemChange(el) {
- this.$refs.popup.close()
- this.curCode = el.text
- },
-
- selChange(e) {
- this.selectSite = e
- },
-
- async confirm() {
- const {
- code,
- data,
- msg
- } = await request(`/pakin/task/`
- , {
- site: this.selectSite,
- locCode: this.curCode,
- barcode: this.barcode
- }
- )
- if (code === 200) {
- uni.showToast({
- title: '涓婃灦鎴愬姛'
- })
- this.clear()
- } else {
- uni.showToast({
- title: msg,
- icon: "none",
- })
- }
- },
- async getRece() {
- const {
- code,
- data,
- msg
- } = await request('/inStock/sites', {}, 'get')
- if (code === 200) {
- this.range = data.map(item => ({
- value: item.id,
- text: item.name + " -- " + item.site
- }));
- }
- },
- async getLocs() {
- const {
- code,
- data,
- msg
- } = await request('/locs/list', {}, 'get')
- if (code === 200) {
-
- this.locs = data.map(item => ({
- value: item.id,
- text: item.code
- }));
- }
- },
-
- }
- }
-</script>
-
-<style>
- .index {
- border: 1px solid #e54d42;
- color: #e54d42;
- border-radius: 50%;
- display: block;
- width: 50rpx;
- height: 50rpx;
- line-height: 48rpx;
- text-align: center;
- margin-right: 20rpx;
- font-size: 30rpx;
- }
-
- .text-blue {
- color: #0081ff !important;
-
- }
-
- .item {
- position: relative;
- display: flex;
- min-height: 80upx;
- align-items: center;
- }
-
- .uni-file-picker {
- width: 100%;
- margin-bottom: 10px;
- }
-
- .uni-select__selector {
- z-index: 999;
- }
-
- .tj {
- height: auto;
- padding: 6px 8px;
- display: inline-block;
- border-radius: 6px;
- }
-
- .item {
- display: flex;
- justify-content: center;
- }
-
- .item .cu-btn {
- font-size: 26upx;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/mat/mat.vue b/pages/phyz/mat/mat.vue
deleted file mode 100644
index 9aca1f4..0000000
--- a/pages/phyz/mat/mat.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
- <view>
- <!-- 鎼滅储妗� -->
- <view class="search-bar">
- <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" />
- </view>
- <scroll-view>
- <view class="tag-list" v-for="(item,i) in tagList" :key="i" @click="showTag(item.id)">
- <view class="tag">
- <view style="display: flex;">
- <view class="wms-tag" :style="baColor" >鍒嗙被</view>
- </view>
- </view>
- <view class="tag-item">{{item.name}}</view>
- </view>
- </scroll-view>
- <view>
- <view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item)">
- <view class="tag">
- <view style="display: flex;">
- <view class="wms-tag" :style="baColor" >鍟嗗搧</view>
- </view>
- </view>
- <view class="tag-item">鍟嗗搧缂栧彿锛� {{item.matnr}}</view>
- <view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx ? item.maktx : '--'}}</view>
- <view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs ? item.specs : '--'}}</view>
- </view>
- </view>
- <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- tagList: [],
- matList: [],
- condition: '',
- reload: false,
- curr:1,
- tag: '鍒嗙被',
- baColor: "background-color: #0081ff;",
- desc: '鍟嗗搧缂栧彿:',
- baseUrl: '',
- token: '',
- status: 'more',
- contentText: {
- contentdown: '涓婃媺鍔犺浇鏇村',
- contentrefresh: '鍔犺浇涓�',
- contentnomore: '娌℃湁鏇村'
- },
- // 褰撳墠tagId
- tagIdNow: 1
- }
- },
- onReachBottom() {
- this.status = 'more';
- if (this.tagList == null) {
- this.showMat(this.tagIdNow);
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- let that = this
- // const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
- const eventChannel = this.getOpenerEventChannel();
-
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('commonUrl', function(data) {
- that.commonUrl = data.commonUrl
- })
- },
- methods: {
- search() {
- let that = this
- that.tagList = []
- that.matList = []
- uni.request({
- url: that.baseUrl + '/mat/search/pda/auth',
- data: {
- condition: that.condition
- },
- method:"GET",
- header: {
- 'token':uni.getStorageSync('token'),
- },
- success(result) {
- console.log(result);
- var res = result.data
- if (res.code === 200 ) {
- that.matList = res.data
- } else if (res.code == 403) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
- setTimeout(() => {
- uni.reLaunch({ url: '../login/login' });
- }, 1000);
- } else {
- uni.showToast({title: res.msg, icon: "none",position: 'top'})
- }
- }
- });
- },
- showTag(parentId) {
- let that = this
- uni.request({
- url: that.baseUrl + '/tag/list/pda/auth',
- header: {
- 'token':uni.getStorageSync('token'),
- },
- data: {
- limit: 100000,
- parentId: parentId
- },
- header: {
- 'token':uni.getStorageSync('token'),
- },
- success(result) {
- that.tagList = null
- that.matList = []
- var res = result.data
- if (res.code === 200) {
- if (res.data != null && res.data.length > 0) {
- that.tagList = res.data
- } else {
- that.tagList = []
- that.showMat(parentId)
- }
- } else if (res.code === 403 ) {
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.showToast({title: res.msg, icon: "none",position: 'top'})
- }
- }
- });
- },
- showMat(tagId) {
- let that = this
- that.tagIdNow = tagId
- if (tagId == null || tagId == '' || tagId == undefined) {
- return;
- }
- uni.showLoading({})
- uni.request({
- url: that.baseUrl + '/mat/list/pda/page/auth',
- data: {
- curr:that.curr,
- limit: 20,
- tagId: tagId
- },
- method:"GET",
- header: {
- 'token':uni.getStorageSync('token'),
- },
- success(result) {
- that.tagList = null
- var res = result.data
- if (res.code === 200) {
- uni.hideLoading()
- if (res.data.records != null && res.data.records.length > 0) {
- let list = res.data.records
- that.matList = that.reload ? list : that.matList.concat(list);
- that.curr = that.curr + 1
- }
- if (res.data.records.length == 0) {
- that.status = 'noMore'
- }
- that.baColor = "background-color: #1cbbb4;"
- } else if (res.code === 403 ) {
- uni.hideLoading()
- uni.showToast({title: res.msg, icon: "none", position: 'top'})
- setTimeout(() => {
- uni.reLaunch({
- url: '../login/login'
- });
- }, 1000);
- } else {
- uni.hideLoading()
- uni.showToast({title: res.msg, icon: "none",position: 'top'})
- }
-
- }
- });
- },
- findBySelect(mat) {
- this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: mat});
- uni.navigateBack({
-
- })
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
- .tag-list {
- width: 94%;
- min-height: 160rpx;
- margin: 10px auto;
- background-color: #FFF;
- border-radius: 5px;
- box-shadow: 0 5upx 20upx rgba(0, 0, 0, 0.2);
- }
- .tag {
- display: flex;
- flex-direction: column;
- min-height: 80rpx;
- border-bottom: 1px solid #e2e2e2;
- }
- .wms-tag {
- min-width: 60rpx;
- margin-left: 50rpx;
- margin-top: 30rpx;
- color: #FFF;
- font-size: 14px;
- padding: 4rpx 12rpx;
- }
- .tag-item {
- width: 100%;
- min-height: 60rpx;
- line-height: 2;
- padding-left: 50rpx;
- color: #606266;
- font-size: 14px;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/mat/matSelected.vue b/pages/phyz/mat/matSelected.vue
deleted file mode 100644
index c30a105..0000000
--- a/pages/phyz/mat/matSelected.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
- <view>
- <view class="form">
- <view class="form-item">
- <view class="form-item-desc"><text>鍟嗗搧缂栫爜</text></view>
- <view class="form-item-content"><text>{{mat.matnr}}</text></view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>鍟嗗搧鍚嶇О</text></view>
- <view class="form-item-content"><text>{{mat.maktx}}</text></view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>瑙勬牸</text></view>
- <view class="form-item-content"><text>{{mat.specs}}</text></view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>閿�鍞崟鍙�</text></view>
- <view class="form-item-content">
- <view class="form-input">
- <input type="text" v-model="mat.threeCode">
- </view>
- </view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>璁㈠崟鍙�</text></view>
- <view class="form-item-content">
- <view class="form-input">
- <input type="text" v-model="mat.orderNo">
- </view>
- </view>
- </view>
- <view class="form-item">
- <view class="form-item-desc"><text>鏁伴噺</text></view>
- <view class="form-item-content">
- <uni-number-box :value="mat.count" :max="99999999" :step='0.01' color="#747474" @change="changeValue" />
- </view>
- </view>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="back()">鎻愬彇</button>
- </view>
-
- <view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
- <image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- mat: {
- matnr: null,
- maktx: null,
- specs: null,
- batch: null,
- count: 0,
- },
- baseIP:'',
- basePORT:'',
- hide: true,
- hidebg: 'kb-bgtr'
- }
- },
- onLoad(option) {
- let that = this
- // #ifdef APP-NVUE
- const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
- // #endif
- // #ifndef APP-NVUE
- const eventChannel = this.getOpenerEventChannel();
- // #endif
-
- // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('item', function(data) {
- console.log(data);
- that.mat = data.item
- that.mat['count'] = 0
- that.mat['orderNo'] = ''
- })
- // #ifdef APP
- setInterval(()=>{
- if (this.hide) {
- uni.hideKeyboard()
- } else {
-
- }
- },20)
- // #endif
-
- },
- onBackPress() {
- this.hide = false
- },
- methods: {
- hideKeyboard() {
- this.hide = this.hide ? false : true
- if (this.hide) {
- this.hidebg = 'kb-bgtr'
- } else {
- this.hidebg = 'kb-bgfa'
- }
- },
- blur() {
-
- },
- focus() {
-
- },
- changeValue(value) {
- this.mat.count = value
- },
- back() {
- if (this.mat.count === 0) {
- uni.showToast({title: '璇疯緭鍏ユ暟閲�', icon: "none", position: 'top'});
- return;
- }
- this.getOpenerEventChannel().emit('matList', {data: this.mat});
- uni.navigateBack({
- })
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/wms.css/wms.css');
- .form {
- min-height: 80rpx;
- background-color: #FFF;
- margin-top: 10px;
- color: #606266;
- box-shadow: 0px 0px 50px 0px rgba(0,0,0,0.2) ;
- }
- .form-item {
- height: 100rpx;
- line-height: 100rpx;
- border-bottom: 1px solid #DCDFE6;
- margin-left: 40rpx;
- display: flex;
- align-items: center;
- }
- .form-item-desc {
- width: 30%;
- }
- .form-item-content {
- width: 60%;
- }
-
- .form-item:last-child {
- border: none;
- }
- .form-input {
- display: flex;
- align-items: center;
- width: 50vw;
- height: 50rpx;
- padding: 2px 5px;
- border-bottom: 1px solid #E4E7ED;
- border-radius: 5rpx;
- }
- .form-input input{
- color: #606266;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
deleted file mode 100644
index 8da9397..0000000
--- a/pages/phyz/order/orderCar.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
- <view>
- <view class="list list-font-color shop-car" :class="orderDetl.color" v-for="(orderDetl,index) in orderCarList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode">{{orderDetl.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>鎵瑰彿锛歿{orderDetl.batch}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>鍏ュ簱鏁伴噺锛歿{orderDetl.pakinQty}}</view>
- </view>
- <view class="list-right" @click="chageDetl(index)">
- <uni-icons type="settings" size="25" color="#fff"></uni-icons>
- </view>
- </view>
- <!-- 鍨珮 -->
- <view style="height: 120rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="agvStart('warn')">鍚姩鍏ュ簱</button>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="chageDetl" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍏ュ簱鏁伴噺</view>
- <view class="popup-item">
- <!-- <view class="popup-item-left">鍏ュ簱鏁伴噺:</view> -->
- <view class="popup-item-right" style="border: none;"><uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" /></view>
-
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </view> -->
- <view class="btn">
- <view class="btn-left" @click="remove()">绉婚櫎鐗╂枡</view>
- <view class="btn-right" @click="changeCount()">淇敼鏁伴噺</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="agvStart" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍚姩鍏ュ簱</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">绔欑偣鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="agvDevp"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="agvStartClose()">鍙栨秷</button>
- <button class="btn-right" @click="agvStartConfirm()" :disabled="agvStartDis">鍏ュ簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
- export default {
- data() {
- return {
- orderCarList: [],
- batch: '',
- count: 0,
- index: 0,
- barcode: '',
- agvDevp: '',
- agvStartDis: false
- }
- },
- 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) {
- _this.orderCarList = data.item
- console.log(data.item);
- })
- },
- methods: {
- chageDetl(index) {
- this.index = index
- this.count = this.orderCarList[index].pakinQty
- this.batch = this.orderCarList[index].batch
- this.$refs.chageDetl.open()
- },
- // 淇敼鏁伴噺
- changeCount() {
- if (this.count > this.orderCarList[this.index].anfme) {
- uni.showToast({ title: '鏁伴噺涓嶅悎娉曪紒', icon: "none", position: 'top' })
- return
- }
- this.orderCarList[this.index].pakinQty = this.count
- this.orderCarList[this.index].batch = this.batch
- this.$forceUpdate() // 寮哄埗鍒锋柊
- this.$refs.chageDetl.close()
- },
- // 绉婚櫎鐗╂枡
- remove() {
- this.orderCarList.splice(this.index, 1)
- this.$refs.chageDetl.close()
- },
- changeValue(value) {
- this.count = value
- },
- agvStart() {
- this.$refs.agvStart.open()
- },
- agvStartClose() {
- this.barcode = ''
- this.agvDevp = ''
- this.$refs.agvStart.close()
- },
- agvStartConfirm() {
- this.barcode = this.barcode.replace(/\s+/g, '')
- this.agvDevp = this.agvDevp.replace(/\s+/g, '')
- let _this = this
- if (_this.barcode === '') {
- uni.showToast({ title: '璐ф灦鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.agvDevp === '') {
- uni.showToast({ title: '绔欑偣鐮佷负绌猴紒', icon: "error", position: 'top' })
- return;
- }
- if (_this.orderCarList.length === 0) {
- uni.showToast({ title: '缁勬墭鍒楄〃涓虹┖锛�', icon: "error", position: 'top' })
- return;
- }
- for (let k of _this.orderCarList) {
- if (k.pakinQty == 0) {
- uni.showToast({ title: `${k.matnr}鏁伴噺涓嶈兘涓� 0 锛乣, icon: "error", position: 'top' })
- return;
- }
- }
- let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
- let combMats = []
- for (let item of _this.orderCarList) {
- combMat.orderNo = item.orderNo
- 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,processSts: item.processSts}
- combMat.combMats.push(combM)
- combMats.push({...combMat})
- }
- this.comb(combMats)
-
- },
- comb(combMats) {
- let _this = this;
- this.agvStartDis = true
- uni.request({
- url: _this.baseUrl + '/agvMobile/start/pakin/auth',
- data: JSON.stringify({
- barcode: _this.barcode,
- containerCode: _this.barcode,
- devNo: _this.agvDevp,
- combParams: combMats
- }),
- method: 'POST',
- header: {
- 'token': uni.getStorageSync('token')
- },
- success(result) {
- var res = result.data
- _this.agvStartDis = false
- if (res.code === 200) {
- _this.orderCarList = []
- _this.$refs.agvStart.close()
- uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
- setTimeout(()=> {
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
- uni.navigateBack({delta:2})
- },1000)
- } 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' })
- }
- },
- fail(res) {
- _this.agvStartDis = false
- }
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 28px;
- font-weight: bold;
- }
- .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 {
- max-width: 20vw;
- 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: #e2231a;
- border-right: 1px solid #DCDFE6;
- }
- .btn-right {
- display: flex;
- flex: 1;
- justify-content: center;
- align-items: center;
- color: #409EFF;
- }
-</style>
diff --git a/pages/phyz/order/orderList.vue b/pages/phyz/order/orderList.vue
deleted file mode 100644
index fba7117..0000000
--- a/pages/phyz/order/orderList.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
- <view>
- <view class="code">
- <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">
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
- <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</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="" :disabled="item.anfme <= item.qty" style="transform:scale(0.7)" /><text></text>
- </label>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="orderType == 'in'">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">鍘荤粍鎵�</button>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="orderType == 'out'">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm2('warn')">鍘诲嚭搴�</button>
- </view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- orderId: '',
- matFocus: true,
- matnr: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- orderType: 'out'
- }
- },
- onLoad() {
- let that = 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);
- that.orderId = data.item.orderId
- console.log(data.item.id);
- uni.setNavigationBarTitle({
- title: data.item.orderNo,
-
- })
- that.getOrderDetl(data.item.id)
- that.orderType = 'in'
- })
- eventChannel.on('item1', function(data) {
- console.log(data);
- that.orderId = data.item.orderId
- console.log(data.item.id);
- uni.setNavigationBarTitle({
- title: data.item.orderNo,
-
- })
- that.getOrderDetl(data.item.id)
- that.orderType = 'out'
- })
- },
- onShow() {
- if (this.dataList.length > 0) {
- this.oldDataList = [...this.dataList]
- }
- // this.getOrderDetl(this.orderId)
- },
- methods: {
- // 璁㈠崟鏄庣粏
- getOrderDetl(id) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/orderDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- order_id: id
- },
- method: 'GET',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- res.data.records
- _this.dataList = res.data.records
-
- _this.oldDataList = [..._this.dataList]
- }
- }
- })
- },
- matInput() {
- let count = 0
- let sign = 0
- if (this.oldDataList.length > 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 {
- if (e.anfme == e.qty) {
- 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) {
- if (item.anfme == item.qty) {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- },
- clear() {
- this.matnr = ''
- this.dataList = [...this.oldDataList]
- },
- combConfirm(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- k['csocode'] = k.threeCode
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "../AGV/AGVPakin3",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- combConfirm2(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨鍑哄簱鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "./preview",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-anfme {
- color: #0082ff;
- font-weight: bold;
- }
- .list-qty-1 {
- color: #33ba43;
- font-weight: bold;
- }
- .list-qty-2 {
- color: #e2231a;
- font-weight: bold;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/order/orderList2.vue b/pages/phyz/order/orderList2.vue
deleted file mode 100644
index 98c8c3c..0000000
--- a/pages/phyz/order/orderList2.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-<template>
- <view>
- <view class="code">
- <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">
- <view>鍗曞彿锛歿{item.orderNo}}</view>
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
- <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</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="" :disabled="item.anfme <= item.qty" style="transform:scale(0.7)" /><text></text>
- </label>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="orderType == 'in'">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">鍘荤粍鎵�</button>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="orderType == 'out'">
- <button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm2('warn')">鍘诲嚭搴�</button>
- </view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- orderId: '',
- matFocus: true,
- matnr: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- orderType: 'in'
- }
- },
- onLoad() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderDetl()
- },
- onShow() {
- if (this.dataList.length > 0) {
- this.oldDataList = [...this.dataList]
- }
- },
- methods: {
- // 璁㈠崟鏄庣粏
- getOrderDetl(id) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/orderDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 9999,
- order_id: id
- },
- method: 'GET',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- res.data.records
- _this.dataList = res.data.records
- _this.oldDataList = [..._this.dataList]
- }
- }
- })
- },
- matInput() {
- let count = 0
- let sign = 0
- if (this.oldDataList.length > 0) {
- this.dataList = [...this.oldDataList]
- }
- this.newDataList = []
- for (let k in this.dataList) {
- if (!this.dataList[k].orderNo.includes(this.matnr)) {
- count++;
- } else {
- this.newDataList.push(this.dataList[k])
- }
- }
- this.dataList = this.newDataList
- },
- checkboxChange(e) {
- let items = this.dataList,
- values = e.orderNo;
- if (e.checked) {
- this.$set(e,'checked',false)
- } else {
- if (e.anfme == e.qty) {
- 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) {
- if (item.anfme == item.qty) {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- },
- clear() {
- this.matnr = ''
- this.dataList = [...this.oldDataList]
- },
- combConfirm(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- k['csocode'] = k.threeCode
- k['isoseq'] = k.deadTime
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "../AGV/AGVPakin3",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- combConfirm2(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨鍑哄簱鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "./preview",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-anfme {
- color: #0082ff;
- font-weight: bold;
- }
- .list-qty-1 {
- color: #33ba43;
- font-weight: bold;
- }
- .list-qty-2 {
- color: #e2231a;
- font-weight: bold;
- }
-</style>
diff --git a/pages/phyz/order/outOrder.vue b/pages/phyz/order/outOrder.vue
deleted file mode 100644
index bb601fd..0000000
--- a/pages/phyz/order/outOrder.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
- <view class="container">
- <view class="code">
- <uni-search-bar :focus="searchValueFocus" v-model="searchValue" @input="searchValueInput2()"
- 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.orderNo}}</view>
- <view>鍗曟嵁绫诲瀷锛歿{item.docType$}}</view>
- <view>鍒涘缓鏃堕棿锛歿{item.createTime$}}</view>
- <!-- <view class="card-id">{{i + 1}}</view> -->
- <view class="card-status-1" v-if="item.settle == 1">{{item.settle$}}</view>
- <view class="card-status-2" v-if="item.settle == 2">{{item.settle$}}</view>
- <view class="card-status-4" v-if="item.settle == 4">{{item.settle$}}</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="getOrderDetl(item)">
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- searchValueFocus: true,
- searchValue: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderList()
- },
-
- methods: {
- searchValueInput2() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/order/head/page/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 30,
- order_no: _this.searchValue
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data.records
- }
- }
- })
- },
- searchValueInput() {
- let count = 0
- let sign = 0
- this.dataList = [...this.oldDataList]
- this.newDataList = []
- for (let k in this.dataList) {
- if (!this.dataList[k].orderNo.includes(this.searchValue)) {
- count++;
- } else {
- this.newDataList.push(this.dataList[k])
- }
- }
- 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]
- },
- // 鑾峰彇璁㈠崟鍒楄〃
- getOrderList() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/order/nav/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 30,
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data
- }
- }
- })
- },
- // 鑾峰彇璁㈠崟鏄庣粏
- getOrderDetl(item) {
- let _this = this
- uni.navigateTo({
- url: "./orderList",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item1', {
- item: item,
- type: 'out'
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- // _this.matnr = data.data
- _this.input(_this.matnr)
- },
- },
-
-
- });
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
-</style>
\ No newline at end of file
diff --git a/pages/phyz/order/pakinOrderSelect.vue b/pages/phyz/order/pakinOrderSelect.vue
deleted file mode 100644
index 9f1944f..0000000
--- a/pages/phyz/order/pakinOrderSelect.vue
+++ /dev/null
@@ -1,469 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎵瑰彿锛歿{orderDetl.batch}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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">
- <!-- <view class="popup-item-left">鍏ュ簱鏁伴噺:</view> -->
- <view class="popup-item-right" style="border: none;"><uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" /></view>
-
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </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(){
- 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,
- batch: ''
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue = uni.getStorageSync('threeCode');
- 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}/order/detls/pakin/page/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('threeCode', 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: './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('threeCode'),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.orderNo
- 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>
- @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 {
- max-width: 20vw;
- 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/order/pakinOrderSelectV2.vue b/pages/phyz/order/pakinOrderSelectV2.vue
deleted file mode 100644
index 437df68..0000000
--- a/pages/phyz/order/pakinOrderSelectV2.vue
+++ /dev/null
@@ -1,487 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎵瑰彿锛歿{orderDetl.batch}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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">
- <!-- <view class="popup-item-left">鍏ュ簱鏁伴噺:</view> -->
- <view class="popup-item-right" style="border: none;"><uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" /></view>
-
- </view>
- <!-- <view class="popup-item">
- <view class="popup-item-left">鎵瑰彿:</view>
- <view class="popup-item-right"><input type="text" v-model="batch"></view>
- </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(){
- 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: '',
- orderType: []
- },
- index: 0,
- count: 0,
- mask: false,
- batch: ''
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- let _this = this
- const eventChannel = this.getOpenerEventChannel();
- eventChannel.on('param', function(data) {
- var orderType = data.param.orderType
- if (orderType != [] || orderType != null) {
- uni.setStorageSync('dataOrderTypeIn', orderType);
- _this.data.orderType = orderType
- } else {
- orderType = uni.getStorageSync('dataOrderTypeIn');
- if (orderType != [] || orderType != null) {
- _this.data.orderType = orderType
- } else {
- _this.data.orderType = []
- }
- }
- _this.baseUrl = uni.getStorageSync('baseUrl');
- _this.token = uni.getStorageSync('token');
- _this.searchValue = uni.getStorageSync('threeCode');
- _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}/order/detls/pakin/page/auth/v2`,
- 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('threeCode', 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: './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('threeCode'),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.orderNo
- 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>
- @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 {
- max-width: 20vw;
- 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/order/preview.vue b/pages/phyz/order/preview.vue
deleted file mode 100644
index 49163a9..0000000
--- a/pages/phyz/order/preview.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
- <view>
- <view class="code">
- <!-- <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">
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
- <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- <view class="card-id">{{i + 1}}</view>
- <view>璐т綅锛歿{item.locNo}}</view>
- <view style="display: flex;">鍑哄簱绔欙細
- <view class="dropdown" >
- <input type="text" style="width: 270rpx;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�">
- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in item.agvStaNos" @click="selected(option,item)">{{option}}</view>
- </scroll-view>
- </view>
- </view>
- </view>
- <view class="list-right" @click="checkboxChange(item)">
- <label >
- <checkbox :value="item.orderNo" :checked="item.checked" color="" :disabled="item.anfme <= item.qty" style="transform:scale(0.7)" /><text></text>
- </label>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">绔嬪嵆鍑哄簱</button>
- </view>
-
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- orderId: '',
- matFocus: true,
- matnr: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- orderType: 'out',
- ids: [],
- isOpen: false,
- selects: [
- {value: "CS-101-001-01@1"},
- {value: "CS-101-001-02@1"},
- {value: "CS-101-001-03@1"},
- {value: "CS-101-002-01@1"},
- {value: "CS-101-002-02@1"},
- {value: "CS-101-002-03@1"},
- ]
- }
- },
- onLoad() {
- let that = 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('mats', function(data) {
- console.log(data);
- for (let item of data.mats) {
- that.ids.push(item.id)
- }
- that.getPakoutList(that.ids)
- })
- },
- onShow() {
- if (this.dataList.length > 0) {
- this.oldDataList = [...this.dataList]
- }
- },
- methods: {
- toggleDropdown(item) {
- item.isOpen = !item.isOpen;
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/out/pakout/preview/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- k['isOpen'] = false
- }
- _this.dataList = res.data
- _this.oldDataList = [..._this.dataList]
- }
- }
- })
- },
- matInput() {
- let count = 0
- let sign = 0
- if (this.oldDataList.length > 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 {
- if (e.anfme == e.qty) {
- 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) {
- if (item.anfme == item.qty) {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- },
- clear() {
- this.matnr = ''
- this.dataList = [...this.oldDataList]
- },
- combConfirm(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- if (k.checked) {
- if (k.agvStaNo == null) {
- uni.showToast({ title: `${k.locNo}褰撳墠璐т綅娌℃湁閫夋嫨鍑哄簱绔檂, icon: "error", position: 'top'})
- return
- } else {
- combList.push(k)
- }
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨鍑哄簱鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.request({
- url: `${_this.baseUrl}/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- }
- }
- })
- },
- combConfirm2(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨鍑哄簱鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "../AGV/AGVPakin2",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- // 绋嶅悗澶勭悊
- reset() {
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-anfme {
- color: #0082ff;
- font-weight: bold;
- }
- .list-qty-1 {
- color: #33ba43;
- font-weight: bold;
- }
- .list-qty-2 {
- color: #e2231a;
- font-weight: bold;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
deleted file mode 100644
index 91283d8..0000000
--- a/pages/phyz/order/purchaseOrder.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
- <view class="container">
- <view class="code">
- <uni-search-bar :focus="searchValueFocus" v-model="searchValue" @input="searchValueInput2()"
- 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.orderNo}}</view>
- <view>鍗曟嵁绫诲瀷锛歿{item.docType$}}</view>
- <view>鍒涘缓鏃堕棿锛歿{item.createTime$}}</view>
- <!-- <view class="card-id">{{i + 1}}</view> -->
- <view class="card-status-1" v-if="item.settle == 1">{{item.settle$}}</view>
- <view class="card-status-2" v-if="item.settle == 2">{{item.settle$}}</view>
- <view class="card-status-4" v-if="item.settle == 4">{{item.settle$}}</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="getOrderDetl(item)">
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
-
- <view style="position: fixed;bottom: 40px;padding: 10rpx;border-radius: 50%;
- left: 20px;background-color: #55aaff;box-shadow: 0px 0px 5px 5px #c8c8c8;">
- <uni-icons type="refreshempty" size="30" color="#FFF" @click="reload()"/>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- searchValueFocus: true,
- searchValue: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getOrderList()
- },
-
- methods: {
- reload() {
- this.getOrderList()
- },
- searchValueInput2() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/order/head/page/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 999999,
- order_no: _this.searchValue
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data.records
- }
- }
- })
- },
- searchValueInput() {
- let count = 0
- let sign = 0
- this.dataList = [...this.oldDataList]
- this.newDataList = []
- for (let k in this.dataList) {
- if (!this.dataList[k].orderNo.includes(this.searchValue)) {
- count++;
- } else {
- this.newDataList.push(this.dataList[k])
- }
- }
- 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]
- },
- // 鑾峰彇璁㈠崟鍒楄〃
- getOrderList() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/order/detls/in/page/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 30,
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.dataList = res.data.records
- _this.oldDataList = [..._this.dataList]
- }
- }
- })
- },
- // 鑾峰彇璁㈠崟鏄庣粏
- getOrderDetl(item) {
- let _this = this
- uni.navigateTo({
- url: "./orderList",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- // _this.matnr = data.data
- _this.input(_this.matnr)
- },
- },
-
-
- });
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
-</style>
\ No newline at end of file
diff --git a/pages/phyz/orderOut/bcpOrderOutSelect.vue b/pages/phyz/orderOut/bcpOrderOutSelect.vue
deleted file mode 100644
index be80909..0000000
--- a/pages/phyz/orderOut/bcpOrderOutSelect.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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>
- <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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: ''
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('threeCodeOut1');
- this.searchValue2 = uni.getStorageSync('threeCodeOut2');
- this.getOrderDetlList(this.searchValue1,10)
- },
- 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}/orderDetl/pakout/list/authV4`,
- 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.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' })
- }
- }
- })
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- item['orderType'] = 'bcp'
- uni.navigateTo({
- url: './orderCheck',
- success(res) {
- res.eventChannel.emit('item', {
- item: item,
- }),
- res.eventChannel.emit('type', {
- type: "bcp"
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/orderOut/bcpOrderOutSelect_2.vue b/pages/phyz/orderOut/bcpOrderOutSelect_2.vue
deleted file mode 100644
index 1695ede..0000000
--- a/pages/phyz/orderOut/bcpOrderOutSelect_2.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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>
- <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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: ''
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('threeCodeOut1');
- this.searchValue2 = uni.getStorageSync('threeCodeOut2');
- this.getOrderDetlList(this.searchValue1,10)
- },
- 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}/orderDetl/pakout/list/authV8`,
- 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.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' })
- }
- }
- })
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('threeCodeOut1', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- item['orderType'] = 'bcp'
- uni.navigateTo({
- url: './orderCheck_2',
- success(res) {
- res.eventChannel.emit('item', {
- item: item,
- }),
- res.eventChannel.emit('type', {
- type: "bcp"
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/orderOut/orderCheck.vue b/pages/phyz/orderOut/orderCheck.vue
deleted file mode 100644
index 7cea021..0000000
--- a/pages/phyz/orderOut/orderCheck.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<template>
- <view>
- <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
- <view>搴撲綅锛歿{item.locNo}}</view>
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>鑷敱椤癸細{{item.containerCode}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view>搴撳瓨鏁伴噺锛歿{item.count}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍑哄簱鏁伴噺锛歿{item.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise(item)">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 20px;">鍑哄簱绔欙細
- <!-- @click="toggleDropdown(item)" -->
- <view class="dropdown" >
- <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 16px;" v-model="item.agvStaNo" placeholder=" 璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
- <!-- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons> -->
- <view style="font-size: 10px;">鍙敮鎸佹壂鐮�</view>
- <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view> -->
- </view>
- </view>
- <button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </view>
- <view class="btn">
- <view class="btn-left" @click="addClose">鍙栨秷</view>
- <view class="btn-right" @click="addConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <view style="height: 100rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- data: {},
- dataList: [],
- option: '',
- options: [],
- combDis: false,
- maxCount: 0,
- orderType: ''
- }
- },
- 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('mat', function(data) {
- // let ids = [data.mat.id]
- // _this.getPakoutList(ids,data.mat.locNo)
- // })
- eventChannel.on('item', function(data) {
- let ids = [data.item.id]
- if (data.item.orderType == 'bcp') {
- _this.getPakoutList(ids,'bcp')
- } else {
- _this.getPakoutList(ids,null)
- }
-
- })
- eventChannel.on('type', function(data) {
- console.log(data);
- if (data) {
- _this.orderType = data.type
- }
- })
- },
- methods: {
- max() {
- this.data.anfme = this.data.count
- },
- toggleDropdown(item) {
- this.options = []
- item.isOpen = !item.isOpen;
- for (let k of item.agvStaNos) {
- this.options.push(k)
- }
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- staInput(item,items,index) {
- var flag = false
- for (let k of items) {
- if (k == item) flag = true
- }
- console.log(item);
- if(!flag) {
- uni.showToast({ title: '褰撳墠绔欑偣鏃犳硶浣跨敤锛屽凡澶嶄綅', icon: "error", position: 'top' })
- setTimeout(() => {
- this.dataList[index].agvStaNo = ''
- }, 100);
- }
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids,bcp) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/bcp/out/pakout/preview/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- if (k.locNo != null) {
- k['isOpen'] = false
- k['count'] = k.anfme
- k.agvStaNo = ''
- k.anfme = 0
- if (_this.orderType == 'bcp') {
- if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
- continue
- }
- }
- _this.dataList.push(k)
- }
- }
- } 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' })
- }
- }
- })
- },
- revise(item) {
- this.data = item
- this.maxCount = item.count
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- combConfirm(item) {
- let _this = this
- _this.combDis = true
- if (_this.data.anfme == 0) {
- uni.showToast({ title: '鍑哄簱鏁伴噺涓嶈兘涓�0锛�', icon: "error", position: 'top'})
- return
- }
- uni.showLoading({})
- let combList = []
- combList.push(item)
- uni.request({
- url: `${_this.baseUrl}/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- _this.combDis = false
- res = res.data
- if (res.code === 200) {
- uni.hideLoading({})
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- _this.combDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style scoped>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 34px;
- font-weight: bold;
- }
- .dropdown-item {
- font-size: 20px;
- font-weight: bold;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/orderOut/orderCheck_2.vue b/pages/phyz/orderOut/orderCheck_2.vue
deleted file mode 100644
index f7b39b0..0000000
--- a/pages/phyz/orderOut/orderCheck_2.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
- <view>
- <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
- <view>搴撲綅锛歿{item.locNo}}</view>
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>鑷敱椤癸細{{item.containerCode}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view>搴撳瓨鏁伴噺锛歿{item.count}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍑哄簱鏁伴噺锛歿{item.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise(item)">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 20px;">鍑哄簱绔欙細
- <!-- @click="toggleDropdown(item)" -->
- <view class="dropdown" >
- <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 16px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
- <!-- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons> -->
-
- <view style="font-size: 10px;">鍙敮鎸佹壂鐮�</view>
- <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view> -->
- </view>
- </view>
- <button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </view>
- <view class="btn">
- <view class="btn-left" @click="addClose">鍙栨秷</view>
- <view class="btn-right" @click="addConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <view style="height: 100rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- data: {},
- dataList: [],
- option: '',
- options: [],
- combDis: false,
- maxCount: 0,
- orderType: ''
- }
- },
- 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('mat', function(data) {
- // let ids = [data.mat.id]
- // _this.getPakoutList(ids,data.mat.locNo)
- // })
- eventChannel.on('item', function(data) {
- let ids = [data.item.id]
- if (data.item.orderType == 'bcp') {
- _this.getPakoutList(ids,'bcp')
- } else {
- _this.getPakoutList(ids,null)
- }
-
- })
- eventChannel.on('type', function(data) {
- console.log(data);
- if (data) {
- _this.orderType = data.type
- }
- })
- },
- methods: {
- max() {
- this.data.anfme = this.data.count
- },
- toggleDropdown(item) {
- this.options = []
- item.isOpen = !item.isOpen;
- for (let k of item.agvStaNos) {
- this.options.push(k)
- }
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- staInput(item,items,index) {
- var flag = false
- for (let k of items) {
- if (k == item) flag = true
- }
- if(!flag) {
- uni.showToast({ title: '褰撳墠绔欑偣鏃犳硶浣跨敤锛屽凡澶嶄綅', icon: "error", position: 'top' })
- setTimeout(() => {
- this.dataList[index].agvStaNo = ''
- }, 100);
- }
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids,bcp) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/bcp/out/pakout/preview/auth/v2`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- if (k.locNo != null) {
- k['isOpen'] = false
- k['count'] = k.anfme
- k.agvStaNo = ''
- k.anfme = 0
- // if (_this.orderType == 'bcp') {
- // if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
- // continue
- // }
- // }
- _this.dataList.push(k)
- }
- }
- console.log(_this.dataList);
- } 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' })
- }
- }
- })
- },
- revise(item) {
- this.data = item
- this.maxCount = item.count
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- combConfirm(item) {
- let _this = this
- _this.combDis = true
- if (_this.data.anfme == 0) {
- uni.showToast({ title: '鍑哄簱鏁伴噺涓嶈兘涓�0锛�', icon: "error", position: 'top'})
- return
- }
- uni.showLoading({})
- let combList = []
- combList.push(item)
- uni.request({
- url: `${_this.baseUrl}/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- _this.combDis = false
- res = res.data
- if (res.code === 200) {
- uni.hideLoading({})
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- _this.combDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style scoped>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 34px;
- font-weight: bold;
- }
- .dropdown-item {
- font-size: 20px;
- font-weight: bold;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/orderOut/orderList.vue b/pages/phyz/orderOut/orderList.vue
deleted file mode 100644
index 0e1a776..0000000
--- a/pages/phyz/orderOut/orderList.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<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
- 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/orderOut/orderOutSelect.vue b/pages/phyz/orderOut/orderOutSelect.vue
deleted file mode 100644
index 2e9e2ea..0000000
--- a/pages/phyz/orderOut/orderOutSelect.vue
+++ /dev/null
@@ -1,385 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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 class="buttom">
- <view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
- 鍚嶇О
- </view>
- <uni-search-bar v-model="searchValue2" style="width: 100%;"
- maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- </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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: ''
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('threeCodeOut193');
- this.searchValue2 = uni.getStorageSync('threeCodeOut2');
- this.getOrderDetlList(this.searchValue1,10)
- },
- methods: {
- getOrderDetlList(threeCode,limit) {
- // this.get(threeCode,limit)
- uni.showLoading({})
- let _this = this
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = limit
- uni.request({
- url: `${_this.baseUrl}/orderDetl/pakout/list/authV3`,
- 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.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' })
- }
- }
- })
- },
- get(threeCode,limit) {
- let _this = this
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = 10
- for (var i = 0; i < 30; i++) {
- console.log(1);
- uni.request({
- url: `${_this.baseUrl}/orderDetl/pakout/list/authV3`,
- header: {'token': uni.getStorageSync('token')},
- data: _this.data,
- method: 'GET',
- success(res) {
-
- }
- })
- }
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('threeCodeOut193', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('threeCodeOut193', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- uni.navigateTo({
- url: './orderCheck',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.orderNo
- this.data.brand = this.brand
- this.getOrderDetlList(this.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/orderOut/orderOutSelectV2.vue b/pages/phyz/orderOut/orderOutSelectV2.vue
deleted file mode 100644
index 05ad07d..0000000
--- a/pages/phyz/orderOut/orderOutSelectV2.vue
+++ /dev/null
@@ -1,402 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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 class="buttom">
- <view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
- 鍚嶇О
- </view>
- <uni-search-bar v-model="searchValue2" style="width: 100%;"
- maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- </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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: '',
- orderType: null
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- let _this = this
- const eventChannel = this.getOpenerEventChannel();
- eventChannel.on('param', function(data) {
- var orderType = data.param.orderType
- if (orderType != [] || orderType != null) {
- uni.setStorageSync('dataOrderTypeOut', orderType);
- _this.data.orderType = orderType
- } else {
- orderType = uni.getStorageSync('dataOrderTypeOut');
- if (orderType != [] || orderType != null) {
- _this.data.orderType = orderType
- } else {
- _this.data.orderType = []
- }
- }
- _this.baseUrl = uni.getStorageSync('baseUrl');
- _this.token = uni.getStorageSync('token');
- _this.searchValue = uni.getStorageSync('threeCode');
- _this.getOrderDetlList(_this.searchValue,10)
- console.log("onLoad");
- })
- },
- methods: {
- getOrderDetlList(threeCode,limit) {
- // this.get(threeCode,limit)
- uni.showLoading({})
- let _this = this
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = limit
- uni.request({
- url: `${_this.baseUrl}/orderDetl/pakout/list/authV7`,
- 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.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' })
- }
- }
- })
- },
- get(threeCode,limit) {
- let _this = this
- _this.mask = true
- _this.data.three_code = threeCode
- _this.data.limit = 10
- for (var i = 0; i < 30; i++) {
- console.log(1);
- uni.request({
- url: `${_this.baseUrl}/orderDetl/pakout/list/authV3`,
- header: {'token': uni.getStorageSync('token')},
- data: _this.data,
- method: 'GET',
- success(res) {
-
- }
- })
- }
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('threeCodeOut193', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('threeCodeOut193', this.searchValue1);
- uni.setStorageSync('threeCodeOut2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- uni.navigateTo({
- url: './orderCheck',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.orderNo
- this.data.brand = this.brand
- this.getOrderDetlList(this.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/processOrder/orderCheck.vue b/pages/phyz/processOrder/orderCheck.vue
deleted file mode 100644
index 3addaff..0000000
--- a/pages/phyz/processOrder/orderCheck.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-<template>
- <view>
- <view class="list shop-car" v-for="(item,index) in dataList" :key="index">
- <view class="list-left">
- <view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
- <view>搴撲綅锛歿{item.locNo}}</view>
- <view>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>鑷敱椤癸細{{item.containerCode}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view>搴撳瓨鏁伴噺锛歿{item.count}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍑哄簱鏁伴噺锛歿{item.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise(item)">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 20px;">鍑哄簱绔欙細
- <!-- @click="toggleDropdown(item)" -->
- <view class="dropdown" >
- <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 16px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
- <view style="font-size: 10px;">鍙敮鎸佹壂鐮�</view>
- <!-- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons> -->
- <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view> -->
- </view>
- </view>
- <button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </view>
- <view class="btn">
- <view class="btn-left" @click="addClose">鍙栨秷</view>
- <view class="btn-right" @click="addConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <view style="height: 100rpx;"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <!-- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view> -->
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- data: {},
- dataList: [],
- option: '',
- options: [],
- combDis: false,
- maxCount: 0,
- orderType: ''
- }
- },
- 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('mat', function(data) {
- // let ids = [data.mat.id]
- // _this.getPakoutList(ids,data.mat.locNo)
- // })
- eventChannel.on('item', function(data) {
- let ids = [data.item.id]
- _this.getPakoutList(ids)
- })
- eventChannel.on('type', function(data) {
- console.log(data);
- if (data) {
- _this.orderType = data.type
- }
- })
- },
- methods: {
- max() {
- this.data.anfme = this.data.count
- },
- toggleDropdown(item) {
- this.options = []
- item.isOpen = !item.isOpen;
- for (let k of item.agvStaNos) {
- this.options.push(k)
- }
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- staInput(item,items,index) {
- var flag = false
- for (let k of items) {
- if (k == item) flag = true
- }
- if(!flag) {
- uni.showToast({ title: '褰撳墠绔欑偣鏃犳硶浣跨敤锛屽凡澶嶄綅', icon: "error", position: 'top' })
- setTimeout(() => {
- this.dataList[index].agvStaNo = ''
- }, 100);
- }
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids,locNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/out/pakout/preview/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data) {
- if (k.locNo != null) {
- k['isOpen'] = false
- k['count'] = k.anfme
- k.agvStaNo = ''
- k.anfme = 0
- if (_this.orderType == 'bcp') {
- if (k.locNo.substring(k.locNo.length - 1, k.locNo.length) == 1) {
- continue
- }
- }
- _this.dataList.push(k)
- }
- }
- } 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' })
- }
- }
- })
- },
- revise(item) {
- this.data = item
- this.maxCount = item.count
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- combConfirm(item) {
- let _this = this
- if (item.anfme == 0) {
- uni.showToast({ title: '鍑哄簱鏁伴噺涓嶈兘涓�0锛�', icon: "error", position: 'top'})
- return
- }
- _this.combDis = true
- uni.showLoading({})
- let combList = []
- combList.push(item)
- uni.request({
- url: `${_this.baseUrl}/process/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- _this.combDis = false
- res = res.data
- if (res.code === 200) {
- uni.hideLoading({})
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- _this.combDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style scoped>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 34px;
- font-weight: bold;
- }
- .dropdown-item {
- font-size: 20px;
- font-weight: bold;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/processOrder/orderCheck2.vue b/pages/phyz/processOrder/orderCheck2.vue
deleted file mode 100644
index 876c88e..0000000
--- a/pages/phyz/processOrder/orderCheck2.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
- <view>
- <view class="list shop-car">
- <view class="list-left">
- <view class="detl-threeCode" style="padding: 16rpx 0;">{{data.csocode}}</view>
- <view>搴撲綅锛歿{data.locNo}}</view>
- <view>缂栧彿锛歿{data.matnr}}</view>
- <view>鍚嶇О锛歿{data.maktx}}</view>
- <view>鑷敱椤癸細{{data.containerCode}}</view>
- <view>瑙勬牸锛歿{data.specs}}</view>
- <view>鎵瑰彿锛歿{data.batch}}</view>
- <view>宸ュ簭锛歿{data.processSts$}}</view>
- <view>搴撳瓨鏁伴噺锛歿{count}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍑哄簱鏁伴噺锛歿{data.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise()">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </view>
-
- <view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 20px;">鍑哄簱绔欙細
- <!-- @click="toggleDropdown(item)" -->
- <view class="dropdown" >
- <!-- <view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view> -->
- <input @input="staInput(item.agvStaNo,item.agvStaNos,index)" type="text" style="width: 270rpx;font-size: 16px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
- <view style="font-size: 10px;">鍙敮鎸佹壂鐮�</view>
- <!-- <uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons> -->
- <!-- <scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
- <view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
- </scroll-view> -->
- </view>
- </view>
- </view>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="count" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </view>
- <view class="btn">
- <view class="btn-left" @click="addClose">鍙栨秷</view>
- <view class="btn-right" @click="addConfirm()">纭</view>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
- <button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- data: {},
- option: '',
- count: 0,
- combDis: false
- }
- },
- 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('mat', function(data) {
- let ids = [data.mat.id]
- _this.getPakoutList(ids,data.mat.locNo)
- })
- },
- methods: {
- max() {
- this.data.anfme = this.count
- },
- staInput(item,items,index) {
- var flag = false
- for (let k of items) {
- if (k == item) flag = true
- }
- if(!flag) {
- uni.showToast({ title: '褰撳墠绔欑偣鏃犳硶浣跨敤锛屽凡澶嶄綅', icon: "error", position: 'top' })
- setTimeout(() => {
- this.dataList[index].agvStaNo = ''
- }, 100);
- }
- },
- toggleDropdown(item) {
- item.isOpen = !item.isOpen;
- },
- selected(option,item) {
- item.agvStaNo = option
- },
- // 璁㈠崟鏄庣粏
- getPakoutList(ids,locNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/out/pakout/preview/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: ids,
- method: 'POST',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- for (let k of res.data) {
- if (locNo == k.locNo) {
- k['isOpen'] = false
- _this.count = k.anfme
- // k.anfme = 0
- switch (k.processSts) {
- case 1:
- k["processSts$"] = "寰呭姞宸�"
- break;
- case 2:
- k["processSts$"] = "宸插姞宸�"
- break;
- case 3:
- k["processSts$"] = "鏃犻渶鍔犲伐"
- break;
- }
- _this.data = k
- return
- }
- }
- } 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' })
- }
- }
- })
- },
- revise() {
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- // this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- combConfirm() {
- let _this = this
- _this.combDis = true
- if (_this.data.anfme == 0) {
- uni.showToast({ title: '鍑哄簱鏁伴噺涓嶈兘涓�0锛�', icon: "error", position: 'top'})
- return
- }
- uni.showLoading({})
- let combList = []
- combList.push(_this.data)
- uni.request({
- url: `${_this.baseUrl}/process/out/pakout/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: combList,
- method: 'POST',
- success(res) {
- _this.combDis = false
- res = res.data
- if (res.code === 200) {
- uni.hideLoading({})
- uni.showToast({ title: '鍑哄簱鎴愬姛', icon: "success", position: 'top'})
- setTimeout(()=> {
- uni.navigateBack({
- delta: 2
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- _this.combDis = false
- }
- })
- }
- }
- }
-</script>
-
-<style scoped>
- @import url('../../../static/css/common/order.css');
- .shop-car {
- background-color: #2299ff;
- color: #fff;
- }
- .detl-threeCode {
- font-size: 34px;
- font-weight: bold;
- }
- .dropdown-item {
- font-size: 20px;
- font-weight: bold;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/processOrder/processList.vue b/pages/phyz/processOrder/processList.vue
deleted file mode 100644
index a3fd4f7..0000000
--- a/pages/phyz/processOrder/processList.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<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.processSts$}}</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/v2`,
- header: { 'token': uni.getStorageSync('token') },
- data: {
- orderNo: orderNo,
- threeCode: threeCode ,
- matnr: matnr,
- floor: "F1"
- },
- 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) {
- console.log(item);
- let _this = this
- 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
deleted file mode 100644
index 1b8006e..0000000
--- a/pages/phyz/processOrder/processOrder.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>寰呭姞宸ワ細{{orderDetl.stock}}</view>
- <view>宸插姞宸ワ細{{orderDetl.qty}}</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 class="buttom">
- <view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
- 鍚嶇О
- </view>
- <uni-search-bar v-model="searchValue2" style="width: 100%;"
- maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- </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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: ''
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('processCode1');
- this.searchValue2 = uni.getStorageSync('processCode2');
- this.getOrderDetlList(this.searchValue1,10)
- },
- 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}/orderDetl/pakout/list/authV5`,
- 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.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' })
- }
- }
- })
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('processCode1', this.searchValue1);
- uni.setStorageSync('processCode2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('processCode1', this.searchValue1);
- uni.setStorageSync('processCode2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- uni.navigateTo({
- url: './orderCheck',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.orderNo
- this.data.brand = this.brand
- this.getOrderDetlList(this.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/stationManage/confirmProcessed.vue b/pages/phyz/stationManage/confirmProcessed.vue
deleted file mode 100644
index f1984d5..0000000
--- a/pages/phyz/stationManage/confirmProcessed.vue
+++ /dev/null
@@ -1,423 +0,0 @@
-<template>
- <view>
- <view class="list list-font-color" style="background-color: #b9b9b9;" :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>
- <!-- 涓� -->
- <view style="display: flex;">
- <view style="flex: 1;">
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <!-- <view>搴撲綅鐘舵�侊細{{orderDetl.locSts$}}</view> -->
- <view>婧愬嚭搴撴暟閲忥細{{orderDetl.maxCount}}</view>
- <view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
- <view>鍔犲伐鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view style="margin-left: 50rpx;" @click="revise(orderDetl)">
- <uni-icons type="compose" size="30" color="#fff"></uni-icons>
- </view>
- </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>
- <uni-popup ref="addItem" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">鍑哄簱鏁伴噺</view>
- <view class="popup-item">
- <view>
- <uni-number-box :value="data.anfme" :step='0.01' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
- </view>
-
- </view>
- <!-- <view class="popup-item">
- <view>
- <view @click="max()" style="padding: 0rpx 16rpx;background-color: #d9d9d9;font-size: 10px;">MAX</view>
- </view>
-
- </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="process" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">绔欑偣鍙�:</view>
- <view class="popup-item-right"><input type="text" v-model="devNo"></view>
- </view>
- <view class="popup-item">
- <view class="popup-item-left">鐩爣妤煎眰:</view>
- <view class="popup-item-right" style="border: none;">
- <uni-combox style="height: 50rpx;" :candidates="floorList" placeholder="璇烽�夋嫨鐩爣妤煎眰" v-model="floor">
- </uni-combox></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="processedClose">鍙栨秷</button>
- <button class="btn-right" @click="processedConfirm()" :disabled="processedDis">鍔犲伐瀹屾垚</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" type="primary" @click="processed('warn')">纭鍔犲伐</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- dataList: [],
- floorList:['浜屽巶','涓夊巶'],
- floor: '',
- count: 0,
- containerType: '',
- isOpen: true,
- option: '',
- selects: [],
- orderId: '',
- data: '',
- maxCount: '',
- processedDis: false,
- barcode: '',
- devNo: ''
- }
- },
- 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);
- for (let k of data.item) {
- k['maxCount'] = k.anfme
- _this.getWrkDetl(k.wrkNo)
- }
- // _this.dataList = require('lodash').cloneDeep(data.item)
- })
- },
- methods: {
- // 鑾峰彇宸ヤ綔鏄庣粏
- getWrkDetl(wrkNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- wrk_no: wrkNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let k of res.data.records) {
- k['maxCount'] = k.anfme
- if (k.threeCode) {
- if (k.threeCode.includes("B")) {
- _this.floor = '浜屽巶'
- } else if (k.threeCode.includes("G")) {
- _this.floor = '涓夊巶'
- } else {
- _this.floor = ''
- }
- }
- }
- _this.dataList = res.data.records
- } 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' })
- }
- }
- })
- },
- processed() {
- this.$refs.process.open()
- },
- processedClose() {
- this.$refs.process.close()
- },
- processedConfirm() {
- let factor = ''
- if (!this.floor) {
- uni.showToast({ title: '璇烽�夋嫨妤煎眰', icon: "error", position: 'top' })
- return
- }
- if (this.floor == '浜屽巶') {
- factor = 'B'
- } else if (this.floor == '涓夊巶') {
- factor = 'G'
- }
- this.processedDis = true
- let that = this
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/processed/v2',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.devNo, barcode: that.barcode,wrkDetls:that.dataList,factory: factor},
- method: 'POST',
- success(result) {
- that.processedDis = false
- var res = result.data
- if (res.code === 200) {
- that.$refs.process.close()
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "success", position: 'top' })
- setTimeout(()=> {
- uni.navigateBack({
- delta:1
- });
- },700)
- } 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' })
- }
- },
- fail(res) {
- that.processedDis = false
- }
- });
- },
- max() {
- this.data.anfme = this.data.count
- },
- addClose() {
- this.$refs.addItem.close()
- // this.data.anfme = 0
- },
- addConfirm() {
- this.$refs.addItem.close()
- },
- revise(item) {
- this.data = item
- this.maxCount = item.maxCount
- this.$refs.addItem.open()
- },
- changeValue(value) {
- this.data.anfme = value
- },
- pakoutPrive(item) {
- console.log(item);
- let _this = this
- 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 {
- 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;
- height: 100%;
- 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/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue
deleted file mode 100644
index ec5d9b2..0000000
--- a/pages/phyz/stationManage/pickAgain.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>璁㈠崟鍙嚭鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸叉嫞鏁伴噺锛歿{orderDetl.pickedAnfme}}</view>
- <view>鎷ｆ枡鏁伴噺锛歿{orderDetl.count}}</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: 100rpx;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='0.01' :max="maxCount" 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 class="buttom">
- <button size="mini" type="primary" @click="confirmPick('warn')" :disabled="pickAgaDis">纭鎷ｆ枡</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- dataList: [],
- orderCarList: [],
- pickList: [],
- index: 0,
- count: 0,
- maxCount: 0,
- wrkNo: '',
- locNo: '',
- pickedAnfme: 0,
- pickAgaDis: false
- }
- },
- 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);
- _this.pickList = data.wrkDetls
- _this.wrkNo = data.wrkDetls[0].wrkNo
- _this.locNo = data.item.sourceLocNo
- _this.getWrkDetl(data.wrkDetls[0].wrkNo)
- })
- },
- methods: {
- getLocDetl(locNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/locDetl/list/auth/v2`,
- header: { 'token': uni.getStorageSync('token') },
- data: {
- curr: 1,
- limit: 999,
- loc_no: locNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- // console.log(res);
- if (res.code === 200) {
- _this.chosed(_this.pickList,res.data.records)
- return
- let enbleList = [], isfl;
- for (let k of res.data.records) {
- isfl = false;
- for (let j of _this.pickList) {
- if (j.matnr == k.matnr && j.threeCode == k.threeCode) {
- isfl = true;
- break
- } else {
- if (k.stock == -1) {
- k['color'] = 'order-sts-end'
- } else {
- k.stock = k.stock >= k.anfme ? k.anfme : k.stock
- k['color'] = 'order-sts-start'
- }
- k['count'] = 0
-
- }
- }
- if (!isfl) {
- enbleList.push(k)
- }
-
- }
- _this.dataList = enbleList
-
- } 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' })
- }
- },
- })
- },
- // 鑾峰彇宸ヤ綔鏄庣粏
- getWrkDetl(wrkNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- wrk_no: wrkNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.pickList = res.data.records
- _this.getLocDetl(_this.locNo)
- } 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' })
- }
- }
- })
- },
- // 宸查�夋嫞鏂欏垪琛�
- chosed(wrkDetls,locDetls) {
- console.log(wrkDetls,locDetls);
- let isfl = false, enbleList = []
- for (let locDetl of locDetls) {
- locDetl['color'] = 'order-sts-start'
- locDetl['pickedAnfme'] = 0
- locDetl['count'] = 0
- for (let wrkDetl of wrkDetls) {
- console.log(wrkDetl);
- if (wrkDetl.threeCode.replace(/\s/g, "") == locDetl.threeCode.replace(/\s/g, "") && wrkDetl.matnr == locDetl.matnr) {
- console.log(wrkDetl);
- locDetl['pickedAnfme'] = wrkDetl.anfme
- if (locDetl.stock == -1) {
- locDetl.stock = 0
- }
- if (wrkDetl.anfme < locDetl.anfme) {
- locDetl['color'] = 'order-sts-working'
- locDetl['pickedAnfme'] = wrkDetl.anfme
- locDetl['count'] = 0
- } else {
- locDetl['color'] = 'order-sts-end'
- }
- break
- }
- }
-
- }
- this.dataList = locDetls
- },
- // 娣诲姞鍏ュ簱鍟嗗搧鑷� 寰呯粍鎵樺垪琛�
- addItem(index) {
- // 鍒ゆ柇娣诲姞鐨勫晢鍝佹槸鍚﹀拰宸茬粡娣诲姞鐨勯噸澶�
- let dataList = this.dataList
- this.index = index
- let orderCount = this.dataList[index].stock
- let locCount = this.dataList[index].anfme
- let pickedAnfme = this.dataList[index].pickedAnfme
- // 棰勮鏈�澶ц鍑哄簱
- let ftCount = pickedAnfme + orderCount
-
- if (orderCount > locCount) {
- this.maxCount = locCount - pickedAnfme
- } else {
- if (ftCount > locCount) {
- this.maxCount = locCount -pickedAnfme
- } else {
- this.maxCount = orderCount
- }
-
- }
-
- this.$refs.addItem.open()
- },
- addClose() {
- this.$refs.addItem.close()
- },
- addConfirm() {
- this.dataList[this.index].count = this.count
- this.count = 0
- this.$refs.addItem.close()
- },
- changeValue(value) {
- this.count = value
- },
- // 纭鍐嶆鎷ｆ枡
- confirmPick() {
- this.pickAgaDis = true
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agvMobile/pick/again/auth`,
- header: { 'token': uni.getStorageSync('token') },
- data: JSON.stringify({
- wrkNo: _this.wrkNo,
- locNo: _this.locNo,
- picks: _this.dataList
- }),
- method: 'POST',
- success(res) {
- _this.pickAgaDis = false
- res = res.data
- if (res.code === 200) {
- _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
- setTimeout(()=>{
- uni.navigateBack()
- },700)
- } 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' })
- }
- }
- })
- },
- fail(res) {
- _this.pickAgaDis = false
- }
- }
- }
-</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;
- }
- .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;
- }
-
- .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;
- }
-</style>
diff --git a/pages/phyz/stationManage/pickAgainDetl.vue b/pages/phyz/stationManage/pickAgainDetl.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/phyz/stationManage/pickAgainDetl.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- }
- },
- methods: {
-
- }
- }
-</script>
-
-<style>
-
-</style>
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
deleted file mode 100644
index 01a5687..0000000
--- a/pages/phyz/stationManage/stationDetl.vue
+++ /dev/null
@@ -1,1267 +0,0 @@
-<template>
- <view>
- <!-- 绔欑偣璇︽儏 -->
- <view class="station" :class="station.style" v-if="station">
- <view class="mt-flex">
- <view class="station-title" style="flex: 1;">{{station.devNo}}</view>
- <view><button size="mini" :loading="reload.loading" @click="reloadStation()">{{reload.loadingText}}</button></view>
- </view>
- <view>绔欑偣绫诲瀷锛歿{station.locType1$}}鍖�</view>
- <view>璐ф灦鍓嶄袱浣嶏細{{station.locType2$}}</view>
- <view>绔欑偣鐘舵�侊細{{station.locSts$}}</view>
- <view class="mt-flex">
- <view class="station-barcode" style="flex: 1">璐ф灦鐮侊細<text>{{station.barcode ? station.barcode : '--'}}</text></view>
- <view v-if="station.barcode && station.locSts == 'F'">
- <!-- <button size="mini" type="warn" @click="unbind()">瑙ｉ櫎缁戝畾</button> -->
- </view>
- </view>
- </view>
-
-
- <!-- 宸ヤ綔妗� -->
- <view class="wrkMast" v-if="wrkMast">
- <view class="wrkMast-wrkNo">
- <view style="flex:5">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
- <view style="flex:3;text-align: right;">{{wrkMast.ioTitle}}</view>
- </view>
- <view>宸ヤ綔绫诲瀷: {{wrkMast.ioType$}}</view>
- <view>宸ヤ綔鐘舵��: {{wrkMast.wrkSts$}}</view>
- <view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
- <view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
- <view v-if="wrkMast.ioType == 111">鐩爣妤煎眰: {{wrkMast.crnNo}}</view>
- </view>
-
- <!-- 鏄庣粏 -->
- <view class="wrkDetls" v-if="wrkDetls.length > 0">
- <view style="font-weight: bold;">宸ヤ綔鏄庣粏</view>
- <view class="wrkDetl" v-for="wrkDetl in wrkDetls">
- <view>鍟嗗搧鍚嶇О:{{wrkDetl.maktx}}</view>
- <view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
- <view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
- <view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
- <view>浣滀笟鏁伴噺:{{wrkDetl.anfme}}</view>
- </view>
- </view>
-
-
- <!-- 缁勬墭鏄庣粏 -->
- <view class="waitPakins" v-if="waitPakins.length > 0">
- <view style="font-weight: bold;">缁勬墭鏄庣粏</view>
- <view class="waitPakin" v-for="waitPakin in waitPakins">
- <view>鍟嗗搧鍚嶇О:{{waitPakin.maktx}}</view>
- <view>鍟嗗搧缂栫爜:{{waitPakin.matnr}}</view>
- <view>璁㈠崟缂栧彿:{{waitPakin.orderNo}}</view>
- <view>閿�鍞鍗曞彿:{{waitPakin.threeCode ? waitPakin.threeCode : ' --'}}</view>
- <view>鑷敱椤�:{{waitPakin.deadTime ? waitPakin.deadTime : ' --'}}</view>
- <view>鐘舵��:{{waitPakin.ioStatus$}}</view>
- <view>鍏ュ簱鏁伴噺:{{waitPakin.anfme}}</view>
-
- </view>
- </view>
-
- <view style="height: 140rpx;"></view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="emptyPakin" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="emptyPakinClose">鍙栨秷</button>
- <button class="btn-right" @click="emptyPakinConfirm()" :disabled="emptyPakinDis">绌烘灦鍏ュ簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="doBack" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="doBackClose">鍙栨秷</button>
- <button class="btn-right" @click="doBackConfirm()" :disabled="doBackDis">閫�搴�</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="doContainerMoveOut" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="containerMoveOutClose">鍙栨秷</button>
- <button class="btn-right" @click="containerMoveOut()" :disabled="containerMoveOutDis">纭鍑哄簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="doContainerMoveOut2" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="containerMoveOutClose">鍙栨秷</button>
- <button class="btn-right" @click="containerMoveOut2()" :disabled="containerMoveOut2Dis">纭绂诲満</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="doPickIn" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="pickInClose">鍙栨秷</button>
- <button class="btn-right" @click="pickIn()" :disabled="pickInDis">纭鎷ｆ枡</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="emptyOut" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇烽�夋嫨璐ф灦绫诲瀷</view>
- <view class="popup-item">
- <view class="dropdown" @click="toggleDropdown()">
- <input type="text" style="width: 650rpx;" v-model="containerType" placeholder="璇烽�夋嫨璐ф灦绫诲瀷">
- <uni-icons :type="isOpen ? 'top' : 'bottom'" color="#c1c1c1" style="margin-left: 10rpx;"></uni-icons>
- <scroll-view scroll-y="ture" class="dropdown-content" v-if="isOpen">
- <view class="dropdown-item" v-for="option in selects" @click="selected(option)">{{option}}</view>
- </scroll-view>
- </view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="emptyOutClose">鍙栨秷</button>
- <button class="btn-right" @click="emptyOutConfirm()" :disabled="emptyOutDis">鍑哄簱</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="allocationIn" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="allocationInClose">鍙栨秷</button>
- <button class="btn-right" @click="allocationInConfirm()" :disabled="allocationInDis">纭杩涘満</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="allocationOut" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="allocationOutClose">鍙栨秷</view>
- <view class="btn-right" @click="allocationOutConfirm()" :disabled="allocationOutDis">纭绂诲満</view>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="empIn" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="empInClose">鍙栨秷</button>
- <button class="btn-right" @click="empInConfirm()" :disabled="empInDis">纭杩涘満</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="empOut" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="empOutClose">鍙栨秷</button>
- <button class="btn-right" @click="empOutConfirm()" :disabled="empOutDis">纭绂诲満</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 寮圭獥 -->
- <view>
- <uni-popup ref="process" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <button class="btn-left" @click="processedClose">鍙栨秷</button>
- <button class="btn-right" @click="processedConfirm()" :disabled="processedDis">鍔犲伐瀹屾垚</button>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
- <button size="mini" :disabled="dis" type="warn" @click="doBack()" v-if="btnType == 'out' || btnType == 'pick'">閫�搴搟{sec}}</button>
- <!-- <button size="mini" type="primary" @click="handBack()" v-if="btnType == 'handBack'">杞墜鍔�</button> -->
- <!-- <button size="mini" type="warn" @click="doBack()" v-if="btnType == 'out' || btnType == 'pick'">閫�搴�</button> -->
- <button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
- <button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
- <!-- <button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">璐ф灦绂诲満</button> -->
- <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
- <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
- <button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷ｆ枡</button>
- <button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
- <button size="mini" type="primary" @click="allocationOut()" v-if="btnType == 'allocationOut'">璋冩嫧绂诲満</button>
- <button size="mini" type="primary" @click="allocationIn()" v-if="btnType == 'allocationIn'">璋冩嫧杩涘満</button>
- <button size="mini" type="primary" @click="empOut()" v-if="btnType == 'empOut'">绌烘灦绂诲満</button>
- <button size="mini" type="primary" @click="empIn()" v-if="btnType == 'empIn'">绌烘灦杩涘満</button>
- <button size="mini" type="primary" @click="processed()" v-if="btnType == 'processed'">宸插姞宸ュ洖搴�</button>
- </view>
- </view>
-</template>
-
-<script>
- import utils from '@/pages/phyz/utils/utils.js'
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- station: null,
- reload: {
- loading: false,
- loadingText: '鏇存柊鐘舵��'
- },
- btnType: 'emptyPakin',
- barcode: '',
- containerType: '',
- selects: [],
- option: '',
- isOpen: false,
- wrkMast: '',
- wrkDetls: [],
- waitPakins: [],
- dis: true,
- sec: '',
- emptyPakinDis: false,
- containerMoveOutDis: false,
- containerMoveOut2Dis: false,
- pickInDis: false,
- emptyOutDis: false,
- allocationInDis: false,
- allocationOutDis:false,
- empInDis: false,
- empOutDis: false,
- doBackDis: false,
- processedDis: false
- }
- },
- 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) {
- _this.station = data.item
- _this.reloadStation()
- })
- setInterval(()=> {
- let k = utils.checkSec()
- // console.log(k);
- if (k == 180) {
- this.dis = false
- this.sec = ''
- } else {
- this.dis = true
- this.sec = k + "绉掑悗閲嶈瘯"
- }
- },1000)
-
-
- },
- methods: {
- // 鏇存柊绔欑偣
- reloadStation() {
- let _this = this
- _this.reload.loading = true
- _this.reload.loadingText = '鏇存柊涓�...'
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: { curr: 1, limit: 1000, dev_no: _this.station.devNo },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- if (res.data.records[0].locSts == 'O') {
- if (res.data.records[0].devNo.substring(0, 2) == "DB") {
- if (res.data.records[0].floor != 1) {
- _this.btnType = 'allocationIn'
- } else {
- _this.btnType = 'empIn'
- }
- } else {
- _this.btnType = 'emptyPakin'
- }
- } else if (res.data.records[0].locSts == 'F') {
- _this.btnType = 'pakin'
- } else {
- _this.btnType = 'working'
- }
-
- setTimeout(()=>{
- for (let k of res.data.records) {
- if (k.locSts != 'O') {
- k['style'] = 'station-wrk'
- } else {
- k['style'] = 'station-nowrk'
- }
- }
- _this.station = res.data.records[0]
- _this.reload.loading = false
- _this.reload.loadingText = '鏇存柊鐘舵��'
- _this.getContainerType()
- },500)
- _this.getWrkMast(res.data.records[0].barcode)
- uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
- } 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' })
- }
- }
- })
- },
- // 绔欑偣瑙ｇ粦
- unbind() {
- let _this = this
- let data = {param: JSON.stringify(_this.station)}
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/unbind/auth`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: data,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.reloadStation()
- } 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' })
- }
- }
- })
- },
- // 绌烘澘鍏ュ簱纭
- emptyPakin() {
- this.$refs.emptyPakin.open()
- },
- emptyPakinClose() {
- this.$refs.emptyPakin.close()
- this.emptyPakinDis = false
- },
- emptyPakinConfirm() {
- let _this = this;
- this.barcode = this.barcode.replace(/\s+/g, '')
- _this.emptyPakinDis = true
- if (this.barcode.length != 6) {
- _this.emptyPakinDis = false
- uni.showToast({ title: '璐ф灦鏉＄爜寮傚父', icon: "error", position: 'top' })
- return
- }
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.barcode, }
- params.push(param)
- this.emptyPakinClose()
- uni.request({
- url: `${_this.baseUrl}/agvMobile/pakin/empty/auth`,
- data: { pad: params },
- method: 'POST',
- header: { 'token': uni.getStorageSync('token') },
- success(res) {
- var res = res.data
- _this.emptyPakinDis = false
- if (res.code === 200) {
- setTimeout(()=> {
- _this.barcode = ''
- _this.reloadStation()
- },1000)
- uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
- } 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' })
- }
- setTimeout(()=> {
-
- },100)
- },
- fail(res) {
- _this.emptyPakinDis = false
- }
- });
- },
- emptyOut() {
- this.$refs.emptyOut.open()
- },
- emptyOutClose() {
- this.$refs.emptyOut.close()
- },
- emptyOutConfirm() {
- this.emptyOutClose()
- this.emptyOutDis = true
- let _this = this;
- let params = []
- let param = { devNo: this.station.devNo, containerType: this.containerType, }
- params.push(param)
- uni.request({
- url: `${_this.baseUrl}/agvMobile/pakout/empty/auth`,
- data: { pad: params },
- method: 'POST',
- header: { 'token': uni.getStorageSync('token') },
- success(res) {
- var res = res.data
- _this.emptyOutDis = false
- if (res.code === 200) {
- setTimeout(()=> {
- _this.containerType = ''
- _this.reloadStation()
- },1000)
- uni.showToast({ title: '鍛煎彨鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- _this.emptyOutDis = false
- }
- });
- },
- getContainerType() {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agvMobile/pakout/empty/container/selector/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: JSON.stringify({devNo: _this.station.devNo}),
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.selects = 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' })
- }
- }
- })
- },
- // 寮�鍚� / 鍏抽棴涓嬫媺妗�
- toggleDropdown() {
- this.isOpen = !this.isOpen
- },
- // 閫夋嫨璐ф灦绫诲瀷
- selected(option) {
- this.containerType = option
- },
- // 鏌ヨ宸ヤ綔妗�
- getWrkMast(barcode) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- condition: _this.station.devNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200 && res.data.records.length > 0) {
- let mast = null
- for (let wrkMast of res.data.records) {
- if (wrkMast.ioType == 1) {
- wrkMast['ioTitle'] = '鍏ュ簱'
- } else if (wrkMast.ioType == 10) {
- wrkMast['ioTitle'] = '绌烘澘鍏ュ簱'
- } else if (wrkMast.ioType == 53) {
- wrkMast['ioTitle'] = '鎷ｆ枡鍥炲簱'
- } else if (wrkMast.ioType == 101) {
- wrkMast['ioTitle'] = '鍏ㄦ澘鍑哄簱'
- _this.btnType = 'out'
- } else if (wrkMast.ioType == 103) {
- wrkMast['ioTitle'] = '鎷ｆ枡鍑哄簱'
- _this.btnType = 'pick'
- } else if (wrkMast.ioType == 107) {
- wrkMast['ioTitle'] = '鍔犲伐鍑哄簱'
- _this.btnType = 'processed'
- } else if (wrkMast.ioType == 109) {
- wrkMast['ioTitle'] = '鑷姩鍥炴祦'
- _this.btnType = 'handBack'
- } else if (wrkMast.ioType == 110) {
- wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
- } else if (wrkMast.ioType == 111) {
- wrkMast['ioTitle'] = '璋冩嫧鍑哄簱'
- _this.btnType = 'allocationOut'
- } else if (wrkMast.ioType == 112) {
- wrkMast['ioTitle'] = '璋冩嫧鍏ュ簱'
- _this.btnType = 'null'
- } else if (wrkMast.ioType == 113) {
- if (wrkMast.wrkSts == 212) {
- wrkMast['ioTitle'] = '璐ф灦鍥炴祦'
- _this.btnType = 'empOut'
- }
- }
- if (wrkMast.barcode == barcode) {
- mast = wrkMast
- }
- }
-
- _this.wrkMast = mast
- _this.getWrkDetl(mast.wrkNo)
- } else if (res.code === 200 && res.data.records.length == 0) {
- _this.wrkMast = null
- _this.wrkDetls = []
- if (_this.station.barcode != '') {
- _this.getWaitPakin(_this.station.barcode)
- }
- } 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' })
- }
- }
- })
- },
- // 鑾峰彇宸ヤ綔鏄庣粏
- getWrkDetl(wrkNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- wrk_no: wrkNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.wrkDetls = res.data.records
- } 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' })
- }
- }
- })
- },
- // 鑾峰彇缁勬墭妗�
- getWaitPakin(barcode) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/waitPakin/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- supp_code: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.waitPakins = res.data.records
- _this.btnType = 'start'
- } 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' })
- }
- }
- })
- },
- // 鍏ㄦ澘鍑哄簱 纭鍑哄簱
- doContainerMoveOut() {
- this.$refs.doContainerMoveOut.open()
- },
- containerMoveOutClose() {
- this.$refs.doContainerMoveOut.close()
- },
- containerMoveOut() {
- this.containerMoveOutDis = true
- let _this = this
- let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
- header: { 'token': uni.getStorageSync('token')},
- data: JSON.stringify(devNo),
- method: 'POST',
- success(res) {
- res = res.data
- _this.containerMoveOutDis = false
- if (res.code === 200) {
- _this.$refs.doContainerMoveOut.close()
- setTimeout(()=> {
- _this.barcode = ''
- _this.reloadStation()
- },1000)
- uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- _this.containerMoveOutDis = false
- }
- })
- },
-
- // 鍏ㄦ澘鍑哄簱 瀹瑰櫒绂诲満
- doContainerMoveOut2() {
- this.$refs.doContainerMoveOut2.open()
- },
- containerMoveOutClose() {
- this.$refs.doContainerMoveOut2.close()
- },
- containerMoveOut2() {
- this.containerMoveOut2Dis = true
- let _this = this
- let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut2`,
- header: { 'token': uni.getStorageSync('token')},
- data: JSON.stringify(devNo),
- method: 'POST',
- success(res) {
- res = res.data
- _this.containerMoveOut2Dis = false
- if (res.code === 200) {
- _this.$refs.doContainerMoveOut2.close()
- setTimeout(()=> {
- _this.barcode = ''
- _this.reloadStation()
- },1000)
- uni.showToast({ title: '绂诲満瀹屾垚', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- _this.containerMoveOut2Dis = false
- }
- })
- },
- // 鍐嶆鎷ｆ枡
- doPickIn2() {
- let _this = this
- let item = this.wrkMast
- uni.navigateTo({
- url: './pickAgain',
- success(res) {
- res.eventChannel.emit('item', {
- item: item,
- wrkDetls: _this.wrkDetls,
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.reloadStation()
- }
- }
- })
- },
- // 鎷ｆ枡鍑哄簱 纭鍚庡洖搴�
- doPickIn() {
- this.$refs.doPickIn.open()
- },
- pickInClose() {
- this.$refs.doPickIn.close()
- },
- pickIn() {
- this.pickInDis = true
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
- header: { 'token': uni.getStorageSync('token')},
- data: {devNo: _this.station.devNo,barcode: _this.barcode},
- method: 'POST',
- success(res) {
- _this.pickInDis = false
- res = res.data
- if (res.code === 200) {
- _this.$refs.doPickIn.close()
- _this.barcode = ''
- _this.reloadStation()
- } 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' })
- }
- },
- fail(res) {
- _this.pickInDis = false
- }
- })
- },
- // 鍚姩鍏ュ簱
- startPakin(type) {
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/pakin/empty/auth',
- data: {pad: params},
- method: 'POST',
- header: {'token': uni.getStorageSync('token')},
- success(result) {
- var res = result.data
- if (res.code === 200) {
- setTimeout(()=> {
- _this.barcode = ''
- _this.reloadStation()
- },1000)
- uni.showToast({ title: '鍚姩鍏ュ簱', icon: "success", position: 'top' })
- } 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' })
- }
- },
-
- });
- },
- allocationOut() {
- this.$refs.allocationOut.open()
- },
- allocationOutClose() {
- this.$refs.allocationOut.close()
- },
- // 璋冩嫧绂诲満
- allocationOutConfirm() {
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, barcode: this.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/allocationOut',
- header: {'token': uni.getStorageSync('token')},
- data: param,
- method: 'POST',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- that.$refs.allocationOut.close()
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '绂诲満鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- });
- },
- // 绌烘灦绂诲満
- empOut() {
- this.$refs.empOut.open()
- },
- empOutClose() {
- this.$refs.empOut.close()
- },
- empOutConfirm() {
- this.empOutDis = true
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/empOut',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo,barcode: that.barcode},
- method: 'POST',
- success(result) {
- var res = result.data
- that.$refs.empOut.close()
- that.empOutDis = false
- if (res.code === 200) {
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '绂诲満鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- that.empOutDis = false
- }
- });
- },
- allocationIn() {
- this.$refs.allocationIn.open()
- },
- allocationInClose() {
- this.$refs.allocationIn.close()
- },
- allocationInConfirm() {
- this.allocationInDis = true
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/allocationIn',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo, barcode: that.barcode},
- method: 'POST',
- success(result) {
- that.allocationInDis = false
- var res = result.data
- if (res.code === 200) {
- that.$refs.allocationIn.close()
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '杩涘満鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- that.allocationInDis = false
- }
- });
- },
- empIn() {
- this.$refs.empIn.open()
- },
- empInClose() {
- this.$refs.empIn.close()
- },
- empInConfirm() {
- this.empInDis = true
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/empIn',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo, barcode: that.barcode},
- method: 'POST',
- success(result) {
- that.empInDis = false
- var res = result.data
- if (res.code === 200) {
- that.$refs.empIn.close()
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '杩涘満鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- that.empInDis = false
- }
- });
- },
- doBack() {
- this.$refs.doBack.open()
- },
- doBackClose() {
- this.$refs.doBack.close()
- },
- doBackConfirm() {
- this.doBackDis = true
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/doBack',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo, barcode: that.barcode},
- method: 'POST',
- success(result) {
- that.doBackDis = false
- var res = result.data
- if (res.code === 200) {
- that.$refs.doBack.close()
- utils.startStop()
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '閫�搴撲换鍔＄敵璇锋垚鍔�', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- that.doBackDis = false
- }
- });
- },
- processed() {
- let _this = this
- uni.navigateTo({
- url: './confirmProcessed',
- success(res) {
- res.eventChannel.emit('item', {
- item: _this.wrkDetls
- })
- },
- // events: {
- // acceptDataFromOpenedPage: function(data) {
- // _this.getOrderDetlList(this.searchValue1,10)
- // }
- // }
- })
- },
- // processed() {
- // this.$refs.process.open()
- // },
- processedClose() {
- this.$refs.process.close()
- },
- processedConfirm() {
- this.processedDis = true
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/processed',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo, barcode: that.barcode},
- method: 'POST',
- success(result) {
- that.processedDis = false
- var res = result.data
- if (res.code === 200) {
- that.$refs.process.close()
- utils.startStop()
- setTimeout(()=> {
- that.barcode = ''
- that.reloadStation()
- },1000)
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- },
- fail(res) {
- that.processedDis = false
- }
- });
- },
- handBack() {
- let that = this
- let params = []
- let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/hand/control/handBack',
- header: {'token': uni.getStorageSync('token')},
- data: {devNo: that.station.devNo, barcode: that.barcode},
- method: 'POST',
- success(result) {
- var res = result.data
- if (res.code === 200) {
- setTimeout(()=> {
- that.reloadStation()
- },1000)
- uni.showToast({ title: '杞崲鎴愬姛', icon: "success", position: 'top' })
- } 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' })
- }
- }
- });
- }
-
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
-
- .station {
- font-size: 15px;
- padding: 18rpx;
- }
- .station-title {
- font-size: 28px;
- font-weight: bold;
- padding: 18rpx 0;
- }
- .station-barcode {
- font-size: 24px;
- font-weight: bold;
- padding: 24rpx 0;
- }
- .station-wrk {
- background-color: #ff7356;
- color: #fff;
- }
- .station-nowrk {
- background-color: #3eb689;
- color: #fff;
- }
-
-
- .wrkMast {
- background-color: #0083ff;
- color: #fff;
- margin-top: 10rpx;
- font-size: 18px;
- padding: 24rpx;
- }
- .wrkMast-wrkNo {
- font-size: 30px;
- font-weight: bold;
- padding: 24rpx 0;
- display: flex;
- }
-
- .wrkDetls {
- background-color: #2299ff;
- color: #fff;
- margin-top: 10rpx;
- font-size: 18px;
- padding: 24rpx;
- }
- .wrkDetl {
- padding: 16rpx 0;
- border-bottom: 1px solid #FFF;
- }
- .wrkDetl:last-child {
- border-bottom: none;
- }
-
- .waitPakins {
- background-color: #c494ed;
- color: #fff;
- margin-top: 10rpx;
- font-size: 18px;
- padding: 24rpx;
- }
- .waitPakin {
- padding: 16rpx 0;
- border-bottom: 1px solid #FFF;
- }
- .waitPakin:last-child {
- border-bottom: none;
- }
-
-
- .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/stationManage/stationManage.vue b/pages/phyz/stationManage/stationManage.vue
deleted file mode 100644
index 592f50d..0000000
--- a/pages/phyz/stationManage/stationManage.vue
+++ /dev/null
@@ -1,493 +0,0 @@
-<template>
- <view style="font-size: 14px;">
- <view class="code">
- <uni-search-bar :focus="searchValueFocus" v-model="searchValue" @input="searchValueInput()"
- maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿 绔欑偣鍙�">
- </uni-search-bar>
- </view>
- <view class="list" :class="item.style" v-if="stations" v-for="item in stations">
- <view class="list-left">
- <view>宸ヤ綅缂栧彿锛歿{item.devNo}}</view>
- <view>绔欑偣鐘舵�侊細{{item.locSts$}}</view>
- <view>璐ф灦鐮侊細{{item.barcode}}</view>
- <view>绔欑偣绫诲瀷锛歿{item.locType1$}}</view>
- <!-- <view class="card-id">{{i + 1}}</view> -->
- </view>
- <view class="list-right" @click="getOrderDetl(item)">
- <uni-icons type="right" color="#fff"></uni-icons>
- </view>
- </view>
- <!-- <view class="list" style="background-color: #3eb689;color: #fff;" v-if="station">
- <view class="list-left">
- <view>宸ヤ綅缂栧彿锛歿{station.devNo}}</view>
- <view>绔欑偣鐘舵�侊細{{station.locSts$}}</view>
- <view>鏉″舰鐮侊細{{station.barcode}}</view>
- </view>
- <view class="list-right" @click="getOrderDetl(item)">
- <uni-icons type="right" color="#fff"></uni-icons>
- </view>
- </view> -->
- <view class="list" style="background-color: #019fe8;color: #fff;" v-if="wrkMast">
- <view class="list-left">
- <view>宸ヤ綔鍙凤細{{wrkMast.wrkNo}}</view>
- <view>宸ヤ綔鐘舵�侊細{{wrkMast.wrkSts$}}</view>
- <view>鍏ュ嚭搴撶被鍨嬶細{{wrkMast.ioType$}}</view>
- <view>婧愬簱浣嶏細{{wrkMast.sourceLocNo}}</view>
- <view>鐩爣搴撲綅锛歿{wrkMast.locNo}}</view>
- <view>鏂欑鐮侊細{{wrkMast.barcode}}</view>
- <!-- <view class="card-id">{{i + 1}}</view> -->
- </view>
- <!-- <view class="list-right" @click="getOrderDetl(item)">
- <uni-icons type="right" color="#fff"></uni-icons>
- </view> -->
- </view>
-
- <view class="list" style="background-color: #fda800;color: #fff;" v-for="wrkMast in wrkDetls">
- <view class="list-left">
- <view>鐗╂枡鍙凤細{{wrkMast.matnr}}</view>
- <view>鐗╂枡鍚嶇О锛歿{wrkMast.maktx}}</view>
- <view>鎵瑰彿锛歿{wrkMast.batch}}</view>
- <view>瑙勬牸锛歿{wrkMast.specs}}</view>
- <view>鏁伴噺锛歿{wrkMast.anfme}}</view>
- </view>
- </view>
-
- <view class="list" style="background-color: #fda800;color: #fff;" v-if="!wrkDetls" v-for="wrkMast in waitPakins">
- <view class="list-left">
- <view>鐗╂枡鍙凤細{{wrkMast.matnr}}</view>
- <view>鐗╂枡鍚嶇О锛歿{wrkMast.maktx}}</view>
- <view>鎵瑰彿锛歿{wrkMast.batch}}</view>
- <view>瑙勬牸锛歿{wrkMast.specs}}</view>
- <view>鏁伴噺锛歿{wrkMast.anfme}}</view>
- </view>
- </view>
-
- <view style="height: 100rpx;"></view>
-
- <!-- 绌烘澘鍏ュ簱寮圭獥 -->
- <view>
- <uni-popup ref="revise" type="dialog">
- <view class="popup">
- <!-- 鏍囬 -->
- <view class="title">璇峰綍鍏ヨ揣鏋剁爜</view>
- <view class="popup-item">
- <view class="popup-item-left">璐ф灦鐮�:</view>
- <view class="popup-item-right"><input type="text" v-model="barcode"></view>
- </view>
- <view class="btn">
- <view class="btn-left" @click="reviseClose">鍙栨秷</view>
- <view class="btn-right" @click="reviseConfirm()">鍏ュ簱</view>
- </view>
- </view>
- </uni-popup>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="waitPakins.length > 0">
- <button size="mini" type="primary" @click="startPakin(searchValue)" v-if="waitPakins">鍚姩鍏ュ簱</button>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="station.locSts == 'O'">
- <button size="mini" type="primary" @click="emptyPakin()">绌烘澘鍏ュ簱</button>
- </view>
-
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom" v-if="wrkMast">
- <button size="mini" type="primary" @click="containerMoveOut(searchValue)" v-if="wrkMast.ioType == 101">纭鍑哄簱</button>
- <button size="mini" type="primary" @click="pickIn(searchValue)" v-if="wrkMast.ioType == 103">宸叉嫞鏂欏洖搴�</button>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- searchValueFocus: true,
- searchValue: '',
- station: '',
- stations: [],
- wrkMast: '',
- wrkDetls: [],
- waitPakins: [],
- barcode: '',
- option: 'pick'
- }
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.getBasDevp('all')
- this.searchValueFocus = true
- },
- methods: {
- searchValueInput() {
- if (this.searchValue == '') {
- this.station = ''
- this.stations = []
- this.wrkMast = ''
- this.wrkDetls = []
- } else if (this.searchValue.length == 7) {
- this.getBasDevp('one')
- }
- },
- clear() {
- this.waitPakins = []
- this.wrkDetls = []
- },
- // 鑾峰彇鏆傚瓨浣�
- getBasDevp(type) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- dev_no: _this.searchValue
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- if (type == 'all') {
- for (let k of res.data.records) {
- if (k.locSts != 'O') {
- k['style'] = 'station-wrk'
- } else {
- k['style'] = 'station-nowrk'
- }
- }
- _this.stations = res.data.records
- } else {
- res.data.records
- for (let item of res.data.records) {
- if (item.locSts != 'O') {
- item['style'] = 'station-wrk'
- } else {
- item['style'] = 'station-nowrk'
- }
- }
- _this.getOrderDetl(res.data.records[0])
- }
- } 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' })
- }
- }
- })
- },
- // 鑾峰彇缁勬墭妗�
- getWaitPakin(barcode) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/waitPakin/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- supp_code: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let item of res.data.records) {
- _this.waitPakins = res.data.records
- // _this.getWrkDetl(item.wrkNo)
- }
- } 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' })
- }
- }
- })
- },
- // 鑾峰彇宸ヤ綔妗�
- getWrkMast(barcode) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkMast/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- condition: barcode
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- for (let item of res.data.records) {
- _this.wrkMast = item
- _this.getWrkDetl(item.wrkNo)
- }
- } 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' })
- }
- }
- })
- },
- // 鑾峰彇宸ヤ綔鏄庣粏
- getWrkDetl(wrkNo) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- wrk_no: wrkNo
- },
- method: 'GET',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.wrkDetls = res.data.records
- } 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' })
- }
- }
- })
- },
- // 鎷ｆ枡鍥炲簱
- pickIn(e) {
- let _this = this
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
- data: {devNo: e},
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.searchValue = ''
- setTimeout(()=> {
- _this.searchValue = ''
- _this.station = ''
- _this.wrkMast = ''
- _this.wrkDetls = []
- _this.waitPakins = []
- },100)
- } 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' })
- }
- }
- })
- },
- // 瀹瑰櫒绂诲満
- containerMoveOut(e) {
- let _this = this
- let devNo = {devNo:[e]}
- // console.log(JSON.stringify(devNo));
- uni.request({
- url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
- data: JSON.stringify(devNo),
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.searchValue = ''
- setTimeout(()=> {
- _this.searchValue = ''
- _this.station = ''
- _this.wrkMast = ''
- _this.wrkDetls = []
- _this.waitPakins = []
- },100)
- } 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' })
- }
- }
- })
- },
- // 鍚姩鍏ュ簱
- startPakin(type) {
- let that = this
- let params = []
- let param = {}
- if (type == 'empty') {
- param = {
- devNo: this.searchValue,
- containerCode: this.barcode,
- }
- } else {
- param = {
- devNo: this.searchValue,
- containerCode: this.station.barcode,
- }
- }
- params.push(param)
- uni.request({
- url: that.baseUrl + '/agvMobile/pakin/empty/auth',
- data: {pad: params},
- method: 'POST',
- header: {'token': uni.getStorageSync('token')},
- success(result) {
- var res = result.data
- if (res.code === 200) {
- setTimeout(()=> {
- that.searchValue = ''
- that.station = ''
- that.wrkMast = ''
- that.wrkDetls = []
- that.waitPakins = []
- },300)
- uni.showToast({
- title: res.msg,
- icon: "none",
- position: 'top'
- })
- } 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' })
- }
- }
- });
- },
-
- // 绌烘澘鍏ュ簱
- emptyPakin() {
- let _this = this
- this.$refs.revise.open()
- },
- // 鍙栨秷绌烘澘鍏ュ簱
- reviseClose() {
- this.$refs.revise.close()
- },
- // 纭绌烘澘鍏ュ簱
- reviseConfirm() {
- this.startPakin('empty')
- this.$refs.revise.close()
- },
- // 鍓嶅線绔欑偣鏄庣粏椤甸潰
- getOrderDetl(e) {
- let _this = this
- uni.navigateTo({
- url: "./stationDetl",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('item', {
- item: e
- })
- _this.searchValue = ''
- },
- events: {
- // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
- acceptDataFromOpenedPage: function(data) {
- _this.searchValueFocus = true
- }
- },
- });
- }
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-anfme {
- color: #0082ff;
- font-weight: bold;
- }
- .list-qty-1 {
- color: #33ba43;
- font-weight: bold;
- }
- .list-qty-2 {
- color: #e2231a;
- font-weight: bold;
- }
-
- .popup {
- width: 80vw;
- min-height: 100rpx;
- background-color: #FFF;
- border-radius: 25rpx;
- }
- .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;
- 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;
- }
- .station-wrk {
- background-color: #ff7356;
- color: #fff;
- }
- .station-nowrk {
- background-color: #3eb689;
- color: #fff;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/utils/utils.js b/pages/phyz/utils/utils.js
deleted file mode 100644
index 0778b2b..0000000
--- a/pages/phyz/utils/utils.js
+++ /dev/null
@@ -1,19 +0,0 @@
-let sec = 180
-
-const startStop = () => {
- let inter = setInterval(()=> {
- sec--;
- if (sec == 0) {
- clearInterval(inter)
- sec = 180
- }
- },1000)
-}
-const checkSec = () => {
- return sec
-}
-module.exports = {
- startStop,
- sec,
- checkSec
-}
\ No newline at end of file
diff --git a/pages/phyz/waitOrder/waitOrderIn.vue b/pages/phyz/waitOrder/waitOrderIn.vue
deleted file mode 100644
index 557aa46..0000000
--- a/pages/phyz/waitOrder/waitOrderIn.vue
+++ /dev/null
@@ -1,459 +0,0 @@
-<template>
- <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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>鎬绘暟閲忥細{{orderDetl.anfme}}</view>
- <view>宸插叆鏁伴噺锛歿{orderDetl.qty}}</view>
- </view>
- <view class="list-right" @click="addItem(index)">
- <uni-icons type="folder-add" size="25" color="#fff"></uni-icons>
- </view>
- </view>
-
-
- <view class="shop-car" @click="orderCar()">
- <view class="car-left">
- <uni-icons type="cart-filled" size="35" color="#fff"></uni-icons>
- </view>
- <view class="car-right">
- <text>{{orderCarList.length}}</text>
- </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='0.01' :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(){
- 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('waitOrderInCode');
- this.getOrderDetlList(this.searchValue,10)
- },
- onShow() {
- console.log(uni.getStorageSync('waitOrderInCar'));
- },
- onHide() {
- uni.setStorageSync('waitOrderInCar', 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}/order/wait/detls/pakin/page/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('waitOrderInCode', 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) {
- if (data.data == 1) {
- _this.orderCarList = []
- _this.getOrderDetlList(uni.getStorageSync('waitOrderInCode'),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>
- @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/waitOrder/waitOrderOut.vue b/pages/phyz/waitOrder/waitOrderOut.vue
deleted file mode 100644
index b79743f..0000000
--- a/pages/phyz/waitOrder/waitOrderOut.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
- <view>
- <view class="code">
- <uni-search-bar v-model="searchValue1"
- maxlength="500" ancel="cancel" @confirm="searchValueInput1()" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- <view class="code-title">
- <view></view>
- <view style="width: 100%;text-align: center;margin: 16rpx 0;">{{searchValue1}} 鎬绘暟閲忥細- {{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.threeCode}}</view>
- <view>涓诲崟鍙凤細{{orderDetl.orderNo}}</view>
- <view>缂栧彿锛歿{orderDetl.matnr}}</view>
- <view>鍚嶇О锛歿{orderDetl.maktx}}</view>
- <view>绫诲瀷锛歿{orderDetl.brand}}</view>
- <view>璁㈠崟鏁伴噺锛歿{orderDetl.anfme}}</view>
- <view>搴撳瓨鏁伴噺锛歿{orderDetl.stock}}</view>
- <view>宸插嚭鏁伴噺锛歿{orderDetl.qty}}</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 class="buttom">
- <view style="width: 150rpx;text-align: center;padding-left: 12rpx;">
- 鍚嶇О
- </view>
- <uni-search-bar v-model="searchValue2" style="width: 100%;"
- maxlength="500" ancel="cancel" @confirm="searchValueInput2()" @clear="clear2" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
- </uni-search-bar>
- </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="searchValue1">
- </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() {
- return {
- baseUrl: '',
- token: '',
- searchValue1: '',
- searchValue2: '',
- orderNo: '',
- matnr: '',
- maktx: '',
- brand: '',
- total: '',
- dataList: [],
- orderCarList: [],
- data: {
- curr: 1,
- limit: 100,
- three_code: '',
- matnr: '',
- maktx: '',
- order_no: '',
- brand: ''
- },
- }
- },
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue1,10);
- },
- onShow() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue1 = uni.getStorageSync('waitOrderOutCode');
- this.searchValue2 = uni.getStorageSync('waitOrderOutCode2');
- this.getOrderDetlList(this.searchValue1,10)
- },
- 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}/orderDetl/pakout/list/authV6`,
- 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.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' })
- }
- }
- })
- },
- searchValueInput1() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('waitOrderOutCode', this.searchValue1);
- uni.setStorageSync('waitOrderOutCode2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
-
- },
- searchValueInput2() {
- uni.setStorageSync('waitOrderOutCode', this.searchValue1);
- uni.setStorageSync('waitOrderOutCode2', this.searchValue2);
- if (this.searchValue1.length == 0) {
- this.getOrderDetlList(this.searchValue1,10)
- } else {
- this.getOrderDetlList(this.searchValue1,10)
- }
- },
- clear() {
- this.dataList = []
- this.data.curr = 1
- setTimeout(()=> {
- this.getOrderDetlList(this.searchValue,10)
- },300)
- },
- clear2() {
- setTimeout(()=> {
- this.searchValue2 = ''
- this.getOrderDetlList(this.searchValue1,10)
- },300)
- },
- goToLocDetl(item) {
- if (item.qty >= item.anfme) {
- uni.showToast({ title: '宸插畬鎴愯鍗曚綔涓氭暟閲�', icon: "error", position: 'top' })
- return
- }
- let _this = this
- uni.navigateTo({
- url: '../orderOut/orderCheck',
- success(res) {
- res.eventChannel.emit('item', {
- item: item
- })
- },
- events: {
- acceptDataFromOpenedPage: function(data) {
- _this.getOrderDetlList(this.searchValue1,10)
- }
- }
- })
- },
- // 绛涢��
- 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.searchValue1,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.searchValue1,10)
- this.$refs.filter.close()
- }
-
- }
- }
-</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;
- }
-
- .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>
diff --git a/pages/phyz/wrkMast/DBList.vue b/pages/phyz/wrkMast/DBList.vue
deleted file mode 100644
index 1dd2cbb..0000000
--- a/pages/phyz/wrkMast/DBList.vue
+++ /dev/null
@@ -1,558 +0,0 @@
-<template>
- <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.ioTime$}}</view>
- <view>璋冩嫧绫诲瀷锛歿{orderDetl.ioType$}}</view>
- <view>宸ヤ綔鐘跺喌锛歿{orderDetl.wrkSts$}}</view>
- <view>婧愬簱浣嶏細{{orderDetl.sourceLocNo}}</view>
- <view>鐩爣搴撲綅锛歿{orderDetl.locNo}}</view>
- <view>鐩爣妤煎眰锛歿{orderDetl.crnNo}}</view>
- <view>璐ф灦鐮侊細{{orderDetl.barcode}}</view>
- </view>
- <view class="list-right" @click="opt(orderDetl)">
- <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='0.01' :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>
- <view style="display: flex;flex-wrap: wrap;">
- <button size="mini" type="primary" @click="handControlWrkMast('1')" v-show="complete" >瀹屾垚</button>
- <button size="mini" type="warn" @click="handControlWrkMast('2')">鍙栨秷(AGV)</button>
- <button size="mini" @click="handControlWrkMast('5')">鍙栨秷</button>
- </view>
- <view style="display: flex;" v-show="tranType != 'N'">
- <button size="mini" @click="changeType()">{{tranType}}</button>
- </view>
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data(){
- return {
- baseUrl: '',
- token: '',
- searchValueFocus: true,
- searchValue: '',
- 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,
- wrkNo: '',
- tranType: '杞墜鍔�',
- complete: true,
-
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue = uni.getStorageSync('wrkNoDb');
- this.getOrderDetlList(this.searchValue,10)
- console.log("onLoad");
- },
- onShow() {
- console.log(uni.getStorageSync('wrkNoDb'));
- },
- onHide() {
- uni.setStorageSync('wrkNoDb', this.orderCarList);
- },
- methods: {
- getOrderDetlList(threeCode,limit) {
- uni.showLoading({})
- if (limit == 1) {
- this.dataList = []
- this.data.curr = 1
- }
- let _this = this
- _this.data.limit = 10
- uni.request({
- url: `${_this.baseUrl}/agv/wrkMast/list/auth/dbList`,
- 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 ([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' })
- }
- }
- })
- },
- searchValueInput2() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('wrkNoDb', 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(orderDetl) {
- this.wrkNo = orderDetl.wrkNo
- if (orderDetl.wrkSts != 22) {
- this.tranType = 'N'
- } else {
- if (orderDetl.ioType == 108) {
- this.tranType = '杞墜鍔�'
- } else {
- this.tranType = '杞嚜鍔�'
- }
- }
-
-
- 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: '../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('wrkNoDb'),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()
- },
- handControlWrkMast(type) {
- let _this = this
- let param = {workNo: _this.wrkNo,type: type}
- uni.request({
- url: `${_this.baseUrl}/agv/hand/control/wrkMast`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.$refs.option.close()
- setTimeout(()=>{
- _this.getOrderDetlList('',1)
- },100)
- } 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' })
- }
- }
- })
- },
- changeType() {
- let _this = this
- let param = {workNo: _this.wrkNo}
- uni.request({
- url: `${_this.baseUrl}/agv/hand/control/wrkMast/changeType`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.$refs.option.close()
- setTimeout(()=>{
- _this.getOrderDetlList('',1)
- },100)
- } 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' })
- }
- }
- })
- }
-
- }
- }
-
-</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;
- }
- .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 button {
- flex: 1;
- 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
diff --git a/pages/phyz/wrkMast/locMoveMast.vue b/pages/phyz/wrkMast/locMoveMast.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/phyz/wrkMast/locMoveMast.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- }
- },
- methods: {
-
- }
- }
-</script>
-
-<style>
-
-</style>
diff --git a/pages/phyz/wrkMast/waitPakin.vue b/pages/phyz/wrkMast/waitPakin.vue
deleted file mode 100644
index d12aad3..0000000
--- a/pages/phyz/wrkMast/waitPakin.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<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/pages/phyz/wrkMast/waitPakinLog.vue b/pages/phyz/wrkMast/waitPakinLog.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/phyz/wrkMast/waitPakinLog.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- }
- },
- methods: {
-
- }
- }
-</script>
-
-<style>
-
-</style>
diff --git a/pages/phyz/wrkMast/wrkDetl.vue b/pages/phyz/wrkMast/wrkDetl.vue
deleted file mode 100644
index 56495a6..0000000
--- a/pages/phyz/wrkMast/wrkDetl.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
- <view>
- <view class="code">
- <!-- <uni-search-bar :focus="matFocus" v-model="matnr" @input="matInput()" 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>缂栧彿锛歿{item.matnr}}</view>
- <view>鍚嶇О锛歿{item.maktx}}</view>
- <view>瑙勬牸锛歿{item.specs}}</view>
- <view>鎵瑰彿锛歿{item.batch}}</view>
- <view class="list-anfme">鏁伴噺锛歿{item.anfme}}</view>
- <view class="list-qty-1" v-if="item.anfme > item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- <view class="list-qty-2" v-if="item.anfme <= item.qty">浣滀笟鏁伴噺锛歿{item.qty}}</view>
- </view>
- </view>
- <view style="height: 100rpx;"></view>
-
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- baseUrl: '',
- token: '',
- orderId: '',
- matFocus: true,
- matnr: '',
- checck: true,
- dataList: [],
- oldDataList: [],
- newDataList: [],
- allCheck: false,
- allCheckBtnTitle: '鍏ㄩ��',
- }
- },
- onLoad() {
- let that = 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);
- that.orderId = data.item
- console.log(data.item.id);
- uni.setNavigationBarTitle({
- title: `宸ヤ綔鍙�-${data.item}`,
-
- })
- that.getOrderDetl(data.item)
- })
- },
- onShow() {
- if (this.dataList.length > 0) {
- this.oldDataList = [...this.dataList]
- }
- // this.getOrderDetl(this.orderId)
- },
- methods: {
- // 璁㈠崟鏄庣粏
- getOrderDetl(id) {
- let _this = this
- console.log(id);
- uni.request({
- url: `${_this.baseUrl}/agv/wrkDetl/list/auth`,
- header: {'token': uni.getStorageSync('token')},
- data: {
- curr: 1,
- limit: 1000,
- wrk_no: id
- },
- method: 'GET',
- success(res) {
- res = res.data
- console.log(res);
- if (res.code === 200) {
- _this.dataList = res.data.records
- _this.oldDataList = [..._this.dataList]
- }
- }
- })
- },
- matInput() {
- let count = 0
- let sign = 0
- if (this.oldDataList.length > 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 {
- if (e.anfme == e.qty) {
- 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) {
- if (item.anfme == item.qty) {
- this.$set(item,'checked',false)
- } else {
- this.$set(item,'checked',true)
- }
- } else {
- this.$set(item,'checked',false)
- }
- }
- },
- clear() {
- this.matnr = ''
- this.dataList = [...this.oldDataList]
- },
- combConfirm(type) {
- let _this = this
- let combList = []
- for (let k of _this.dataList) {
- if (k.checked) {
- combList.push(k)
- }
- }
- if (combList.length == 0) {
- uni.showToast({ title: '璇烽�夋嫨缁勬墭鍟嗗搧', icon: "error", position: 'top'})
- return
- }
- uni.navigateTo({
- url: "../AGV/AGVPakin2",
- success: function(res) {
- // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('mats', {
- mats: combList
- })
- },
- });
- },
- }
- }
-</script>
-
-<style>
- @import url('../../../static/css/common/order.css');
- .list-anfme {
- color: #0082ff;
- font-weight: bold;
- }
- .list-qty-1 {
- color: #33ba43;
- font-weight: bold;
- }
- .list-qty-2 {
- color: #e2231a;
- font-weight: bold;
- }
-</style>
\ No newline at end of file
diff --git a/pages/phyz/wrkMast/wrkMast.vue b/pages/phyz/wrkMast/wrkMast.vue
deleted file mode 100644
index 280b91f..0000000
--- a/pages/phyz/wrkMast/wrkMast.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
- <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.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(orderDetl)">
- <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='0.01' :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>
- <view style="display: flex;flex-wrap: wrap;">
- <button size="mini" type="primary" @click="handControlWrkMast('1')" >瀹屾垚</button>
- <button size="mini" type="warn" @click="handControlWrkMast('2')">鍙栨秷(AGV)</button>
- <button size="mini" @click="handControlWrkMast('5')">鍙栨秷</button>
- </view>
-
- <!-- <button size="mini">鏇存敼璋冩嫧鏂瑰紡</button> -->
- </view>
- </uni-popup>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- data(){
- return {
- baseUrl: '',
- token: '',
- searchValueFocus: true,
- searchValue: '',
- 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,
- wrkNo: ''
-
- }
- },
- // 涓嬫媺鍒锋柊
- onReachBottom() {
- this.status = 'more';
- this.getOrderDetlList(this.searchValue,10);
- },
- onLoad() {
- this.baseUrl = uni.getStorageSync('baseUrl');
- this.token = uni.getStorageSync('token');
- this.searchValue = uni.getStorageSync('wrkNo');
- this.getOrderDetlList(this.searchValue,10)
- console.log("onLoad");
- },
- onShow() {
- console.log(uni.getStorageSync('wrkNo'));
- },
- onHide() {
- uni.setStorageSync('wrkNo', this.orderCarList);
- },
- methods: {
- getOrderDetlList(threeCode,limit) {
- uni.showLoading({})
- let _this = this
- _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: _this.data,
- method: 'GET',
- success(res) {
- uni.hideLoading()
- res = res.data
- if (res.code === 200) {
- 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' })
- }
- }
- })
- },
- searchValueInput2() {
- this.dataList = []
- this.data.curr = 1
- uni.setStorageSync('wrkNo', 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(orderDetl) {
- this.wrkNo = orderDetl.wrkNo
- 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: '../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('wrkNo'),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()
- },
- handControlWrkMast(type) {
- let _this = this
- let param = {workNo: _this.wrkNo,type: type}
- uni.request({
- url: `${_this.baseUrl}/agv/hand/control/wrkMast`,
- header: {
- 'token': uni.getStorageSync('token'),
- 'content-type': 'application/x-www-form-urlencoded'
- },
- data: param,
- method: 'POST',
- success(res) {
- res = res.data
- if (res.code === 200) {
- _this.$refs.option.close()
- setTimeout(()=>{
- _this.getOrderDetlList(_this.searchValue,10)
- },100)
- } 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' })
- }
- }
- })
- }
-
- }
- }
-
-</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;
- }
- .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 button {
- flex: 1;
- 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
diff --git a/pages/phyz/wrkMast/wrkMastLog.vue b/pages/phyz/wrkMast/wrkMastLog.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/pages/phyz/wrkMast/wrkMastLog.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <view>
-
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
-
- }
- },
- methods: {
-
- }
- }
-</script>
-
-<style>
-
-</style>
--
Gitblit v1.9.1