From 8b1b8a60b6280c4aae555e6914103db644c36c4e Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 28 十月 2025 15:56:14 +0800
Subject: [PATCH] 取消报工页面订单号字段变更
---
pages/product/WorkshopOrderIssued/index.vue | 1081 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 577 insertions(+), 504 deletions(-)
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index ef9e2e2..f5949b1 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/pages/product/WorkshopOrderIssued/index.vue
@@ -1,450 +1,523 @@
// 杞﹂棿璁㈠崟涓嬪彂
<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.moNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.moNo
+ <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.ifsOrderNo == ""
+ ? "鐐瑰嚮閫夋嫨"
+ : registerInfo.ifsOrderNo
}}</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="seachWork()">{{
+ <u-icon
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ @click="seachPersonnelNo()"
+ v-show="registerInfo.ifsOrderNo == ''"
+ ></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="seachWork()">{{
registerInfo.optaskNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.optaskNo
}}</text>
- <u-icon name="arrow-right" color="#687792" size="28" @click="seachWork()"
- v-show="registerInfo.optaskNo == ''"></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">
- <picker class="item-one item-two" style="width: 100%; text-align: right"
- @change="machineChange($event, machineList)" :value="machineIndex" :range="machineList"
- range-key="label">
- <view>
- <text :style="{ color: machineIndex == null ? '#a5abb4' : '#a5abb4' }">{{
- machineIndex == null
- ? "鐐瑰嚮閫夋嫨"
- : machineList[machineIndex].label
- }}</text>
- </view>
- </picker>
- <u-icon v-if="machineIndex == null" name="arrow-right" color="#687792" size="28"></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="seachWork()"
+ v-show="registerInfo.optaskNo == ''"
+ ></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">
+ <picker
+ class="item-one item-two"
+ style="width: 100%; text-align: right"
+ @change="machineChange($event, machineList)"
+ :value="machineIndex"
+ :range="machineList"
+ range-key="label"
+ >
+ <view>
+ <text
+ :style="{
+ color: machineIndex == null ? '#a5abb4' : '#a5abb4',
+ }"
+ >{{
+ machineIndex == null
+ ? "鐐瑰嚮閫夋嫨"
+ : machineList[machineIndex].label
+ }}</text
+ >
+ </view>
+ </picker>
+ <u-icon
+ v-if="machineIndex == null"
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ ></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.partNo == "" ? "鐐瑰嚮閫夋嫨" : registerInfo.partNo
}}</text>
- <u-icon name="arrow-right" color="#687792" size="28" @click="seachComp()"
- v-show="registerInfo.partNo == ''"></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.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>
- </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.outBatchNo }}
- </view>
- </view>
- <view class="row-list">
- <view class="_label">
- <view class="_label-name">涓嬪彂鏁伴噺锛�</view>
- </view>
- <view class="_content">
- {{ item.suppliedQuantity }}
- </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">{{
+ <u-icon
+ name="arrow-right"
+ color="#687792"
+ size="28"
+ @click="seachComp()"
+ v-show="registerInfo.partNo == ''"
+ ></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.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>
+ </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.outBatchNo }}
+ </view>
+ </view>
+ <view class="row-list">
+ <view class="_label">
+ <view class="_label-name">涓嬪彂鏁伴噺锛�</view>
+ </view>
+ <view class="_content">
+ {{ item.suppliedQuantity }}
+ </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.outBatchNo
}}</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">{{
+ </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.locationNo
}}</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.suppliedQuantity" />
- </view>
- </view>
- </view>
- </view>
- </view>
- </u-modal>
- </view>
+ </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.suppliedQuantity"
+ />
+ </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: {},
- // 涓婚〉闈㈠垪琛�
- registerInfo: {
- operationTaskId: '',
- id: "",
- moNo: "",
- partNo: "",
- partName: "",
- optaskNo: "",
- workstationId: ''
- },
- // 涓嬪彂璁板綍鍒楄〃
- hasScanSnList: [],
- codeInfoId: "",
- showModal: false,
- machineIndex: null,
- machineList: [],
-
- };
- },
- onShow() {
- let that = this;
- uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- uni.$on("scan", function(data) {
- console.log("onscan");
- if (that.registerInfo.partNo == "") {
- uni.showToast({
- icon: "none",
- title: "璇峰厛閫夋嫨瀛愪欢锛�",
- duration: 2 * 1000,
- });
- return;
- }
- if (that.registerInfo.workstationId == "") {
- uni.showToast({
- icon: "none",
- title: "璇峰厛閫夋嫨鏈哄彴锛�",
- duration: 2 * 1000,
- });
- return;
- }
- if (data.code) {
- //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log("鎵爜缁撴灉锛�", data.code);
- let codeInfo = JSON.parse(data.code);
- that.codeInfoId = codeInfo.id;
- if (codeInfo.partNo) {
- if (that.registerInfo.partNo != codeInfo.partNo) {
- this.$u.toast("褰撳墠瀛愪欢鍜屾壂鐮佸瓙浠朵笉涓�鑷达紒");
- return;
- }
- // 鎵弿鎶ュ伐鍗曚簩缁寸爜
- that.scanHandle(codeInfo);
- that.$forceUpdate();
- // that.getHandelList();
- }
- }
- });
- },
- methods: {
- //鏈哄彴
- machineChange(e, storage, code) {
- this.hasScanSnList = []
- if (storage.length <= 0) {
- this.machineIndex = null;
- return;
- }
- this.machineIndex = e.target.value;
- this.registerInfo.workstationId = storage[this.machineIndex].value;
- },
- // getHandelList() {
- // this.$u.api.workReporting
- // .getProductMainV1({
- // current: 1,
- // size: -1,
- // id: this.codeInfoId,
- // })
- // .then((res) => {
- // this.hasScanSnList = res.data.productOutputList;
- // });
- // },
- // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
- confirm() {
- // 澶勭悊纭閫昏緫
- this.$u.api.WorkshopOrderIssued.feeding({
- feedingFrom: "stocker",
- operationTaskId: this.registerInfo.operationTaskId,
- feeds: [{
- ...this.modalList
- }]
- }).then(
- (res) => {
- console.log("res", res);
- if (res.code === 0) {
- this.$u.toast("鎻愪氦鎴愬姛");
- this.showModal = false;
- const obj = {
- suppliedQuantity: this.modalList.suppliedQuantity,
- outBatchNo: this.modalList.outBatchNo,
- }
- this.hasScanSnList.push(obj)
- }
- }
- );
- },
- // 妯℃�佹鍙栨秷
- cancel() {
- this.showModal = false; // 鍏抽棴寮圭獥
- },
- // 宸ュ崟鍥炴樉
- workNo(val) {
- this.machineList = []
- this.machineIndex = null
- this.registerInfo.workstationId = ''
- this.registerInfo.partName = ''
- this.registerInfo.partNo = ''
- this.$u.api.WorkshopOrderIssued
- .selWorkStation(val)
- .then((res) => {
- console.log('111', res)
- if (res.code === 0 && res.data.length > 0) {
- res.data.forEach(i => {
- const obj = Object.assign({
- label: i.name,
- value: i.id,
- })
- this.machineList.push(obj)
- })
- }
- });
- this.registerInfo.optaskNo = val.optaskNo;
- this.registerInfo.operationTaskId = val.id;
- this.hasScanSnList = []
- },
- // 瀛愪欢鍥炴樉
- compNo(val) {
- this.registerInfo.partNo = val.partNo;
- this.registerInfo.partName = val.partName;
- },
- // 璁㈠崟鍙峰洖鏄�
- setNo(val) {
- console.log("11111", val);
- this.registerInfo = {
- operationTaskId: '',
- id: val.id,
- moNo: val.moNo,
- partNo: "",
- partName: "",
- optaskNo: "",
- workstationId: ''
- },
- this.machineList = []
- this.machineIndex = null
- this.hasScanSnList = []
- },
- //璁㈠崟鍙�
- seachPersonnelNo() {
- console.log("杞﹂棿璁㈠崟鍙�");
- uni.navigateTo({
- url: "/pages/product/report/orderList",
- });
- },
- //瀛愪欢
- seachComp() {
- if (this.registerInfo.optaskNo == "") {
- this.$u.toast("璇烽�夋嫨宸ュ崟鍙�");
- return;
- }
- console.log("瀛愪欢");
- // 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
- uni.navigateTo({
- url: "/pages/product/WorkshopOrderIssued/comp?operationTaskId=" +
- encodeURIComponent(JSON.stringify(this.registerInfo.operationTaskId)),
- });
- },
- //宸ュ崟
- seachWork() {
- if (this.registerInfo.moNo == "") {
- this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
- return;
- }
- console.log("瀛愪欢");
- // 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
- uni.navigateTo({
- url: "/pages/product/WorkshopOrderIssued/WorkOrderList?id=" +
- encodeURIComponent(JSON.stringify(this.registerInfo.id)),
- });
- },
- // 鎵爜鍚庢暟鎹洖鏄�
- scanHandle(val) {
- const {
- outBatchNo
- } = val
- const {
- workstationId,
- operationTaskId
- } = this.registerInfo
- const obj = {
- outBatchNo: outBatchNo,
- workstationId: workstationId,
- operationTaskId: operationTaskId,
- }
- this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then(
- (res) => {
- console.log("res", res);
- if (res.code === 0) {
- res.data.workstationId = workstationId,
- this.modalList = res.data;
- this.showModal = true;
- }
- }
- );
- },
- },
- };
+ data() {
+ return {
+ background: {
+ backgroundImage: `url(${content_bg})`,
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
+ },
+ labelStyle: {
+ fontSize: "32rpx",
+ whiteSpace: "nowrap",
+ },
+ // 寮圭獥鍒楄〃
+ modalList: {},
+ // 涓婚〉闈㈠垪琛�
+ registerInfo: {
+ operationTaskId: "",
+ id: "",
+ ifsOrderNo: "",
+ partNo: "",
+ partName: "",
+ optaskNo: "",
+ workstationId: "",
+ ifsLineItemNo: "",
+ },
+ // 涓嬪彂璁板綍鍒楄〃
+ hasScanSnList: [],
+ codeInfoId: "",
+ showModal: false,
+ machineIndex: null,
+ machineList: [],
+ };
+ },
+ onShow() {
+ let that = this;
+ uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ uni.$on("scan", function (data) {
+ console.log("onscan");
+ if (data.code) {
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log("鎵爜缁撴灉锛�", data.code);
+ let codeInfo = JSON.parse(data.code);
+ that.codeInfoId = codeInfo.id;
+ if (codeInfo.PN) {
+ if (that.registerInfo.partNo != codeInfo.PN) {
+ this.$u.toast("褰撳墠鐗╂枡缁撴瀯鍜屾壂鐮佺墿鏂欑粨鏋勪笉涓�鑷达紒");
+ return;
+ }
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.scanHandle(codeInfo);
+ that.$forceUpdate();
+ // that.getHandelList();
+ }
+ if (codeInfo.moOn) {
+ this.$u.api.WorkshopOrderIssued.getManuOrder({
+ moOn: codeInfo.moOn,
+ }).then((res) => {
+ if (res.code === 0) {
+ that.registerInfo = {
+ operationTaskId: "",
+ id: res.data.id,
+ ifsOrderNo: res.data.ifsOrderNo,
+ partNo: "",
+ partName: "",
+ optaskNo: "",
+ workstationId: "",
+ ifsLineItemNo: "",
+ };
+ }
+ })
+ .catch((err) => {
+ })
+ }
+ }
+ });
+ },
+ methods: {
+ //鏈哄彴
+ machineChange(e, storage, code) {
+ this.hasScanSnList = [];
+ if (storage.length <= 0) {
+ this.machineIndex = null;
+ return;
+ }
+ this.machineIndex = e.target.value;
+ this.registerInfo.workstationId = storage[this.machineIndex].value;
+ },
+ // getHandelList() {
+ // this.$u.api.workReporting
+ // .getProductMainV1({
+ // current: 1,
+ // size: -1,
+ // id: this.codeInfoId,
+ // })
+ // .then((res) => {
+ // this.hasScanSnList = res.data.productOutputList;
+ // });
+ // },
+ // 鐐瑰嚮纭鍚庤幏鍙栦笅鍙戣褰�
+ confirm() {
+ if (!this.modalList.outBatchNo) {
+ this.$u.toast("鎵瑰彿涓虹┖涓嶈兘鎻愪氦");
+ this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
+ return;
+ }
+ if (!this.modalList.locationNo) {
+ this.$u.toast("搴撲綅涓虹┖涓嶈兘鎻愪氦");
+ this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
+ return;
+ }
+ if (!this.modalList.suppliedQuantity) {
+ this.$u.toast("璇疯緭鍏ュ彇娑堜笅鍙戞暟閲�");
+ this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
+ return;
+ }
+ // 澶勭悊纭閫昏緫
+ this.$u.api.WorkshopOrderIssued.feedingPDA({
+ feedingFrom: "stocker",
+ moId: this.registerInfo.id,
+ feeds: [
+ {
+ ...this.modalList,
+ },
+ ],
+ }).then((res) => {
+ console.log("res", res);
+ if (res.code === 0) {
+ this.$u.toast("鎻愪氦鎴愬姛");
+ this.showModal = false;
+ const obj = {
+ suppliedQuantity: this.modalList.suppliedQuantity,
+ outBatchNo: this.modalList.outBatchNo,
+ };
+ this.hasScanSnList.push(obj);
+ }
+ });
+ },
+ // 妯℃�佹鍙栨秷
+ cancel() {
+ this.showModal = false; // 鍏抽棴寮圭獥
+ },
+ // 宸ュ崟鍥炴樉
+ workNo(val) {
+ this.machineList = [];
+ this.machineIndex = null;
+ this.registerInfo.workstationId = "";
+ this.registerInfo.partName = "";
+ this.registerInfo.partNo = "";
+ this.$u.api.WorkshopOrderIssued.selWorkStation(val).then((res) => {
+ console.log("111", res);
+ if (res.code === 0 && res.data.length > 0) {
+ res.data.forEach((i) => {
+ const obj = Object.assign({
+ label: i.name,
+ value: i.id,
+ });
+ this.machineList.push(obj);
+ });
+ }
+ });
+ this.registerInfo.optaskNo = val.optaskNo;
+ this.registerInfo.operationTaskId = val.id;
+ this.hasScanSnList = [];
+ },
+ // 瀛愪欢鍥炴樉
+ compNo(val) {
+ this.registerInfo.partNo = val.partNo;
+ this.registerInfo.partName = val.partName;
+ this.registerInfo.ifsLineItemNo = val.ifsLineItemNo;
+ },
+ // 璁㈠崟鍙峰洖鏄�
+ setNo(val) {
+ console.log("11111", val);
+ (this.registerInfo = {
+ operationTaskId: "",
+ id: val.id,
+ ifsOrderNo: val.ifsOrderNo,
+ partNo: "",
+ partName: "",
+ optaskNo: "",
+ workstationId: "",
+ ifsLineItemNo: "",
+ }),
+ (this.machineList = []);
+ this.machineIndex = null;
+ this.hasScanSnList = [];
+ },
+ //璁㈠崟鍙�
+ seachPersonnelNo() {
+ console.log("杞﹂棿璁㈠崟鍙�");
+ uni.navigateTo({
+ url: "/pages/product/report/orderList",
+ });
+ },
+ //瀛愪欢
+ seachComp() {
+ // if (this.registerInfo.optaskNo == "") {
+ // this.$u.toast("璇烽�夋嫨宸ュ崟鍙�");
+ // return;
+ // }
+ if (this.registerInfo.ifsOrderNo == "") {
+ this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
+ return;
+ }
+ console.log("瀛愪欢");
+ // 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
+ uni.navigateTo({
+ url:
+ "/pages/product/WorkshopOrderIssued/comp?operationTaskId=" +
+ encodeURIComponent(JSON.stringify(this.registerInfo.id)),
+ });
+ },
+ //宸ュ崟
+ seachWork() {
+ if (this.registerInfo.ifsOrderNo == "") {
+ this.$u.toast("璇烽�夋嫨璁㈠崟鍙�");
+ return;
+ }
+ console.log("瀛愪欢");
+ // 浣跨敤uni.navigateTo鏂规硶璺宠浆锛屽苟閫氳繃queryParams浼犻�掑弬鏁�
+ uni.navigateTo({
+ url:
+ "/pages/product/WorkshopOrderIssued/WorkOrderList?id=" +
+ encodeURIComponent(JSON.stringify(this.registerInfo.id)),
+ });
+ },
+ // 鎵爜鍚庢暟鎹洖鏄�
+ scanHandle(val) {
+ const { BN } = val;
+ const { workstationId, operationTaskId } = this.registerInfo;
+ const obj = {
+ outBatchNo: BN,
+ // workstationId: workstationId,
+ // operationTaskId: operationTaskId,
+ };
+ this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then((res) => {
+ console.log("res", res);
+ if (res.code === 0) {
+ (res.data.workstationId = workstationId), (this.modalList = res.data);
+ this.modalList.ifsLineItemNo = this.registerInfo.ifsLineItemNo;
+ this.showModal = true;
+ }
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
- .popup-content {
- width: 600rpx;
- height: 350rpx;
- background-color: #fff;
- border-radius: 8px;
- z-index: 10;
- /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
- }
+.popup-content {
+ width: 600rpx;
+ height: 350rpx;
+ background-color: #fff;
+ border-radius: 8px;
+ z-index: 10;
+ /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
+}
- .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: 550rpx;
- background-color: #fff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
- margin-bottom: 30rpx;
+ .packing-registration-param-view {
+ height: 350rpx;
+ 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: small;
+ color: #232222;
+ }
+ }
.packing-registration-param-item-right {
display: flex;
@@ -457,7 +530,7 @@
}
.item-two {
- font-size: 30rpx;
+ font-size: small;
color: #a6b4cc;
margin-right: 6rpx;
}
@@ -470,95 +543,95 @@
}
}
- .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: small;
+ 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: small;
+ }
- .row-list .s1 {
- color: #d35651;
- }
- }
- }
- }
+ .row-list .s1 {
+ color: #d35651;
+ }
+ }
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3