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 | 259 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 187 insertions(+), 72 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/createwriteoffform.vue b/pages/wareHouse/nuclearScale/createwriteoffform.vue
index a35a595..14963bf 100644
--- a/pages/wareHouse/nuclearScale/createwriteoffform.vue
+++ b/pages/wareHouse/nuclearScale/createwriteoffform.vue
@@ -13,7 +13,7 @@
</u-radio-group>
</u-form-item>
<u-form-item label="鏇挎崲浜岀淮鐮�" :border-bottom="false" prop="value1">
- <u-radio-group v-model="form.value0">
+ <u-radio-group v-model="form.value1">
<u-radio name="1">鏄�</u-radio>
<u-radio name="0">鍚�</u-radio>
</u-radio-group>
@@ -22,11 +22,15 @@
<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" style="width: 100%;text-align: right;"
+ <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>{{locNoNumIndex==null ? "璇烽�夋嫨":locNoList[locNoNumIndex].label}}</text>
+ <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>
@@ -35,21 +39,29 @@
<u-input v-model="form.value4" placeholder="" disabled />
</u-form-item>
<u-form-item label="鐢熶骇杞﹂棿" :border-bottom="false" prop="value5">
- <picker class="item-one" style="width: 100%;text-align: right;"
+ <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>{{locNoNumIndex==null ? "璇烽�夋嫨":locNoList[locNoNumIndex].label}}</text>
+ <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" style="width: 100%;text-align: right;"
+ <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>{{locNoNumIndex==null ? "璇烽�夋嫨":locNoList[locNoNumIndex].label}}</text>
+ <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>
@@ -58,21 +70,26 @@
<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>
+ <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="confirm"
- @cancel="cancel">
- <!-- <u-checkbox-group> -->
- <!-- <u-checkbox :name="item.name" v-for="(item, index) in checkboxList" :key="index" v-model="item.value"
- @change="changeCheckbox">
- {{ item.name }}
- </u-checkbox> -->
- <!-- </u-checkbox-group> -->
+ <!-- 鍙夎溅宸� -->
+ <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>
@@ -82,31 +99,36 @@
import content_bg from "@/static/custom/packing/backBg.png";
export default {
components: {
- modalBg
+ modalBg,
},
data() {
return {
- // checkboxList: [{
- // name: '宸ヤ汉1',
- // value: '1'
- // },
- // {
- // name: '宸ヤ汉2',
- // value: '2'
- // },
- // {
- // name: '宸ヤ汉3',
- // value: '3'
- // },
- // {
- // name: '宸ヤ汉4',
- // value: '4'
- // },
- // {
- // name: '宸ヤ汉5',
- // value: '5'
- // },
- // ],
+ 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",
@@ -120,7 +142,7 @@
value1: "",
value2: "",
value3: "",
- value4: "",
+ value4: "111",
value5: "",
value6: "",
value7: "",
@@ -129,86 +151,110 @@
rules: {
value0: [{
required: true,
- message: "璇烽�夋嫨杞﹂棿",
+ message: "璇烽�夋嫨浜у搧绫诲瀷",
trigger: ["change"],
}, ],
value1: [{
required: true,
- message: "璇烽�夋嫨鎶ュ伐鍗曞彿",
+ message: "璇烽�夋嫨鏄惁鏇挎崲浜岀淮鐮�",
trigger: ["change", "blur"],
}, ],
value2: [{
required: true,
- message: "璇烽�夋嫨宸ュ簭",
+ message: "璇疯緭鍏ヨ溅鐗屽彿",
trigger: ["change", "blur"],
}, ],
- value3: [{
+ // value3: [
+ // {
+ // required: true,
+ // message: "璇烽�夋嫨瀹㈡埛鍚嶇О",
+ // trigger: ["change", "blur"],
+ // },
+ // ],
+ value4: [{
required: true,
- message: "璇烽�夋嫨璁㈠崟鍙�",
- trigger: ["change", "blur"],
- }, ],
- value9: [{
- required: true,
- message: "璇烽�夋嫨鎶ュ伐绫诲瀷",
+ message: "璇疯緭鍏ュ彂璐ч�氱煡鍗曞彿",
trigger: ["change"],
}, ],
- value10: [{
+ value5: [{
required: true,
- message: "璇烽�夋嫨鎺ユ敹闆朵欢绫诲瀷",
+ message: "璇烽�夋嫨鐢熶骇杞﹂棿",
trigger: ["change"],
}, ],
- value11: [{
+ value6: [{
+ required: true,
+ message: "璇烽�夋嫨鍙哥鍛�",
+ trigger: ["change"],
+ }, ],
+ value7: [{
type: "array",
required: true,
- message: "璇疯嚦灏戦�夋嫨涓�涓墿鏂欏拰宸ュ簭閫夐」",
+ message: "璇疯嚦灏戦�夋嫨涓�涓弶杞﹀伐",
trigger: ["change"],
}, ],
},
locNoList: [{
value: "0",
- label: "鍏徃1"
+ label: "鍏徃1",
},
{
value: "1",
- label: "鍏徃2"
+ label: "鍏徃2",
},
{
value: "2",
- label: "鍏徃3"
+ label: "鍏徃3",
},
{
value: "3",
- label: "鍏徃4"
+ label: "鍏徃4",
},
{
value: "4",
- label: "鍏徃5"
+ label: "鍏徃5",
},
{
value: "5",
- label: "鍏徃6"
+ label: "鍏徃6",
},
],
- locNoNumIndex: 0,
- showModal:false
+ locNoNumIndex: null,
+ showModal: false,
+ selectedItems: [],
};
},
onReady() {
this.$refs.uForm.setRules(this.rules);
},
onShow() {},
- methods: {
- openForkliftDriverList() {
- this.showModal = true
- },
+ 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 = null;
+ return;
}
- this.locNoNumIndex = e.target.value
- this.registerInfo.locNo = storage[this.locNoNumIndex].label
- console.log('locNoNumIndex', this.registerInfo.locNo)
+ this.locNoNumIndex = e.target.value;
+ this.form.value3 = storage[this.locNoNumIndex].label;
},
// 鎵撳紑寮规--鍚庨潰杩橀渶瑕佺洃鍚壂鐮佹灙鎵爜缁撴灉锛岃祴鍊肩粰鎶ュ伐鍗曞彿瀛楁锛岀劧鍚庢墦寮�寮规閫夋嫨璁㈠崟鍙风瓑鎿嶄綔
lpn() {
@@ -221,12 +267,81 @@
},
// 鎻愪氦鎸夐挳
submit() {
- this.show = true;
+ if (!this.$refs.uForm.validate()) {
+ console.log("1111");
+ return;
+ }
+ if (this.form.value3 === "") {
+ uni.showToast({
+ title: "璇峰厛閫夋嫨瀹㈡埛鍚嶇О",
+ icon: "none",
+ });
+ return;
+ }
},
},
};
</script>
-<style lang="scss">
+<style lang="scss" scoped>
@import "index.scss";
+
+ /* 寮圭獥鏍峰紡 */
+ .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;
+ }
+
+ .title {
+ font-size: 32rpx;
+ font-weight: bold;
+ }
+
+ .confirm-btn {
+ color: #007aff;
+ font-size: 28rpx;
+ }
+
+ /* 澶嶉�夋鏍峰紡 */
+ .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 .label {
+ margin-left: 20rpx;
+ }
+
+ .item-one {
+ font-size: 30rpx;
+ color: #0c0c0c;
+ margin-right: 6rpx;
+ }
+
+ .item-two {
+ font-size: 30rpx;
+ color: #a5abb4;
+ margin-right: 6rpx;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3