From 76486524892abdfd3039eedc28d83cbbfb56d042 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 六月 2025 16:17:05 +0800
Subject: [PATCH] 取消报工/车间订单下发/车间订单取消下发/功能点逻辑编写
---
pages/product/WorkshopOrderIssued/index.vue | 746 +++++++++++++------------
pages/product/WorkshopOrderCancellationIssued/index.vue | 738 +++++++++++++------------
pages/wareHouse/moveWareHouse/index.vue | 119 ++--
pages/product/report/components/saveForm.vue | 19
pages/product/report/index.vue | 32
pages/product/WorkshopOrderIssued/comp.vue | 2
pages/product/cancelReport/index.vue | 47
7 files changed, 904 insertions(+), 799 deletions(-)
diff --git a/pages/product/WorkshopOrderCancellationIssued/index.vue b/pages/product/WorkshopOrderCancellationIssued/index.vue
index eb46de3..5637244 100644
--- a/pages/product/WorkshopOrderCancellationIssued/index.vue
+++ b/pages/product/WorkshopOrderCancellationIssued/index.vue
@@ -1,381 +1,423 @@
//杞﹂棿璁㈠崟鍙栨秷涓嬪彂
<template>
- <view class="page">
- <view class="packing-registration-bg" />
- <u-navbar title="璁㈠崟鍙栨秷涓嬪彂" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
- back-icon-color="#000" />
- <view class="packing-registration-param">
- <view class="packing-registration-param-view">
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">璁㈠崟鍙�</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two" @click="seachPersonnelNo()">{{
- registerInfo.value1 == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.value1
+ <view class="page">
+ <view class="packing-registration-bg" />
+ <u-navbar
+ title="璁㈠崟鍙栨秷涓嬪彂"
+ :background="background"
+ :border-bottom="false"
+ :title-bold="true"
+ title-color="#000"
+ back-icon-color="#000"
+ />
+ <view class="packing-registration-param">
+ <view class="packing-registration-param-view">
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">璁㈠崟鍙�</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two" @click="seachPersonnelNo()">{{
+ registerInfo.moNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.moNo
}}</text>
- <u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
- v-show="registerInfo.value1 == ''"></u-icon>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鍙栨秷涓嬪彂璁板綍锛�</text>
- </view>
- </view>
- </view>
- </view>
- <view class="wrap">
- <scroll-view class="packing-registration-scroll-list" scroll-y="true">
- <u-cell-group class="packing-registration-scroll-list-group" :border="false">
- <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
- <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
- <view class="content-header">
- <view class="content-header-title">{{ index + 1 }}</view>
- </view>
- <view class="content-body">
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">鎵瑰彿</view>
- </view>
- <view class="_content">
- {{ item.value0 }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">闆朵欢鍙凤細</view>
- </view>
- <view class="_content">
- {{ item.value1 }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">闆朵欢鎻忚堪锛�</view>
- </view>
- <view class="_content">
- {{ item.value2 }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">鍙栨秷涓嬪彂鏁伴噺</view>
- </view>
- <view class="_content">
- {{ item.value3 }}
- </view>
- </view>
- </view>
- </view>
- </u-cell-group>
- </scroll-view>
- <scan></scan>
- </view>
- <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true" @confirm="confirm"
- @cancel="cancel">
- <view class="popup-content">
- <view class="packing-registration-param">
- <view class="packing-registration-param-view">
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鎵瑰彿</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ modalList.value }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">闆朵欢鍙�</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ modalList.value1 }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">闆朵欢鎻忚堪</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ modalList.value2 }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鍙栨秷涓嬪彂鏁伴噺</text>
- </view>
- <view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="modalList.value3" />
- </view>
- </view>
- </view>
- </view>
- </view>
- </u-modal>
- </view>
+ <u-icon
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ @click="seachPersonnelNo()"
+ v-show="registerInfo.moNo == ''"
+ ></u-icon>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鍙栨秷涓嬪彂璁板綍锛�</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="wrap">
+ <scroll-view class="packing-registration-scroll-list" scroll-y="true">
+ <u-cell-group
+ class="packing-registration-scroll-list-group"
+ :border="false"
+ >
+ <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
+ <view
+ class="content"
+ v-for="(item, index) in hasScanSnList"
+ :key="index"
+ :index="index"
+ >
+ <view class="content-header">
+ <view class="content-header-title">{{ index + 1 }}</view>
+ </view>
+ <view class="content-body">
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鎵瑰彿</view>
+ </view>
+ <view class="_content">
+ {{ item.moOn }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">闆朵欢鍙凤細</view>
+ </view>
+ <view class="_content">
+ {{ item.partNo }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">闆朵欢鎻忚堪锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.partName }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鍙栨秷涓嬪彂鏁伴噺</view>
+ </view>
+ <view class="_content">
+ {{ item.value3 }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-cell-group>
+ </scroll-view>
+ <scan></scan>
+ </view>
+ <u-modal
+ v-model="showModal"
+ title=""
+ :show-cancel-button="true"
+ :show-confirm-button="true"
+ @confirm="confirm"
+ @cancel="cancel"
+ >
+ <view class="popup-content">
+ <view class="packing-registration-param">
+ <view class="packing-registration-param-view">
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鎵瑰彿</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ modalList.moOn }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">闆朵欢鍙�</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ modalList.partNo }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">闆朵欢鎻忚堪</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ modalList.partName }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鍙栨秷涓嬪彂鏁伴噺</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <u-input class="item-one item-two" v-model="modalList.value3" />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-modal>
+ </view>
</template>
<script>
- import scan from "@/components/scan/scan.vue";
- import content_bg from "@/static/custom/packing/backBg.png";
- export default {
- components: {
- scan,
- },
- data() {
- return {
- showModal:false,
- background: {
- backgroundImage: `url(${content_bg})`,
- backgroundAttachment: "fixed",
- backgroundSize: "100% auto",
- backgroundRepeat: "no-repeat",
- },
- labelStyle: {
- fontSize: "32rpx",
- whiteSpace: "nowrap",
- },
- //寮圭獥鍒楄〃
- modalList: {
- value: "",
- value1: "",
- value2: "",
- value3: "",
- },
- registerInfo: {
- value1: "",
- },
- hasScanSnList: [{
- value0: "11111111111111111111111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- ],
- };
- },
- onShow() {
- let that = this;
+import scan from "@/components/scan/scan.vue";
+import content_bg from "@/static/custom/packing/backBg.png";
+export default {
+ components: {
+ scan,
+ },
+ data() {
+ return {
+ showModal: false,
+ background: {
+ backgroundImage: `url(${content_bg})`,
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
+ },
+ labelStyle: {
+ fontSize: "32rpx",
+ whiteSpace: "nowrap",
+ },
+ //寮圭獥鍒楄〃
+ modalList: {
+ partName: "",
+ partNo: "",
+ moNo: "",
+ num: "",
+ },
+ registerInfo: {
+ moNo: "",
+ },
+ hasScanSnList: [],
+ codeInfoId: "",
+ };
+ },
+ onShow() {
+ let that = this;
- uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- uni.$on("scan", function(data) {
- console.log("onscan");
- //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log("鎵爜缁撴灉锛�", data.code);
- that.scanHandle(data.code);
- this.showModal = true;
- that.$forceUpdate();
- });
- },
- methods: {
- // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
- confirm() {
- // 澶勭悊纭閫昏緫
- this.showModal = false;
- this.$u.api.workReporting
- ._({}).then((res) => {
- console.log("res", res);
- this.hasScanSnList = res.data.records;
- });
- },
- // 妯℃�佹鍙栨秷
- cancel() {
- this.showModal = false; // 鍏抽棴寮圭獥
- },
- setNo(val) {
- console.log("11111", val);
- this.registerInfo.value1 = val.value1;
- },
- //璁㈠崟鍙�
- seachPersonnelNo() {
- console.log("杞﹂棿璁㈠崟鍙�");
- uni.navigateTo({
- url: "/pages/product/report/orderList",
- });
- },
+ uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ if (registerInfo.moNO == null) {
+ uni.showToast({
+ icon: "none",
+ title: "璇峰厛閫夋嫨璁㈠崟鍙凤紒",
+ duration: 2 * 1000,
+ });
+ return;
+ }
+ uni.$on("scan", function (data) {
+ console.log("onscan");
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log("鎵爜缁撴灉锛�", data.code);
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code);
+ this.codeInfoId = codeInfo.id;
+ if (codeInfo.moOn) {
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.scanHandle(data.code);
+ that.$forceUpdate();
+ that.getHandelList();
+ }
+ }
+ });
+ },
+ methods: {
+ getHandelList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.codeInfoId,
+ })
+ .then((res) => {
+ this.hasScanSnList = res.data.productOutputList;
+ });
+ },
+ // 鎵爜鍚庢暟鎹洖鏄�
+ scanHandle(val) {
+ let { moNo, partNo, partName } = val;
+ this.modalList.moNo = moNo;
+ this.modalList.partNo = partNo;
+ this.modalList.partName = partName;
- },
- };
+ this.showModal = true;
+ },
+ // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
+ confirm() {
+ // 澶勭悊纭閫昏緫
+ this.$u.api.workReporting._(this.modalList).then((res) => {
+ console.log("res", res);
+ this.showModal = false;
+
+ this.getHandelList();
+ });
+ },
+ // 妯℃�佹鍙栨秷
+ cancel() {
+ this.showModal = false; // 鍏抽棴寮圭獥
+ },
+ setNo(val) {
+ console.log("11111", val);
+ this.registerInfo.moNo = val.moNo;
+ },
+ //璁㈠崟鍙�
+ seachPersonnelNo() {
+ console.log("杞﹂棿璁㈠崟鍙�");
+ uni.navigateTo({
+ url: "/pages/product/report/orderList",
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
- .packing-registration-bg {
- background-color: #f6f9ff;
- background-image: url("~@/static/custom/packing/backBg.png");
- padding: 0 20rpx;
- background-attachment: fixed;
- background-size: 100% auto;
- background-repeat: no-repeat;
- position: fixed;
- top: 0;
- bottom: 0;
- width: 100%;
- z-index: -1;
- }
+.packing-registration-bg {
+ background-color: #f6f9ff;
+ background-image: url("~@/static/custom/packing/backBg.png");
+ padding: 0 20rpx;
+ background-attachment: fixed;
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+ z-index: -1;
+}
- .packing-registration-param {
- padding: 40rpx 30rpx 10rpx 30rpx;
+.packing-registration-param {
+ padding: 40rpx 30rpx 10rpx 30rpx;
- .packing-registration-param-title {
- display: flex;
- flex-direction: row;
- align-items: center;
- margin-bottom: 30rpx;
+ .packing-registration-param-title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-bottom: 30rpx;
- .title-label {
- margin-left: 14rpx;
- font-size: 34rpx;
- font-weight: bold;
- color: #283e65;
- }
- }
+ .title-label {
+ margin-left: 14rpx;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #283e65;
+ }
+ }
- .packing-registration-param-view {
- height: 180rpx;
- background-color: #fff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
- margin-bottom: 30rpx;
+ .packing-registration-param-view {
+ height: 180rpx;
+ background-color: #fff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
+ margin-bottom: 30rpx;
- .packing-registration-param-item {
- height: 90rpx;
- border: 1px solid #adc8e4;
- line-height: 90rpx;
- display: flex;
- justify-content: space-between;
- border: none;
+ .packing-registration-param-item {
+ height: 90rpx;
+ border: 1px solid #adc8e4;
+ line-height: 90rpx;
+ display: flex;
+ justify-content: space-between;
+ border: none;
- .packing-registration-param-item-left {
- .item-one {
- font-size: 30rpx;
- color: #666666;
- }
- }
+ .packing-registration-param-item-left {
+ .item-one {
+ font-size: 30rpx;
+ color: #666666;
+ }
+ }
- .packing-registration-param-item-right {
- display: flex;
- justify-content: space-between;
+ .packing-registration-param-item-right {
+ display: flex;
+ justify-content: space-between;
- .item-one {
- font-size: 30rpx;
- color: #333333;
- margin-right: 6rpx;
- }
+ .item-one {
+ font-size: 30rpx;
+ color: #333333;
+ margin-right: 6rpx;
+ }
- .item-two {
- font-size: 30rpx;
- color: #a6b4cc;
- margin-right: 6rpx;
- }
+ .item-two {
+ font-size: 30rpx;
+ color: #a6b4cc;
+ margin-right: 6rpx;
+ }
- .item-three {
- font-size: 30rpx;
- color: #214ded;
- margin-right: 6rpx;
- }
- }
- }
+ .item-three {
+ font-size: 30rpx;
+ color: #214ded;
+ margin-right: 6rpx;
+ }
+ }
+ }
- .param-extra {
- border-bottom: 1px solid #ededed;
- }
- }
- }
+ .param-extra {
+ border-bottom: 1px solid #ededed;
+ }
+ }
+}
- .wrap .packing-registration-scroll-list {
- height: calc(100vh - var(--window-top) - var(--window-bottom) - 400rpx);
- width: 100%;
- }
+.wrap .packing-registration-scroll-list {
+ height: calc(100vh - var(--window-top) - var(--window-bottom) - 400rpx);
+ width: 100%;
+}
- .packing-registration-scroll-list-group {
- ::v-deep .u-cell-item-box {
- background-color: rgba(250, 252, 255, 0.36) !important;
- padding: 0rpx 30rpx;
- }
+.packing-registration-scroll-list-group {
+ ::v-deep .u-cell-item-box {
+ background-color: rgba(250, 252, 255, 0.36) !important;
+ padding: 0rpx 30rpx;
+ }
- .content {
- font-size: 12px;
- background-color: #ffffff;
- box-sizing: border-box;
- border-radius: 10rpx;
- margin: 0rpx 0rpx 16rpx;
- padding: 20rpx 8rpx;
- box-shadow: none;
- display: flex;
- align-items: center;
+ .content {
+ font-size: 12px;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ border-radius: 10rpx;
+ margin: 0rpx 0rpx 16rpx;
+ padding: 20rpx 8rpx;
+ box-shadow: none;
+ display: flex;
+ align-items: center;
- .content-header {
- width: 40rpx;
- height: 90rpx;
- display: flex;
- align-items: center;
+ .content-header {
+ width: 40rpx;
+ height: 90rpx;
+ display: flex;
+ align-items: center;
- .content-header-icon {
- background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
- background-size: 100% auto;
- background-repeat: no-repeat;
- height: 28rpx;
- width: 28rpx;
- }
+ .content-header-icon {
+ background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ height: 28rpx;
+ width: 28rpx;
+ }
- .content-header-title {
- margin-left: 11rpx;
- font-size: 26rpx;
- font-weight: bold;
- color: #626369;
- }
- }
+ .content-header-title {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: bold;
+ color: #626369;
+ }
+ }
- .content-body {
- flex: 1;
- background-color: #ffffff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
+ .content-body {
+ flex: 1;
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
- .row-list {
- height: 60rpx;
- display: flex;
- flex-direction: row;
- padding: 0px;
- align-items: center;
- }
+ .row-list {
+ height: 60rpx;
+ display: flex;
+ flex-direction: row;
+ padding: 0px;
+ align-items: center;
+ }
- .row-list ._label {
- display: flex;
- flex: 0.8;
- color: #909399;
- align-items: center;
+ .row-list ._label {
+ display: flex;
+ flex: 0.8;
+ color: #909399;
+ align-items: center;
- ._label-name {
- margin-left: 11rpx;
- font-size: 26rpx;
- font-weight: 500;
- color: #666666;
- }
- }
+ ._label-name {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #666666;
+ }
+ }
- .row-list ._content {
- flex: 1.5;
- text-align: right;
- color: #909399;
- font-size: 24rpx;
- }
+ .row-list ._content {
+ flex: 1.5;
+ text-align: right;
+ color: #909399;
+ font-size: 24rpx;
+ }
- .row-list .s1 {
- color: #d35651;
- }
- }
- }
- }
+ .row-list .s1 {
+ color: #d35651;
+ }
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/pages/product/WorkshopOrderIssued/comp.vue b/pages/product/WorkshopOrderIssued/comp.vue
index cacbe40..14549c2 100644
--- a/pages/product/WorkshopOrderIssued/comp.vue
+++ b/pages/product/WorkshopOrderIssued/comp.vue
@@ -12,7 +12,7 @@
<scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true" @scrolltolower="getmoreList()">
<u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
<view class="content" v-for="(item, index) in list" :key="item.locNo" :index="index"
- @click="selectNo(item.index)">
+ @click="selectNo(item)">
<view class="content-header">
<view class="content-header-title">{{ item.index }}</view>
</view>
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index 583912a..5f57b50 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/pages/product/WorkshopOrderIssued/index.vue
@@ -1,384 +1,432 @@
// 杞﹂棿璁㈠崟涓嬪彂
<template>
- <view class="page">
- <view class="packing-registration-bg" />
- <u-navbar title="璁㈠崟涓嬪彂" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
- back-icon-color="#000" />
- <view class="packing-registration-param">
- <view class="packing-registration-param-view">
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">璁㈠崟鍙�</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two" @click="seachPersonnelNo()">{{
+ <view class="page">
+ <view class="packing-registration-bg" />
+ <u-navbar
+ title="璁㈠崟涓嬪彂"
+ :background="background"
+ :border-bottom="false"
+ :title-bold="true"
+ title-color="#000"
+ back-icon-color="#000"
+ />
+ <view class="packing-registration-param">
+ <view class="packing-registration-param-view">
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">璁㈠崟鍙�</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two" @click="seachPersonnelNo()">{{
registerInfo.moNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.moNo
}}</text>
- <u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
- v-show="registerInfo.moNo == ''"></u-icon>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">瀛愪欢</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two" @click="seachComp()">{{
+ <u-icon
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ @click="seachPersonnelNo()"
+ v-show="registerInfo.moNo == ''"
+ ></u-icon>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">瀛愪欢</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two" @click="seachComp()">{{
registerInfo.value2 == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.value2
}}</text>
- <u-icon name="arrow-right" color="#687792" size="28" @click="seachComp()"
- v-show="registerInfo.value2 == ''"></u-icon>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">闆朵欢鎻忚堪</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ registerInfo.value3 }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">涓嬪彂璁板綍锛�</text>
- </view>
- </view>
- </view>
- </view>
- <view class="wrap">
- <scroll-view class="packing-registration-scroll-list" scroll-y="true">
- <u-cell-group class="packing-registration-scroll-list-group" :border="false">
- <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
- <view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
- <view class="content-header">
- <view class="content-header-title">{{ index + 1 }}</view>
- </view>
- <view class="content-body">
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">鎵瑰彿锛�</view>
- </view>
- <view class="_content">
- {{ item.value0 }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">涓嬪彂鏁伴噺锛�</view>
- </view>
- <view class="_content">
- {{ item.value1 }}
- </view>
- </view>
- </view>
- </view>
- </u-cell-group>
- </scroll-view>
- <scan></scan>
- </view>
- <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true" @confirm="confirm"
- @cancel="cancel">
- <view class="popup-content">
- <view class="packing-registration-param">
- <view class="packing-registration-param-view">
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鎵瑰彿</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ modalList.value }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">涓嬪彂鏁伴噺</text>
- </view>
- <view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="modalList.value1" />
- </view>
- </view>
- </view>
- </view>
- </view>
- </u-modal>
- </view>
+ <u-icon
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ @click="seachComp()"
+ v-show="registerInfo.value2 == ''"
+ ></u-icon>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">闆朵欢鎻忚堪</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ registerInfo.value3 }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">涓嬪彂璁板綍锛�</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="wrap">
+ <scroll-view class="packing-registration-scroll-list" scroll-y="true">
+ <u-cell-group
+ class="packing-registration-scroll-list-group"
+ :border="false"
+ >
+ <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
+ <view
+ class="content"
+ v-for="(item, index) in hasScanSnList"
+ :key="index"
+ :index="index"
+ >
+ <view class="content-header">
+ <view class="content-header-title">{{ index + 1 }}</view>
+ </view>
+ <view class="content-body">
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">鎵瑰彿锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.value0 }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">涓嬪彂鏁伴噺锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.value1 }}
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-cell-group>
+ </scroll-view>
+ <scan></scan>
+ </view>
+ <u-modal
+ v-model="showModal"
+ title=""
+ :show-cancel-button="true"
+ :show-confirm-button="true"
+ @confirm="confirm"
+ @cancel="cancel"
+ >
+ <view class="popup-content">
+ <view class="packing-registration-param">
+ <view class="packing-registration-param-view">
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">鎵瑰彿</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ modalList.moNO }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">涓嬪彂鏁伴噺</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <u-input class="item-one item-two" v-model="modalList.value1" />
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-modal>
+ </view>
</template>
<script>
- import scan from "@/components/scan/scan.vue";
- import content_bg from "@/static/custom/packing/backBg.png";
- export default {
- components: {
- scan,
- },
+import scan from "@/components/scan/scan.vue";
+import content_bg from "@/static/custom/packing/backBg.png";
+export default {
+ components: {
+ scan,
+ },
- data() {
- return {
- background: {
- backgroundImage: `url(${content_bg})`,
- backgroundAttachment: "fixed",
- backgroundSize: "100% auto",
- backgroundRepeat: "no-repeat",
- },
- labelStyle: {
- fontSize: "32rpx",
- whiteSpace: "nowrap",
- },
- // 寮圭獥鍒楄〃
- modalList: {
- value: "",
- value1: "",
- },
- // 涓婚〉闈㈠垪琛�
- registerInfo: {
- moNo: "",
- value2: "",
- value3: "",
- },
- // 涓嬪彂璁板綍鍒楄〃
- hasScanSnList: [],
- };
- },
- onShow() {
- let that = this;
- uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- if ((registerInfo.moNO = null)) {
- uni.showToast({
- icon: "none",
- title: "璇峰厛閫夋嫨瀛愪欢锛�",
- duration: 2 * 1000,
- });
- return;
- }
- uni.$on("scan", function(data) {
- console.log("onscan");
- //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log("鎵爜缁撴灉锛�", data.code);
- that.scanHandle(data.code);
- that.$forceUpdate();
- });
- },
- methods: {
- // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
- confirm() {
- // 澶勭悊纭閫昏緫
- this.showModal = false;
- this.$u.api.workReporting
- ._({}).then((res) => {
- console.log("res", res);
- this.hasScanSnList = res.data.records;
- });
- },
- // 妯℃�佹鍙栨秷
- cancel() {
- this.showModal = false; // 鍏抽棴寮圭獥
- },
- // 瀛愪欢鍥炴樉
- compNo(val) {
- this.registerInfo.value2 = val.value2;
- this.registerInfo.value3 = val.value2;
- },
- // 璁㈠崟鍙峰洖鏄�
- setNo(val) {
- console.log("11111", val);
- this.registerInfo.moNo = val.moNo;
- this.registerInfo.value2 = val.value2;
- },
- //璁㈠崟鍙�
- seachPersonnelNo() {
- console.log("杞﹂棿璁㈠崟鍙�");
- uni.navigateTo({
- url: "/pages/product/report/orderList",
- });
- },
- //瀛愪欢
- seachComp() {
- if (this.registerInfo.value1 == null || this.registerInfo.value1 == "") {
- this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
- return;
- }
- console.log("瀛愪欢");
- uni.navigateTo({
- url: "/pages/product/WorkshopOrderIssued/comp",
- });
- },
- // 鎵爜鍚庢暟鎹洖鏄�
- scanHandle(scanresult) {
- this.$u.api.workReporting
- ._({}).then((res) => {
- this.modalList = res.data.records;
- this.showModal = true;
- });
- },
- },
- };
+ data() {
+ return {
+ background: {
+ backgroundImage: `url(${content_bg})`,
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
+ },
+ labelStyle: {
+ fontSize: "32rpx",
+ whiteSpace: "nowrap",
+ },
+ // 寮圭獥鍒楄〃
+ modalList: {
+ partNo: "",
+ moNo: "",
+ },
+ // 涓婚〉闈㈠垪琛�
+ registerInfo: {
+ moNo: "",
+ value2: "",
+ value3: "",
+ },
+ // 涓嬪彂璁板綍鍒楄〃
+ hasScanSnList: [],
+ codeInfoId: "",
+ };
+ },
+ onShow() {
+ let that = this;
+ uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ if (registerInfo.moNO == null) {
+ uni.showToast({
+ icon: "none",
+ title: "璇峰厛閫夋嫨瀛愪欢锛�",
+ duration: 2 * 1000,
+ });
+ return;
+ }
+ uni.$on("scan", function (data) {
+ console.log("onscan");
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code);
+ this.codeInfoId = codeInfo.id;
+ if (codeInfo.moOn) {
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.scanHandle(data.code);
+ that.$forceUpdate();
+ that.getHandelList();
+ }
+ }
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log("鎵爜缁撴灉锛�", data.code);
+ });
+ },
+ methods: {
+ getHandelList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.codeInfoId,
+ })
+ .then((res) => {
+ this.hasScanSnList = res.data.productOutputList;
+ });
+ },
+ // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
+ confirm() {
+ // 澶勭悊纭閫昏緫
+ this.$u.api.workReporting._(this.modalList).then((res) => {
+ console.log("res", res);
+ this.showModal = false;
+
+ this.getHandelList();
+ });
+ },
+ // 妯℃�佹鍙栨秷
+ cancel() {
+ this.showModal = false; // 鍏抽棴寮圭獥
+ },
+ // 瀛愪欢鍥炴樉
+ compNo(val) {
+ this.registerInfo.value2 = val.value2;
+ this.registerInfo.value3 = val.value2;
+ },
+ // 璁㈠崟鍙峰洖鏄�
+ setNo(val) {
+ console.log("11111", val);
+ this.registerInfo.moNo = val.moNo;
+ this.registerInfo.value2 = val.value2;
+ },
+ //璁㈠崟鍙�
+ seachPersonnelNo() {
+ console.log("杞﹂棿璁㈠崟鍙�");
+ uni.navigateTo({
+ url: "/pages/product/report/orderList",
+ });
+ },
+ //瀛愪欢
+ seachComp() {
+ if (this.registerInfo.moNO == null) {
+ this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
+ return;
+ }
+ console.log("瀛愪欢");
+ uni.navigateTo({
+ url: "/pages/product/WorkshopOrderIssued/comp",
+ });
+ },
+ // 鎵爜鍚庢暟鎹洖鏄�
+ scanHandle(val) {
+ let { moNo } = val;
+ this.modalList.moNo = moNo;
+ this.showModal = true;
+ },
+ },
+};
</script>
<style lang="scss" scoped>
- .packing-registration-bg {
- background-color: #f6f9ff;
- background-image: url("~@/static/custom/packing/backBg.png");
- padding: 0 20rpx;
- background-attachment: fixed;
- background-size: 100% auto;
- background-repeat: no-repeat;
- position: fixed;
- top: 0;
- bottom: 0;
- width: 100%;
- z-index: -1;
- }
+.packing-registration-bg {
+ background-color: #f6f9ff;
+ background-image: url("~@/static/custom/packing/backBg.png");
+ padding: 0 20rpx;
+ background-attachment: fixed;
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ position: fixed;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+ z-index: -1;
+}
- .packing-registration-param {
- padding: 40rpx 30rpx 10rpx 30rpx;
+.packing-registration-param {
+ padding: 40rpx 30rpx 10rpx 30rpx;
- .packing-registration-param-title {
- display: flex;
- flex-direction: row;
- align-items: center;
- margin-bottom: 30rpx;
+ .packing-registration-param-title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ margin-bottom: 30rpx;
- .title-label {
- margin-left: 14rpx;
- font-size: 34rpx;
- font-weight: bold;
- color: #283e65;
- }
- }
+ .title-label {
+ margin-left: 14rpx;
+ font-size: 34rpx;
+ font-weight: bold;
+ color: #283e65;
+ }
+ }
- .packing-registration-param-view {
- height: 345rpx;
- background-color: #fff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
- margin-bottom: 30rpx;
+ .packing-registration-param-view {
+ height: 345rpx;
+ background-color: #fff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
+ margin-bottom: 30rpx;
- .packing-registration-param-item {
- height: 90rpx;
- border: 1px solid #adc8e4;
- line-height: 90rpx;
- display: flex;
- justify-content: space-between;
- border: none;
+ .packing-registration-param-item {
+ height: 90rpx;
+ border: 1px solid #adc8e4;
+ line-height: 90rpx;
+ display: flex;
+ justify-content: space-between;
+ border: none;
- .packing-registration-param-item-left {
- .item-one {
- font-size: 30rpx;
- color: #666666;
- }
- }
+ .packing-registration-param-item-left {
+ .item-one {
+ font-size: 30rpx;
+ color: #666666;
+ }
+ }
- .packing-registration-param-item-right {
- display: flex;
- justify-content: space-between;
+ .packing-registration-param-item-right {
+ display: flex;
+ justify-content: space-between;
- .item-one {
- font-size: 30rpx;
- color: #333333;
- margin-right: 6rpx;
- }
+ .item-one {
+ font-size: 30rpx;
+ color: #333333;
+ margin-right: 6rpx;
+ }
- .item-two {
- font-size: 30rpx;
- color: #a6b4cc;
- margin-right: 6rpx;
- }
+ .item-two {
+ font-size: 30rpx;
+ color: #a6b4cc;
+ margin-right: 6rpx;
+ }
- .item-three {
- font-size: 30rpx;
- color: #214ded;
- margin-right: 6rpx;
- }
- }
- }
+ .item-three {
+ font-size: 30rpx;
+ color: #214ded;
+ margin-right: 6rpx;
+ }
+ }
+ }
- .param-extra {
- border-bottom: 1px solid #ededed;
- }
- }
- }
+ .param-extra {
+ border-bottom: 1px solid #ededed;
+ }
+ }
+}
- .wrap .packing-registration-scroll-list {
- height: calc(100vh - var(--window-top) - var(--window-bottom) - 550rpx);
- width: 100%;
- }
+.wrap .packing-registration-scroll-list {
+ height: calc(100vh - var(--window-top) - var(--window-bottom) - 550rpx);
+ width: 100%;
+}
- .packing-registration-scroll-list-group {
- ::v-deep .u-cell-item-box {
- background-color: rgba(250, 252, 255, 0.36) !important;
- padding: 0rpx 30rpx;
- }
+.packing-registration-scroll-list-group {
+ ::v-deep .u-cell-item-box {
+ background-color: rgba(250, 252, 255, 0.36) !important;
+ padding: 0rpx 30rpx;
+ }
- .content {
- font-size: 12px;
- background-color: #ffffff;
- box-sizing: border-box;
- border-radius: 10rpx;
- margin: 0rpx 0rpx 16rpx;
- padding: 20rpx 8rpx;
- box-shadow: none;
- display: flex;
- align-items: center;
+ .content {
+ font-size: 12px;
+ background-color: #ffffff;
+ box-sizing: border-box;
+ border-radius: 10rpx;
+ margin: 0rpx 0rpx 16rpx;
+ padding: 20rpx 8rpx;
+ box-shadow: none;
+ display: flex;
+ align-items: center;
- .content-header {
- width: 40rpx;
- height: 90rpx;
- display: flex;
- align-items: center;
+ .content-header {
+ width: 40rpx;
+ height: 90rpx;
+ display: flex;
+ align-items: center;
- .content-header-icon {
- background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
- background-size: 100% auto;
- background-repeat: no-repeat;
- height: 28rpx;
- width: 28rpx;
- }
+ .content-header-icon {
+ background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+ background-size: 100% auto;
+ background-repeat: no-repeat;
+ height: 28rpx;
+ width: 28rpx;
+ }
- .content-header-title {
- margin-left: 11rpx;
- font-size: 26rpx;
- font-weight: bold;
- color: #626369;
- }
- }
+ .content-header-title {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: bold;
+ color: #626369;
+ }
+ }
- .content-body {
- flex: 1;
- background-color: #ffffff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
+ .content-body {
+ flex: 1;
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ padding: 0rpx 23rpx;
- .row-list {
- height: 60rpx;
- display: flex;
- flex-direction: row;
- padding: 0px;
- align-items: center;
- }
+ .row-list {
+ height: 60rpx;
+ display: flex;
+ flex-direction: row;
+ padding: 0px;
+ align-items: center;
+ }
- .row-list ._label {
- display: flex;
- flex: 0.8;
- color: #909399;
- align-items: center;
+ .row-list ._label {
+ display: flex;
+ flex: 0.8;
+ color: #909399;
+ align-items: center;
- ._label-name {
- margin-left: 11rpx;
- font-size: 26rpx;
- font-weight: 500;
- color: #666666;
- }
- }
+ ._label-name {
+ margin-left: 11rpx;
+ font-size: 26rpx;
+ font-weight: 500;
+ color: #666666;
+ }
+ }
- .row-list ._content {
- flex: 1.5;
- text-align: right;
- color: #909399;
- font-size: 24rpx;
- }
+ .row-list ._content {
+ flex: 1.5;
+ text-align: right;
+ color: #909399;
+ font-size: 24rpx;
+ }
- .row-list .s1 {
- color: #d35651;
- }
- }
- }
- }
+ .row-list .s1 {
+ color: #d35651;
+ }
+ }
+ }
+}
</style>
\ No newline at end of file
diff --git a/pages/product/cancelReport/index.vue b/pages/product/cancelReport/index.vue
index 5e68b36..5fcb8b5 100644
--- a/pages/product/cancelReport/index.vue
+++ b/pages/product/cancelReport/index.vue
@@ -101,7 +101,7 @@
<text class="item-one">鎵瑰彿</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ detailedList.value1 }}</text>
+ <text class="item-one item-two">{{ detailedList.moNo }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -109,7 +109,7 @@
<text class="item-one">闆朵欢鍙�</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ detailedList.value2 }}</text>
+ <text class="item-one item-two">{{ detailedList.partNo }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -117,7 +117,9 @@
<text class="item-one">闆朵欢鎻忚堪</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ detailedList.value3 }}</text>
+ <text class="item-one item-two">{{
+ detailedList.partName
+ }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -127,7 +129,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="detailedList.value4"
+ v-model="detailedList.qtyRequired"
/>
</view>
</view>
@@ -159,10 +161,10 @@
moNo: "",
},
detailedList: {
- value1: "",
- value2: "",
- value3: "",
- value4: "",
+ moNo: "",
+ partNo: "",
+ partName: "",
+ qtyRequired: "",
},
list: [
{
@@ -182,18 +184,10 @@
onShow() {
let that = this;
uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- if ((that.form.moNO = null)) {
+ if ((that.form.moNO == null)) {
uni.showToast({
icon: "none",
title: "璇峰厛閫夋嫨璁㈠崟鍙凤紒",
- duration: 2 * 1000,
- });
- return;
- }
- if ((that.form.moNO = null)) {
- uni.showToast({
- icon: "none",
- title: "鎵弿鐨勪簩缁寸爜涓庤璁㈠崟涓嶄竴鑷�",
duration: 2 * 1000,
});
return;
@@ -204,8 +198,15 @@
console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
if (data.code) {
let codeInfo = JSON.parse(data.code);
- if (codeInfo.WorkNo) {
- (this.detailedList = {}),
+ if (codeInfo.moNO) {
+ if ((that.form.moNO != codeInfo.moNO)) {
+ uni.showToast({
+ icon: "none",
+ title: "鎵弿鐨勪簩缁寸爜涓庤璁㈠崟涓嶄竴鑷�",
+ duration: 2 * 1000,
+ });
+ return;
+ }
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
that.saveForm(codeInfo);
}
@@ -235,10 +236,10 @@
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
saveForm(val) {
- let { WorkNo, ProcessName, ORDER_NO } = val;
- this.detailedList.value1 = WorkNo;
- this.detailedList.value2 = ProcessName;
- this.detailedList.value3 = ORDER_NO;
+ let { moNo, partNo, partName } = val;
+ this.detailedList.moNo = moNo;
+ this.detailedList.partNo = partNo;
+ this.detailedList.partName = partName;
this.showModal = true;
},
},
diff --git a/pages/product/report/components/saveForm.vue b/pages/product/report/components/saveForm.vue
index 07dfda6..a918cd4 100644
--- a/pages/product/report/components/saveForm.vue
+++ b/pages/product/report/components/saveForm.vue
@@ -100,7 +100,10 @@
<text class="item-one item-two">鐢熶骇閫熷害</text>
</view>
<view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="form.productionSpeed" />
+ <u-input
+ class="item-one item-two"
+ v-model="form.productionSpeed"
+ />
</view>
</view>
</view>
@@ -151,15 +154,15 @@
this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
return;
}
- this.operationTaskList.operationTaskId = this.operationTaskList.id
- this.form.operationTaskId = this.operationTaskList.id
- this.operationTaskList.productOutputList = []; // 鍒涘缓涓�涓┖鏁扮粍
- this.operationTaskList.productOutputList.push(this.form); // 鍚戞暟缁勪腑娣诲姞鍏冪礌
- console.log('this.operationTaskList',this.operationTaskList)
+ this.operationTaskList.operationTaskId = this.operationTaskList.id;
+ this.form.operationTaskId = this.operationTaskList.id;
+ this.operationTaskList.productOutputList = []; // 鍒涘缓涓�涓┖鏁扮粍
+ this.operationTaskList.productOutputList.push(this.form); // 鍚戞暟缁勪腑娣诲姞鍏冪礌
+ console.log("this.operationTaskList", this.operationTaskList);
this.$u.api.workReporting
.submitPDA(this.operationTaskList)
.then((res) => {
- this.$emit('update')
+ this.$emit("update");
this.$refs.uModal.cancel();
});
},
@@ -169,7 +172,7 @@
},
open(val) {
this.show = true;
- this.form = val.data;
+ this.form = val.data;
},
},
};
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index d66fafe..fdcf7b3 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -74,13 +74,13 @@
<u-radio name="鎶曟枡">鎶曟枡</u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item label="宸ュ簭" prop="value1">
+ <u-form-item label="宸ュ簭">
<u-checkbox-group>
<u-checkbox
:name="item.name"
v-for="(item, index) in checkboxList"
:key="index"
- v-model="item.value1"
+ v-model="item.value"
@change="changeCheckbox"
:disabled="subdisabled || item.disabled"
>
@@ -243,6 +243,7 @@
showSave: false,
operationTaskId: "",
subdisabled: false,
+ codeInfoId: "",
};
},
// 鐐瑰嚮鎻愪氦鎸夐挳鐨勪簨浠跺鐞嗗嚱鏁�
@@ -278,18 +279,11 @@
//鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
if (data.code) {
let codeInfo = JSON.parse(data.code);
+ that.codeInfoId = codeInfo.id;
if (codeInfo.moOn) {
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
that.saveForm(codeInfo);
- that.$u.api.workReporting
- .getProductMainV1({
- current: 1,
- size: -1,
- id: codeInfo.id,
- })
- .then((res) => {
- that.InventoryReceiptList = res.data.productOutputList;
- });
+ that.getHandelList();
}
}
});
@@ -297,9 +291,22 @@
watch: {
"form.taskNo": function (newVal, oldVal) {
this.subdisabled = false;
+ this.checkboxList[1].value = false;
+ this.checkboxList[0].value = false;
},
},
methods: {
+ getHandelList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.codeInfoId,
+ })
+ .then((res) => {
+ this.InventoryReceiptList = res.data.productOutputList;
+ });
+ },
// 澶氶�夊鐞�
changeCheckbox(val) {
if (val.name === "宸ュ簭鐨勮嚜鍔ㄦ姤鍛�") {
@@ -311,6 +318,7 @@
},
handleUpdate() {
this.subdisabled = true;
+ this.getHandelList();
},
// 鎵撳紑寮规--鍚庨潰杩橀渶瑕佺洃鍚壂鐮佹灙鎵爜缁撴灉锛岃祴鍊肩粰鎶ュ伐鍗曞彿瀛楁锛岀劧鍚庢墦寮�寮规閫夋嫨璁㈠崟鍙风瓑鎿嶄綔
open() {
@@ -355,6 +363,8 @@
autoReport: false,
simplifyMaterials: false,
};
+ this.checkboxList[1].value = false;
+ this.checkboxList[0].value = false;
if (this.form.materialcost == "鍊掑啿") {
this.checkboxList[1].disabled = true;
}
diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index 18a11f5..5b35f7e 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -10,8 +10,11 @@
<text class="item-one">搴撲綅</text>
</view>
<view class="packing-registration-param-item-right">
- <text
- class="item-one item-two">{{ registerInfo.storageLocation == '' ? "璇锋壂鎻忓簱浣�" : registerInfo.storageLocation }}</text>
+ <text class="item-one item-two">{{
+ registerInfo.proposedLocation == ""
+ ? "璇锋壂鎻忓簱浣�"
+ : registerInfo.proposedLocation
+ }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -26,7 +29,6 @@
<view class="wrap">
<scroll-view class="packing-registration-scroll-list" scroll-y="true">
<u-cell-group class="packing-registration-scroll-list-group" :border="false">
- <!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
<view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
<view class="content-header">
<view class="content-header-title">{{ index + 1 }}</view>
@@ -37,7 +39,7 @@
<view class="_label-name">闆朵欢鍙凤細</view>
</view>
<view class="_content">
- {{ item.value0 }}
+ {{ item.partNo }}
</view>
</view>
<view class="row-list">
@@ -45,7 +47,7 @@
<view class="_label-name">鎵规鍙凤細</view>
</view>
<view class="_content">
- {{ item.value1 }}
+ {{ item.moNo }}
</view>
</view>
<view class="row-list">
@@ -53,7 +55,7 @@
<view class="_label-name">搴撲綅鍙凤細</view>
</view>
<view class="_content">
- {{ item.value0 }}
+ {{ item.proposedLocation }}
</view>
</view>
<view class="row-list">
@@ -79,7 +81,7 @@
<text class="item-one">鎵瑰彿</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{ detailedList.moNo }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -87,7 +89,9 @@
<text class="item-one">闆朵欢鎻忚堪</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{
+ detailedList.partName
+ }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -95,7 +99,7 @@
<text class="item-one">WDR</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{ detailedList.WDR }}</text>
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -111,7 +115,9 @@
<text class="item-one">褰撳墠搴撲綅</text>
</view>
<view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</text>
+ <text class="item-one item-two">{{
+ detailedList.proposedLocation
+ }}</text>
</view>
</view>
</view>
@@ -141,38 +147,15 @@
storageLocation: "",
num: 0,
},
- showModal: true, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
- hasScanSnList: [{
- value0: "11111111111111111111111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- {
- value0: "111",
- value1: "111",
- value2: "111",
- value3: "111",
- },
- ],
+ showModal: false, // 鎺у埗寮圭獥鏄剧ず闅愯棌鐨勫彉閲�
+ hasScanSnList: [],
+ detailedList: {
+ moNo: "",
+ partNo: "",
+ proposedLocation: "",
+ WDR: "",
+ },
+ codeInfoId: '',
};
},
onLoad() {},
@@ -186,19 +169,33 @@
if (data.code) {
let codeInfo = JSON.parse(data.code);
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
- that.saveForm(codeInfo);
+ // 鍒ゆ柇鎵弿鐨勬槸搴撲綅鐮佽繕鏄祦杞爜
+ if (codeInfo.LN) {
+ that.saveForm(codeInfo)
+ } else {
+ that.codeInfoId = codeInfo.id
+ that.saveModalForm(codeInfo)
+ that.getHandelList();
+ }
}
});
},
methods: {
+ getHandelList() {
+ this.$u.api.workReporting
+ .getProductMainV1({
+ current: 1,
+ size: -1,
+ id: this.codeInfoId,
+ })
+ .then((res) => {
+ this.hasScanSnList = res.data.productOutputList;
+ });
+ },
confirm() {
// 澶勭悊纭閫昏緫
- this.show = false;
- },
- cancel() {
- this.show = false; // 鍏抽棴寮圭獥
// 鐐瑰嚮纭绉诲簱
- if (_) {
+ if (true) {
uni.showToast({
icon: "none",
title: "浣犳棤娉曞皢闆朵欢绉诲埌鐩稿悓浣嶇疆",
@@ -206,20 +203,24 @@
});
return
}
- this.$u.api.workReporting._({}).then((res) => {
- console.log("res", res);
- this.hasScanSnList = res.data.records;
- });
+ this.getHandelList()
+ this.show = false;
},
- // 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
+ cancel() {
+ this.show = false; // 鍏抽棴寮圭獥
+ },
+ // 鍥炴樉鎵爜鐨勪俊鎭�
saveForm(val) {
- // 鍒ゆ柇鎵弿鐨勬槸搴撲綅鐮佽繕鏄祦杞爜
- if (_) {
- this.registerInfo.storageLocation = val.storageLocation
- }
- if (_) {
+ this.registerInfo.proposedLocation = val.LN
+ }
+ saveModalForm(val) {
+ this.detailedList: {
+ moNo: val.moNo,
+ partNo: val.partNo,
+ proposedLocation: val.proposedLocation,
+ WDR: val.WDR,
+ },
this.show = true;
- }
}
},
};
--
Gitblit v1.9.3