From 114e731babff512d961c48d42a425b7563f33e67 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 11 六月 2025 13:11:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-jdhj-uniapp
---
pages/wareHouse/nuclearScale/createwriteoffform.vue | 728 +++++++++++++-----------------
pages/wareHouse/moveWareHouse/index.vue | 619 +++++++++++++------------
pages/product/report/index.vue | 45 +
pages/wareHouse/nuclearScale/index.scss | 8
common/http.api.js | 3
5 files changed, 676 insertions(+), 727 deletions(-)
diff --git a/common/http.api.js b/common/http.api.js
index b104d74..ab6d153 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -489,8 +489,9 @@
//鑾峰彇浠诲姟绫诲瀷
getAssemblyProcessType:(params = {}) => vm.$u.get('/admin/dict/type/assembly_process_type')
},
- // PDA
+ // 鎶ュ伐
workReporting: {
+ // 鑾峰彇杞﹂棿璁㈠崟鍒楄〃
getWorkshopOrder:(params = {}) => vm.$u.get('/mes/plan/manufacturingOrder/page' , params),
}
};
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index 2702466..02bd8fa 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -8,20 +8,20 @@
<u-radio name="閾滄潌">閾滄潌</u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item label="鎶ュ伐鍗曞彿" :border-bottom="false" prop="value1">
- <u-input v-model="form.value1" type="select" placeholder="璇锋壂鎻忔姤宸ュ崟鍙�" @click="open" />
+ <u-form-item label="鎶ュ伐鍗曞彿" :border-bottom="false" prop="taskNo">
+ <u-input v-model="form.taskNo" type="select" placeholder="璇锋壂鎻忔姤宸ュ崟鍙�" @click="open" />
</u-form-item>
- <u-form-item label="宸ュ簭" :border-bottom="false" prop="value2">
- <u-input v-model="form.value2" type="select" placeholder="璇锋壂鎻忔姤宸ュ崟鍙�" />
+ <u-form-item label="宸ュ簭" :border-bottom="false" prop="name">
+ <u-input v-model="form.name" type="select" placeholder="璇锋壂鎻忔姤宸ュ崟鍙�" />
</u-form-item>
- <u-form-item label="璁㈠崟鍙�" :border-bottom="false" prop="value3">
- <u-input v-model="form.value3" type="select" placeholder="鐐瑰嚮閫夋嫨" @click="openList" />
+ <u-form-item label="璁㈠崟鍙�" :border-bottom="false" prop="moOn">
+ <u-input v-model="form.moOn" type="select" placeholder="鐐瑰嚮閫夋嫨" @click="openList" />
</u-form-item>
- <u-form-item label="闆朵欢鍙�" :border-bottom="false" prop="value4">
- <u-input v-model="form.value4" placeholder="" disabled />
+ <u-form-item label="闆朵欢鍙�" :border-bottom="false" prop="partNo">
+ <u-input v-model="form.partNo" placeholder="" disabled />
</u-form-item>
- <u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="value5">
- <u-input v-model="form.value5" placeholder="" disabled />
+ <u-form-item label="闆朵欢鎻忚堪" :border-bottom="false" prop="partName">
+ <u-input v-model="form.partName" placeholder="" disabled />
</u-form-item>
<u-form-item label="鎵归噺澶у皬" :border-bottom="false" prop="value6">
<u-input v-model="form.value6" placeholder="" disabled />
@@ -87,12 +87,11 @@
}
],
form: {
- value0: '',
- value1: '',
- value2: '',
- value3: '',
- value4: '',
- value5: '',
+ taskNo: '',
+ name: '',
+ moOn: '',
+ partNo: '',
+ partName: '',
value6: '',
value7: '',
value8: '',
@@ -184,7 +183,7 @@
console.log('椤甸潰鎵爜缁撴灉锛�', data.code);
if (data.code) {
let codeInfo = JSON.parse(data.code)
- if (codeInfo.WorkNo) {
+ if (codeInfo.moOn) {
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
that.saveForm(codeInfo);
}
@@ -229,10 +228,14 @@
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
saveForm(val) {
- let { WorkNo, ProcessName, ORDER_NO } = val
- this.form.value1 = WorkNo
- this.form.value2 = ProcessName
- this.form.value3 = ORDER_NO
+ console.log('鍥炴樉鐨勬暟鎹�',val)
+ let { moOn, name, ORDER_NO,taskNo,partName,partNo } = val
+ this.form.moOn = moOn
+ this.form.name = name
+ this.form.taskNo = taskNo
+ this.form.partName = partName
+ this.form.partNo = partNo
+ // this.form.value3 = ORDER_NO
}
}
}
diff --git a/pages/wareHouse/moveWareHouse/index.vue b/pages/wareHouse/moveWareHouse/index.vue
index ad765f9..f0b73df 100644
--- a/pages/wareHouse/moveWareHouse/index.vue
+++ b/pages/wareHouse/moveWareHouse/index.vue
@@ -1,317 +1,344 @@
<template>
- <view class="page">
- <view class="movewarehouse-index-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">{{registerInfo.storageLocation}}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">{{`绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚}}</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.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>
- </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">{{ 111 }}</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">{{ 111 }}</text>
- </view>
- </view>
- <view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">WDR</text>
- </view>
- <view class="packing-registration-param-item-right">
- <text class="item-one item-two">{{ 111 }}</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">{{ 111 }}</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">{{ 111 }}</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- </u-modal>
- </view>
+ <view class="page">
+ <view class="movewarehouse-index-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">{{ registerInfo.storageLocation == '' ? "璇锋壂鎻忓簱浣�" : registerInfo.storageLocation }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">{{
+ `绉诲簱璁板綍(${registerInfo.num}鏉�)锛歚
+ }}</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.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>
+ </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">{{ 111 }}</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">{{ 111 }}</text>
+ </view>
+ </view>
+ <view class="packing-registration-param-item param-extra">
+ <view class="packing-registration-param-item-left">
+ <text class="item-one">WDR</text>
+ </view>
+ <view class="packing-registration-param-item-right">
+ <text class="item-one item-two">{{ 111 }}</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">{{ 111 }}</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">{{ 111 }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-modal>
+ <scan></scan>
+ </view>
</template>
<script>
- import scan from "@/components/scan/scan.vue";
- import content_bg from "@/static/custom/moveWareHouse/locNoBg.png";
- export default {
- components: {
- scan,
- },
+import scan from "@/components/scan/scan.vue";
+import content_bg from "@/static/custom/moveWareHouse/locNoBg.png";
+export default {
+ components: {
+ scan,
+ },
- data() {
- return {
- background: {
- backgroundImage: `url(${content_bg})`,
- backgroundAttachment: "fixed",
- backgroundSize: "100% auto",
- backgroundRepeat: "no-repeat",
- },
- registerInfo: {
- storageLocation: "LG001",
- 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',
- },
- ],
- };
- },
- onLoad() {},
- onShow() {
- let that = this;
-
- uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
- uni.$on("scan", function(data) {
- console.log("onscan");
- //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
- console.log("鎵爜缁撴灉锛�", data.code);
- });
- },
- onNavigationBarButtonTap(e) {
- uni.scanCode({
- success: (res) => {
- try {
- const result = JSON.parse(res.result);
- } catch (e) {}
- },
- });
- },
- methods: {
- confirm() {
- // 澶勭悊纭閫昏緫
- this.show = false;
- },
- cancel() {
- this.show = false; // 鍏抽棴寮圭獥
- },
- },
- };
+ data() {
+ return {
+ background: {
+ backgroundImage: `url(${content_bg})`,
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
+ },
+ registerInfo: {
+ 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",
+ },
+ ],
+ };
+ },
+ onLoad() {},
+ onShow() {
+ let that = this;
+ uni.$off("scan"); // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
+ uni.$on("scan", function (data) {
+ console.log("onscan");
+ //鎵爜鎴愬姛鍚庣殑鍥炶皟锛屼綘鍙互鍐欒嚜宸辩殑閫昏緫浠ｇ爜鍦ㄨ繖閲�
+ console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
+ if (data.code) {
+ let codeInfo = JSON.parse(data.code);
+ if (codeInfo.WorkNo) {
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ that.saveForm(codeInfo);
+ }
+ }
+ });
+ },
+ methods: {
+ confirm() {
+ // 澶勭悊纭閫昏緫
+ this.show = false;
+ },
+ cancel() {
+ this.show = false; // 鍏抽棴寮圭獥
+ },
+ // 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
+ saveForm(val) {
+ let { WorkNo, ProcessName, ORDER_NO } = val
+ this.form.value1 = WorkNo
+ this.form.value2 = ProcessName
+ this.form.value3 = ORDER_NO
+ }
+ },
+};
</script>
<style lang="scss" scoped>
- .person-btn-view {
- display: flex;
- justify-content: space-between;
- margin-top: 300rpx;
- }
+.person-btn-view {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 300rpx;
+}
- .popup-content {
- width: 600rpx;
- height: 500rpx;
- background-color: #fff;
- border-radius: 8px;
- z-index: 10;
- /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
- }
+.popup-content {
+ width: 600rpx;
+ height: 500rpx;
+ background-color: #fff;
+ border-radius: 8px;
+ z-index: 10;
+ /* 纭繚鍐呭鍦ㄨ挋鐗堜箣涓� */
+}
- .movewarehouse-index-bg {
- background-color: #f6f9ff;
- background-image: url("~@/static/custom/moveWareHouse/locNoBg.png");
- // background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
- 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;
- }
+.movewarehouse-index-bg {
+ background-color: #f6f9ff;
+ background-image: url("~@/static/custom/moveWareHouse/locNoBg.png");
+ // background: linear-gradient(180deg,rgba(206,227,254,1),rgba(206,227,254,1) 20%,rgba(206,227,254,0.5) 40%,rgba(206,227,254,0.25) 60%,rgba(206,227,254,0.08) 80%,rgba(206,227,254,0));
+ 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: 177rpx;
- background-color: #fff;
- border-radius: 10rpx;
- padding: 0rpx 23rpx;
- margin-bottom: 30rpx;
+ .packing-registration-param-view {
+ height: 177rpx;
+ 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;
- }
- }
- }
- .wrap .packing-registration-scroll-list {
- height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
- width: 100%;
- }
+ .param-extra {
+ border-bottom: 1px solid #ededed;
+ }
+ }
+}
+.wrap .packing-registration-scroll-list {
+ height: calc(100vh - var(--window-top) - var(--window-bottom) - 360rpx);
+ 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;
@@ -355,7 +382,7 @@
.row-list {
height: 60rpx;
display: flex;
- flex-direction: row;
+ flex-direction: row;
padding: 0px;
align-items: center;
}
@@ -386,5 +413,5 @@
}
}
}
- }
+}
</style>
\ No newline at end of file
diff --git a/pages/wareHouse/nuclearScale/createwriteoffform.vue b/pages/wareHouse/nuclearScale/createwriteoffform.vue
index e4f4353..14963bf 100644
--- a/pages/wareHouse/nuclearScale/createwriteoffform.vue
+++ b/pages/wareHouse/nuclearScale/createwriteoffform.vue
@@ -1,437 +1,347 @@
<template>
- <!-- 鏍哥褰曞叆 -->
- <div 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"
- />
- <u-form
- :model="form"
- ref="uForm"
- :label-width="200"
- :rules="rules"
- :error-type="['toast']"
- class="uForm"
- >
- <u-form-item label="浜у搧绫诲瀷" :border-bottom="false" prop="value0">
- <u-radio-group v-model="form.value0">
- <u-radio name="瀵间綋">瀵间綋</u-radio>
- <u-radio name="閾滄潌">閾滄潌</u-radio>
- <u-radio name="瀵间綋2.6">瀵间綋2.6</u-radio>
- </u-radio-group>
- </u-form-item>
- <u-form-item label="鏇挎崲浜岀淮鐮�" :border-bottom="false" prop="value1">
- <u-radio-group v-model="form.value1">
- <u-radio name="1">鏄�</u-radio>
- <u-radio name="0">鍚�</u-radio>
- </u-radio-group>
- </u-form-item>
- <u-form-item label="杞︾墝鍙�" :border-bottom="false" prop="value2">
- <u-input
- v-model="form.value2"
- type="select"
- placeholder="璇疯緭鍏ヨ溅鐗屽彿"
- @click="lpn"
- />
- </u-form-item>
- <u-form-item label="瀹㈡埛鍚嶇О" :border-bottom="false" prop="value3">
- <picker
- class="item-one item-two"
- style="width: 100%; text-align: right"
- @change="locNoNumBindChange($event, locNoList)"
- :value="locNoNumIndex"
- :range="locNoList"
- range-key="label"
- >
- <view>
- <text
- :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
- >{{
+ <!-- 鏍哥褰曞叆 -->
+ <div 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" />
+ <u-form :model="form" ref="uForm" :label-width="200" :rules="rules" :error-type="['toast']" class="uForm">
+ <u-form-item label="浜у搧绫诲瀷" :border-bottom="false" prop="value0">
+ <u-radio-group v-model="form.value0">
+ <u-radio name="瀵间綋">瀵间綋</u-radio>
+ <u-radio name="閾滄潌">閾滄潌</u-radio>
+ <u-radio name="瀵间綋2.6">瀵间綋2.6</u-radio>
+ </u-radio-group>
+ </u-form-item>
+ <u-form-item label="鏇挎崲浜岀淮鐮�" :border-bottom="false" prop="value1">
+ <u-radio-group v-model="form.value1">
+ <u-radio name="1">鏄�</u-radio>
+ <u-radio name="0">鍚�</u-radio>
+ </u-radio-group>
+ </u-form-item>
+ <u-form-item label="杞︾墝鍙�" :border-bottom="false" prop="value2">
+ <u-input v-model="form.value2" type="select" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @click="lpn" />
+ </u-form-item>
+ <u-form-item label="瀹㈡埛鍚嶇О" :border-bottom="false" prop="value3">
+ <picker class="item-one item-two" style="width: 100%; text-align: right"
+ @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
+ range-key="label">
+ <view>
+ <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
locNoNumIndex == null
? "璇烽�夋嫨"
: locNoList[locNoNumIndex].label
- }}</text
- >
- </view>
- </picker>
- <u-icon
- v-if="locNoNumIndex == null"
- name="arrow-right"
- color="#687792"
- size="28"
- ></u-icon>
- </u-form-item>
- <u-form-item label="鍙戣揣閫氱煡鍗曞彿" :border-bottom="false" prop="value4">
- <u-input v-model="form.value4" placeholder="" disabled />
- </u-form-item>
- <u-form-item label="鐢熶骇杞﹂棿" :border-bottom="false" prop="value5">
- <picker
- class="item-one item-two"
- style="width: 100%; text-align: right"
- @change="locNoNumBindChange($event, locNoList)"
- :value="locNoNumIndex"
- :range="locNoList"
- range-key="label"
- >
- <view>
- <text
- :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
- >{{
+ }}</text>
+ </view>
+ </picker>
+ <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
+ </u-form-item>
+ <u-form-item label="鍙戣揣閫氱煡鍗曞彿" :border-bottom="false" prop="value4">
+ <u-input v-model="form.value4" placeholder="" disabled />
+ </u-form-item>
+ <u-form-item label="鐢熶骇杞﹂棿" :border-bottom="false" prop="value5">
+ <picker class="item-one item-two" style="width: 100%; text-align: right"
+ @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
+ range-key="label">
+ <view>
+ <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
locNoNumIndex == null
? "璇烽�夋嫨"
: locNoList[locNoNumIndex].label
- }}</text
- >
- </view>
- </picker>
- <u-icon
- v-if="locNoNumIndex == null"
- name="arrow-right"
- color="#687792"
- size="28"
- ></u-icon>
- </u-form-item>
- <u-form-item label="鍙哥鍛�" :border-bottom="false" prop="value6">
- <picker
- class="item-one item-two"
- style="width: 100%; text-align: right"
- @change="locNoNumBindChange($event, locNoList)"
- :value="locNoNumIndex"
- :range="locNoList"
- range-key="label"
- >
- <view>
- <text
- :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }"
- >{{
+ }}</text>
+ </view>
+ </picker>
+ <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
+ </u-form-item>
+ <u-form-item label="鍙哥鍛�" :border-bottom="false" prop="value6">
+ <picker class="item-one item-two" style="width: 100%; text-align: right"
+ @change="locNoNumBindChange($event, locNoList)" :value="locNoNumIndex" :range="locNoList"
+ range-key="label">
+ <view>
+ <text :style="{ color: locNoNumIndex == null ? '#a5abb4' : '#0c0c0c' }">{{
locNoNumIndex == null
? "璇烽�夋嫨"
: locNoList[locNoNumIndex].label
- }}</text
- >
- </view>
- </picker>
- <u-icon
- v-if="locNoNumIndex == null"
- name="arrow-right"
- color="#687792"
- size="28"
- ></u-icon>
- </u-form-item>
- <u-form-item label="鍙夎溅宸�" :border-bottom="false" prop="value7">
- <u-input
- v-model="form.value7"
- type="select"
- placeholder="璇烽�夋嫨"
- @click="openForkliftDriverList"
- />
- </u-form-item>
- </u-form>
- <u-button type="primary" class="bottom-button" @click="submit"
- >鍒涘缓</u-button
- >
+ }}</text>
+ </view>
+ </picker>
+ <u-icon v-if="locNoNumIndex == null" name="arrow-right" color="#687792" size="28"></u-icon>
+ </u-form-item>
+ <u-form-item label="鍙夎溅宸�" :border-bottom="false" prop="value7">
+ <u-input v-model="form.value7" type="select" placeholder="璇烽�夋嫨" @click="openForkliftDriverList" />
+ </u-form-item>
+ </u-form>
+ <u-button type="primary" class="bottom-button1" @click="submit">鍒涘缓</u-button>
- <!--杞︾墝鍙� -->
- <modalBg ref="modalBg" :confirm="confirm">
- <u-field
- v-model="form.value2"
- label="杞︾墝鍙凤細"
- placeholder="璇疯緭鍏�"
- :border-bottom="false"
- >
- </u-field>
- </modalBg>
- <!-- 鍙夎溅宸� -->
- <u-modal
- v-model="showModal"
- title=""
- :show-cancel-button="true"
- :show-confirm-button="true"
- @confirm="confirmSelection"
- @cancel="cancel"
- >
- <view class="popup-content">
- <view class="popup-header">
- <checkbox-group @change="checkboxChange">
- <label
- class="checkbox-item"
- v-for="(item, index) in checkboxList"
- :key="index"
- >
- <checkbox :value="item.value" :checked="item.checked" />
- <text class="label">{{ item.label }}</text>
- </label>
- </checkbox-group>
- </view>
- </view>
- </u-modal>
- </div>
+ <!--杞︾墝鍙� -->
+ <modalBg ref="modalBg" :confirm="confirm">
+ <u-field v-model="form.value2" label="杞︾墝鍙凤細" placeholder="璇疯緭鍏�" :border-bottom="false">
+ </u-field>
+ </modalBg>
+ <!-- 鍙夎溅宸� -->
+ <u-modal v-model="showModal" title="" :show-cancel-button="true" :show-confirm-button="true"
+ @confirm="confirmSelection" @cancel="cancel">
+ <view class="popup-content">
+ <view class="popup-header">
+ <checkbox-group @change="checkboxChange">
+ <label class="checkbox-item" v-for="(item, index) in checkboxList" :key="index">
+ <checkbox :value="item.value" :checked="item.checked" />
+ <text class="label">{{ item.label }}</text>
+ </label>
+ </checkbox-group>
+ </view>
+ </view>
+ </u-modal>
+ </div>
</template>
<script>
-import modalBg from "@/components/modal/modal-bg.vue";
-import content_bg from "@/static/custom/packing/backBg.png";
-export default {
- components: {
- modalBg,
- },
- data() {
- return {
- checkboxList: [
- {
- label: "宸ヤ汉1",
- value: "a",
- checked: false,
- },
- {
- label: "宸ヤ汉2",
- value: "2",
- checked: false,
- },
- {
- label: "宸ヤ汉3",
- value: "3",
- checked: false,
- },
- {
- label: "宸ヤ汉4",
- value: "4",
- checked: false,
- },
- {
- label: "宸ヤ汉5",
- value: "5",
- checked: false,
- },
- ],
- background: {
- backgroundImage: `url(${content_bg})`,
- backgroundAttachment: "fixed",
- backgroundSize: "100% auto",
- backgroundRepeat: "no-repeat",
- },
- show: false,
- num: 1,
- form: {
- value0: "",
- value1: "",
- value2: "",
- value3: "",
- value4: "111",
- value5: "",
- value6: "",
- value7: "",
- value8: "",
- },
- rules: {
- value0: [
- {
- required: true,
- message: "璇烽�夋嫨浜у搧绫诲瀷",
- trigger: ["change"],
- },
- ],
- value1: [
- {
- required: true,
- message: "璇烽�夋嫨鏄惁鏇挎崲浜岀淮鐮�",
- trigger: ["change", "blur"],
- },
- ],
- value2: [
- {
- required: true,
- message: "璇疯緭鍏ヨ溅鐗屽彿",
- trigger: ["change", "blur"],
- },
- ],
- // value3: [
- // {
- // required: true,
- // message: "璇烽�夋嫨瀹㈡埛鍚嶇О",
- // trigger: ["change", "blur"],
- // },
- // ],
- value4: [
- {
- required: true,
- message: "璇疯緭鍏ュ彂璐ч�氱煡鍗曞彿",
- trigger: ["change"],
- },
- ],
- value5: [
- {
- required: true,
- message: "璇烽�夋嫨鐢熶骇杞﹂棿",
- trigger: ["change"],
- },
- ],
- value6: [
- {
- required: true,
- message: "璇烽�夋嫨鍙哥鍛�",
- trigger: ["change"],
- },
- ],
- value7: [
- {
- type: "array",
- required: true,
- message: "璇疯嚦灏戦�夋嫨涓�涓弶杞﹀伐",
- trigger: ["change"],
- },
- ],
- },
- locNoList: [
- {
- value: "0",
- label: "鍏徃1",
- },
- {
- value: "1",
- label: "鍏徃2",
- },
- {
- value: "2",
- label: "鍏徃3",
- },
- {
- value: "3",
- label: "鍏徃4",
- },
- {
- value: "4",
- label: "鍏徃5",
- },
- {
- value: "5",
- label: "鍏徃6",
- },
- ],
- locNoNumIndex: null,
- showModal: false,
- selectedItems: [],
- };
- },
- onReady() {
- this.$refs.uForm.setRules(this.rules);
- },
- onShow() {},
- methods: {
- // 澶嶉�夋鍙樺寲浜嬩欢
- checkboxChange(e) {
- const values = e.detail.value;
- this.checkboxList = this.checkboxList.map((item) => {
- return {
- ...item,
- checked: values.includes(item.value),
- };
- });
- },
+ import modalBg from "@/components/modal/modal-bg.vue";
+ import content_bg from "@/static/custom/packing/backBg.png";
+ export default {
+ components: {
+ modalBg,
+ },
+ data() {
+ return {
+ checkboxList: [{
+ label: "宸ヤ汉1",
+ value: "a",
+ checked: false,
+ },
+ {
+ label: "宸ヤ汉2",
+ value: "2",
+ checked: false,
+ },
+ {
+ label: "宸ヤ汉3",
+ value: "3",
+ checked: false,
+ },
+ {
+ label: "宸ヤ汉4",
+ value: "4",
+ checked: false,
+ },
+ {
+ label: "宸ヤ汉",
+ value: "5",
+ checked: false,
+ },
+ ],
+ background: {
+ backgroundImage: `url(${content_bg})`,
+ backgroundAttachment: "fixed",
+ backgroundSize: "100% auto",
+ backgroundRepeat: "no-repeat",
+ },
+ show: false,
+ num: 1,
+ form: {
+ value0: "",
+ value1: "",
+ value2: "",
+ value3: "",
+ value4: "111",
+ value5: "",
+ value6: "",
+ value7: "",
+ value8: "",
+ },
+ rules: {
+ value0: [{
+ required: true,
+ message: "璇烽�夋嫨浜у搧绫诲瀷",
+ trigger: ["change"],
+ }, ],
+ value1: [{
+ required: true,
+ message: "璇烽�夋嫨鏄惁鏇挎崲浜岀淮鐮�",
+ trigger: ["change", "blur"],
+ }, ],
+ value2: [{
+ required: true,
+ message: "璇疯緭鍏ヨ溅鐗屽彿",
+ trigger: ["change", "blur"],
+ }, ],
+ // value3: [
+ // {
+ // required: true,
+ // message: "璇烽�夋嫨瀹㈡埛鍚嶇О",
+ // trigger: ["change", "blur"],
+ // },
+ // ],
+ value4: [{
+ required: true,
+ message: "璇疯緭鍏ュ彂璐ч�氱煡鍗曞彿",
+ trigger: ["change"],
+ }, ],
+ value5: [{
+ required: true,
+ message: "璇烽�夋嫨鐢熶骇杞﹂棿",
+ trigger: ["change"],
+ }, ],
+ value6: [{
+ required: true,
+ message: "璇烽�夋嫨鍙哥鍛�",
+ trigger: ["change"],
+ }, ],
+ value7: [{
+ type: "array",
+ required: true,
+ message: "璇疯嚦灏戦�夋嫨涓�涓弶杞﹀伐",
+ trigger: ["change"],
+ }, ],
+ },
+ locNoList: [{
+ value: "0",
+ label: "鍏徃1",
+ },
+ {
+ value: "1",
+ label: "鍏徃2",
+ },
+ {
+ value: "2",
+ label: "鍏徃3",
+ },
+ {
+ value: "3",
+ label: "鍏徃4",
+ },
+ {
+ value: "4",
+ label: "鍏徃5",
+ },
+ {
+ value: "5",
+ label: "鍏徃6",
+ },
+ ],
+ locNoNumIndex: null,
+ showModal: false,
+ selectedItems: [],
+ };
+ },
+ onReady() {
+ this.$refs.uForm.setRules(this.rules);
+ },
+ onShow() {},
+ methods: {
+ // 澶嶉�夋鍙樺寲浜嬩欢
+ checkboxChange(e) {
+ const values = e.detail.value;
+ this.checkboxList = this.checkboxList.map((item) => {
+ return {
+ ...item,
+ checked: values.includes(item.value),
+ };
+ });
+ },
- // 纭閫夋嫨
- confirmSelection() {
- this.form.value7 = this.checkboxList
- .filter((item) => item.checked)
- .map((item) => item.label);
- },
- openForkliftDriverList() {
- this.showModal = true;
- },
- locNoNumBindChange(e, storage) {
- if (storage.length <= 0) {
- this.locNoNumIndex = null;
- return;
- }
- this.locNoNumIndex = e.target.value;
- this.form.value3 = storage[this.locNoNumIndex].label;
- },
- // 鎵撳紑寮规--鍚庨潰杩橀渶瑕佺洃鍚壂鐮佹灙鎵爜缁撴灉锛岃祴鍊肩粰鎶ュ伐鍗曞彿瀛楁锛岀劧鍚庢墦寮�寮规閫夋嫨璁㈠崟鍙风瓑鎿嶄綔
- lpn() {
- this.$refs.modalBg.open();
- },
- // 寮规淇濆瓨
- confirm() {
- console.log("淇濆瓨", this.form.value1);
- // 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
- },
- // 鎻愪氦鎸夐挳
- submit() {
- if (!this.$refs.uForm.validate()) {
- console.log("1111");
- return;
- }
- if (this.form.value3 === "") {
- uni.showToast({
- title: "璇峰厛閫夋嫨瀹㈡埛鍚嶇О",
- icon: "none",
- });
- return;
- }
- },
- },
-};
+ // 纭閫夋嫨
+ confirmSelection() {
+ this.form.value7 = this.checkboxList
+ .filter((item) => item.checked)
+ .map((item) => item.label);
+ },
+ openForkliftDriverList() {
+ this.showModal = true;
+ },
+ locNoNumBindChange(e, storage) {
+ if (storage.length <= 0) {
+ this.locNoNumIndex = null;
+ return;
+ }
+ this.locNoNumIndex = e.target.value;
+ this.form.value3 = storage[this.locNoNumIndex].label;
+ },
+ // 鎵撳紑寮规--鍚庨潰杩橀渶瑕佺洃鍚壂鐮佹灙鎵爜缁撴灉锛岃祴鍊肩粰鎶ュ伐鍗曞彿瀛楁锛岀劧鍚庢墦寮�寮规閫夋嫨璁㈠崟鍙风瓑鎿嶄綔
+ lpn() {
+ this.$refs.modalBg.open();
+ },
+ // 寮规淇濆瓨
+ confirm() {
+ console.log("淇濆瓨", this.form.value1);
+ // 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
+ },
+ // 鎻愪氦鎸夐挳
+ submit() {
+ if (!this.$refs.uForm.validate()) {
+ console.log("1111");
+ return;
+ }
+ if (this.form.value3 === "") {
+ uni.showToast({
+ title: "璇峰厛閫夋嫨瀹㈡埛鍚嶇О",
+ icon: "none",
+ });
+ return;
+ }
+ },
+ },
+ };
</script>
<style lang="scss" scoped>
-@import "index.scss";
+ @import "index.scss";
-/* 寮圭獥鏍峰紡 */
-.popup-content {
- padding: 30rpx;
- max-height: 70vh;
- overflow-y: auto;
-}
+ /* 寮圭獥鏍峰紡 */
+ .popup-content {
+ padding: 30rpx;
+ max-height: 70vh;
+ overflow-y: auto;
+ }
-.popup-header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding-bottom: 20rpx;
- border-bottom: 1rpx solid #eee;
- margin-bottom: 20rpx;
-}
+ .popup-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding-bottom: 20rpx;
+ border-bottom: 1rpx solid #eee;
+ margin-bottom: 20rpx;
+ }
-.title {
- font-size: 32rpx;
- font-weight: bold;
-}
+ .title {
+ font-size: 32rpx;
+ font-weight: bold;
+ }
-.confirm-btn {
- color: #007aff;
- font-size: 28rpx;
-}
+ .confirm-btn {
+ color: #007aff;
+ font-size: 28rpx;
+ }
-/* 澶嶉�夋鏍峰紡 */
-.checkbox-item {
- display: flex;
- align-items: center;
- padding: 20rpx 0;
- border-bottom: 1rpx solid #f5f5f5;
-}
+ /* 澶嶉�夋鏍峰紡 */
+ .checkbox-item {
+ width: 200px;
+ display: flex;
+ align-items: center;
+ padding: 20rpx 0;
+ border-bottom: 1rpx solid #f5f5f5;
+ .label{
+ position: relative;
+ left: 130px;
+ }
+ }
-.checkbox-item:last-child {
- border-bottom: none;
-}
+ .checkbox-item:last-child {
+ border-bottom: none;
+ }
-.checkbox-item .label {
- margin-left: 20rpx;
-}
+ .checkbox-item .label {
+ margin-left: 20rpx;
+ }
-.item-one {
- font-size: 30rpx;
- color: #0c0c0c;
- margin-right: 6rpx;
-}
+ .item-one {
+ font-size: 30rpx;
+ color: #0c0c0c;
+ margin-right: 6rpx;
+ }
-.item-two {
- font-size: 30rpx;
- color: #a5abb4;
- margin-right: 6rpx;
-}
+ .item-two {
+ font-size: 30rpx;
+ color: #a5abb4;
+ margin-right: 6rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/wareHouse/nuclearScale/index.scss b/pages/wareHouse/nuclearScale/index.scss
index d9fa2ec..7ec1a27 100644
--- a/pages/wareHouse/nuclearScale/index.scss
+++ b/pages/wareHouse/nuclearScale/index.scss
@@ -52,7 +52,15 @@
.bottom-button {
position: fixed;
bottom: 40rpx;
+ left: 45%;
+ width: calc(100% - 80rpx);
+ transform: translateX(-50%);
+}
+.bottom-button1 {
+ position: fixed;
+ bottom: 40rpx;
left: 50%;
width: calc(100% - 80rpx);
transform: translateX(-50%);
}
+
--
Gitblit v1.9.3