From c6be1567e2613ce0fe1262375ac7e3e49aa5964a Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 10 十一月 2025 13:51:16 +0800
Subject: [PATCH] app装箱拆箱,小卫组托

---
 pages/zutuo_xiaowei/form_xiaowei.vue   |  920 +++++++++++++++++++++++
 pages/chaixiang/form.vue               |  632 ++++++++++++++++
 pages.json                             |   18 
 pages/index/login.vue                  |    2 
 pages/zhuangxiang/form_mix.vue         |  729 ++++++++++++++++++
 pages/fenbushidiaochudan/table_out.vue |    6 
 pages/index/index.vue                  |   20 
 7 files changed, 2,323 insertions(+), 4 deletions(-)

diff --git a/pages.json b/pages.json
index 0922c92..58b1c80 100644
--- a/pages.json
+++ b/pages.json
@@ -1221,6 +1221,24 @@
 			"style": {
 				"navigationBarTitleText": "妯″叿鏁呴殰鐧昏鍗�"
 			}
+		},
+		{
+			"path": "pages/chaixiang/form",
+			"style": {
+				"navigationBarTitleText": "鎷嗙"
+			}
+		},
+		{
+			"path": "pages/zhuangxiang/form_mix",
+			"style": {
+				"navigationBarTitleText": "瑁呯"
+			}
+		},
+		{
+			"path": "pages/zutuo_xiaowei/form_xiaowei",
+			"style": {
+				"navigationBarTitleText": "缁勬墭-灏忓崼"
+			}
 		}
 	],
 	"tabBar": {
diff --git a/pages/chaixiang/form.vue b/pages/chaixiang/form.vue
new file mode 100644
index 0000000..43265ce
--- /dev/null
+++ b/pages/chaixiang/form.vue
@@ -0,0 +1,632 @@
+<template>
+    <view class="form">
+        <view class="form-base-info">
+            <view class="form-item">
+                <view class="title">绠辨潯鐮�</view>
+                <view class="right">
+                    <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack" @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
+                </view>
+                <view class="right-icon">
+                    <uni-icons class="right-icon" type="scan"
+                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+                        @click="toScanCode"></uni-icons>
+                </view>
+            </view>
+        </view>
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view>
+        </view>
+        <!-- 鎷嗙淇℃伅 -->
+        <view v-if="tabs == 0">
+            <zb-table id="list-table" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+                :show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
+                @toggleAllSelection="handleSelectAll" />
+        </view>
+        <!-- 鍗曟嵁淇℃伅 -->
+        <view v-if="tabs == 1">
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" v-model="hform.HDate">
+                            <input type="text" v-model="hform.HDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HMaker" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HBillNo" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">缁勭粐</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="bottom-btn" id="bottom-btn">
+            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎷嗙</button>
+            <view style="flex: 1;"></view>
+            <!-- <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button> -->
+            <button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import dayjs from 'dayjs'
+    import {
+        getUserInfo
+    } from "../../utils/auth";
+    import {
+        CommonUtils
+    } from "@/utils/common.js"
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    export default {
+        data() {
+            return {
+                EnableSubmit: true,
+                // 璁$畻鍒楄〃楂樺害
+                bottomBtnTop: 0,
+                listTableTop: 0,
+                // 鍏叡鍙橀噺 
+                HBarCodePackFocus: false,
+                HBarCodeFocus: false,
+                HBarCode_Pack: '', //绠辨潯鐮�
+                HBarCode: '', // 鍖呮潯鐮�
+                tabs: 0,
+                HBillType: '3783',
+                HBillSubType: '1', //瀛愮被鍨嬶紙1鎷嗙銆�2鎷嗘墭锛�
+                OperationType: 1, //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+                listOption: [],
+                listData: [],
+                columns: [
+                    {
+                        name: 'index',
+                        label: '搴忓彿',
+                        width: 60,
+                        hidden: true,
+                    },
+                    {
+                        name: '鏉$爜缂栧彿',
+                        label: '鏉$爜缂栧彿',
+                        width: 100,
+                    },
+                    {
+                        name: '鏁伴噺',
+                        label: '鏁伴噺',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡浠g爜',
+                        label: '鐗╂枡浠g爜',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡鍚嶇О',
+                        label: '鐗╂枡鍚嶇О',
+                        width: 100,
+                    },
+                    {
+                        name: '鏉$爜涓暟',
+                        label: '鏉$爜涓暟',
+                        width: 100,
+                    }
+                ],
+                selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
+                HModName: "Sc_UnPackUnionBill_Packing_PDA",
+                ModRightName: "CE_UnPackUnionBill_Packing", //妯″潡鏉冮檺鍙傛暟
+                titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
+                OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HBarCode_Pack_Temp: "", //浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+
+                // 琛ㄥ崟鎻愪氦鍊�
+                hform: {
+                    HDate: dayjs(new Date()).format('YYYY-MM-DD'),
+                    HMaker: getUserInfo()['Czymc'],
+                    HBillNo: '',
+                    HInterID: '',
+                    HStockOrgName: uni.getStorageSync("Organization"),
+                    HStockOrgID: uni.getStorageSync("OrganizationID"),
+                },
+                // 鍒嗛〉妯″潡鍏冩暟鎹�
+                paginationMeta: {
+
+                }
+            }
+        },
+        methods: {
+            async HBarCodeFocusRefresh(){
+              this.HBarCode = ''
+              this.HBarCodeFocus = false
+              await this.$nextTick()
+              this.HBarCodeFocus = true
+            },
+            async HBarCodePackFocusRefresh(){
+              this.HBarCode_Pack = ''
+              this.HBarCodePackFocus = false
+              await this.$nextTick()
+              this.HBarCodePackFocus = true
+            },
+            toScanCode() {
+                MpaasScan.scanCode((scanCode) => {
+                    this.HBarCode_Pack = scanCode
+                    this.GetMeesageByBarCode_Pack(HBarCode_Pack)
+                })
+            },
+            GetMeesageByBarCode_Pack(HBarCode) {
+                // 鑾峰彇鍖呮潯鐮佸搴旂殑鏁版嵁 
+                let HBarCode_Pack = this.HBarCode_Pack
+                let sOldBarCode = this.HBarCode_Pack
+                let HDeleteFlag = sOldBarCode.substring(0, 1)
+                let sBarCode = sOldBarCode.slice(1)
+                if (!HBarCode_Pack) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '绠辨潯鐮佷负绌猴紝璇峰厛鎵弿绠辨潯鐮�',
+                    })
+                }
+
+                if (HDeleteFlag == '*') {
+                    if (!sBarCode) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勭鏉$爜',
+                        })
+                    } else {
+                        this.HBarCodeFocusRefresh()
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                        data: {
+                            "HInterID": this.hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": this.HBillType
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+                                this.DisBillEntryList()
+                            } else {
+                                CommonUtils.playSound(0)
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+                        }
+                    })
+                } else {
+                    let sBarCode_b = this.HBarCode_Pack
+                    if (!sBarCode_b) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '绠辨潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忕鏉$爜',
+                        })
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/Get_PackBarCode_UnPackUnionBill_Json',
+                        data: {
+                            
+                            "HBarCode_Pack": sBarCode_b,
+                            "HBillSubType": this.HBillSubType
+                            //"HBarCode_Pack": HBarCode_Pack,
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+                                //this.HBarCodeFocusRefresh()
+								this.hform.HInterID=data[0].HInterID
+								this.hform.HBillNo=data[0].HBillNo
+                                this.listData = []
+								var codeLength=data.length
+                                for (let i = 0; i < codeLength; i++) {
+                                    this.listData.push(Object.assign(data[i], {
+                                        index: i
+                                    }))
+                                }
+                            } else {
+                                CommonUtils.playSound(0)
+                                this.HBarCodeFocusRefresh()
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+							console.log(sBarCode_b)
+                        }
+                    })
+                }
+            },
+            DisBillEntryList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/Get_PackBarCode_UnPackUnionBill_Json',
+                    data: {
+                        "HInterID": this.hform.HInterID,
+                        "HBillNo": this.hform.HBillNo
+                        //"HBillType": this.HBillType
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.listData = []
+                            for (let i = 0; i < data.length; i++) {
+                                this.listData.push(Object.assign(data[i], {
+                                    index: i
+                                }))
+                            }
+                        } else {
+                            // 娌℃湁浠讳綍璁板綍瑙嗕负浠�0寮�濮嬫柊澧�
+                            this.listData = []
+                        }
+                    }
+                })
+            },
+            handleSelect(selected, array) {
+                this.selectedRows = array
+            },
+            handleSelectAll(selected, array) {
+                this.selectedRows = array
+            },
+            getMaxNo() {
+                CommonUtils.doRequest2({
+                    url: "/WEBSController/GetMaxBillNoAndID_Json",
+                    data: {
+                        "HBillType": this.HBillType
+                    },
+                    resFunction: (d) => {
+                        console.log('d: ', d);
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = d.data
+                        if (count == 1) {
+                            this.hform.HInterID = data[0].HInterID;
+                            this.hform.HBillNo = data[0].HBillNo
+                        } else {
+
+                            uni.showModal({
+                                title: "娓╅Θ鎻愮ず",
+                                showCancel: false,
+                                content: Message
+
+                            })
+
+                        }
+                    }
+                })
+            },
+            submitPreCheck() {
+                if (CommonUtils.isEmpty(this.hform.HInterID)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+                    })
+                    return false
+                }
+                if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+                    })
+                    return false
+                }
+                if (this.listData.length < 1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+                    })
+                    return false
+                }
+                return true
+            },
+            cmdDelete() {
+                console.log('this.selectedRows: ', this.selectedRows);
+                if (this.selectedRows.length != 1) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+                    })
+                }
+                uni.showModal({
+                    title: '鍒犻櫎纭',
+                    content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+                    success: () => {
+                        if (confirm) {
+                            CommonUtils.doRequest2({
+                                url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HBillType: this.HBillType,
+                                    HBarCode: this.selectedRows[0].HBarCode
+                                },
+                                resFunction: (res) => {
+                                    let {
+                                        data,
+                                        count,
+                                        Message
+                                    } = res.data
+                                    if (count == 1) {
+                                        CommonUtils.playSound(1)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                        this.DisBillEntryList()
+                                    } else {
+                                        CommonUtils.playSound(0)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            },
+            cmdSubmit() {
+                let checkRes = this.submitPreCheck()
+                if (!checkRes) {
+                    return
+                }
+                this.EnableSubmit = false
+				console.log(this.hform.HInterID)
+				console.log(this.hform.HBillNo)
+				console.log(this.HBarCode_Pack)
+				console.log(this.hform.HMaker)
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/set_SaveUnPackUnionBill_Json',
+                    data: {
+                        "HInterID": this.hform.HInterID,
+                        "HBillNo": this.hform.HBillNo,
+                        "HBarCode_Pack": this.HBarCode_Pack,
+                        "HMaker": this.hform.HMaker,
+                    },
+                    resFunction: (res) => {
+                        let {data, count, Message} = res.data
+                        if(count == 1){
+                            uni.showModal({
+                                title: '娓╅Θ鎻愮ず',
+                                content: Message,
+                                confirmText: "鏂板",
+                                cancelText: '鍏抽棴',
+                                success: ({confirm,cancel}) => {
+                                    if(confirm) {
+                                        uni.redirectTo({
+                                            url: "/pages/chaixiang/form"
+                                        })
+                                    }
+                                    
+                                    if(cancel) {
+                                        uni.navigateBack()
+                                    }
+                                }
+                            })
+                        }else {
+                            uni.showToast({
+                                icon:'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            cmdExit() {
+                uni.navigateBack()
+            }
+        },
+        computed: {
+            listTableHeight: {
+                get() {
+                    return this.bottomBtnTop - this.listTableTop - 10
+                }
+            }
+        },
+        async onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#bottom-btn")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.bottomBtnTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#bottom-btn鑺傜偣");
+                    }
+                })
+                .exec();
+            query.select("#list-table")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.listTableTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#list-table鑺傜偣");
+                    }
+                })
+                .exec();
+            // #endif
+        },
+        onLoad(e) {
+            this.OperationType = e.OperationType || 1
+            this.HBarCode_Pack_Temp = e.CommonUtils || ""
+
+            if (this.OperationType == 1) {
+                this.getMaxNo()
+            } else if (this.OperationType == 2) {
+
+            }
+            
+            this.HBarCodePackFocusRefresh()
+        }
+    }
+</script>
+
+<style lang="scss">
+    input {
+        width: inherit;
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+    }
+
+    .form {
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+
+        .form-base-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 30rpx;
+        }
+
+        .bill-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 16rpx 30rpx;
+        }
+
+        .form-item {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+
+            .title {
+                width: 5rem;
+                flex-shrink: 0;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+
+            .right-icon {
+                flex-shrink: 0;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+
+        }
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+    
+</style>
\ No newline at end of file
diff --git a/pages/fenbushidiaochudan/table_out.vue b/pages/fenbushidiaochudan/table_out.vue
index 5319e1a..5b3e9a8 100644
--- a/pages/fenbushidiaochudan/table_out.vue
+++ b/pages/fenbushidiaochudan/table_out.vue
@@ -124,11 +124,11 @@
                 serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                 tabs: 0,
                 urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
-                MvarReportTitle: '鐢熶骇棰嗘枡鍗曠紦瀛樺垪琛�',
+                MvarReportTitle: '鍒嗗竷寮忚皟鍑哄崟缂撳瓨鍒楄〃',
                 hform: {
                     HBillNo: '',
                     HSourceBillNo: '',
-                    HBillType: 1207,
+                    HBillType: 1250,
                     HMaker: uni.getStorageSync('HUserName'),
                     HStockOrgID: uni.getStorageSync('OrganizationID'),
                 },
@@ -268,7 +268,7 @@
                 this.hform = {
                     HBillNo: '',
                     HSourceBillNo: '',
-                    HBillType: 1207,
+                    HBillType: 1250,
                     HMaker: uni.getStorageSync('HUserName'),
                     HStockOrgID: uni.getStorageSync('OrganizationID'),
                 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3345b40..6528138 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -267,6 +267,26 @@
 						id: 29,
 						hidden: false,
 					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '鎷嗙',
+						url: '/pages/chaixiang/form',
+						id: 30,
+						hidden: false,
+					},{
+						img: '../../static/icon/icon16.png',
+						text: '瑁呯',
+						url: '/pages/zhuangxiang/form_mix',
+						id: 31,
+						hidden: false,
+					},
+					{
+						img: '../../static/icon/icon16.png',
+						text: '缁勬墭-灏忓崼',
+						url: '/pages/zutuo_xiaowei/form_xiaowei',
+						id: 32,
+						hidden: false,
+					},
 
 
                 ],
diff --git a/pages/index/login.vue b/pages/index/login.vue
index a0ad400..a9dbb10 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -85,7 +85,7 @@
                     "娓╁窞娴疯瘹鍏夊": 'http://122.228.39.234:7177/API/',
                     "瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
                     "浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
- 					//"llj": 'http://localhost:8082/LuBaoAPI/',
+ 					"鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
 					"鑻忓窞鍗櫤绉戞妧": 'http://221.224.60.42:8082/API_WW/',
 					"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
 					"闄堥晲鍝叉湰鍦版祴璇�": 'http://localhost:81/API/',
diff --git a/pages/zhuangxiang/form_mix.vue b/pages/zhuangxiang/form_mix.vue
new file mode 100644
index 0000000..ed803ca
--- /dev/null
+++ b/pages/zhuangxiang/form_mix.vue
@@ -0,0 +1,729 @@
+<template>
+    <view class="form">
+        <view class="form-base-info">
+            <view class="form-item">
+                <view class="title">绠辨潯鐮�</view>
+                <view class="right">
+                    <input type="text" :focus="HBarCodePackFocus" v-model="HBarCode_Pack"
+                        @confirm="GetMeesageByBarCode_Pack(HBarCode_Pack)" />
+                </view>
+                <view class="right-icon">
+                    <uni-icons class="right-icon" :class="[EnableScanBarCodePack?'disabled':'']"  type="scan"
+                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+                        @click="toScanCode"></uni-icons>
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">鍖呮潯鐮�</view>
+                <view class="right">
+                    <input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+                        @confirm="GetMeesageByBarCode(HBarCode)" />
+                </view>
+                <view class="right-icon">
+                    <uni-icons type="scan"
+                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+                        @click="toScanCode2"></uni-icons>
+                </view>
+            </view>
+        </view>
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view>
+        </view>
+        <!-- 瑁呯淇℃伅 -->
+        <view v-if="tabs == 0">
+            <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+                :show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
+                @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
+        </view>
+        <!-- 鍗曟嵁淇℃伅 -->
+        <view v-if="tabs == 1">
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" v-model="hform.HDate">
+                            <input type="text" v-model="hform.HDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HMaker" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HBillNo" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">缁勭粐</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <checkbox-group @change="checkboxGroupChangeHandler">
+                <view class="form-item" style="justify-content: right;">
+                    <view class="title">璐ㄩ噺瀹℃壒</view>
+                    <checkbox value="qualityApproval"></checkbox>
+                </view>
+                </checkbox-group>
+            </view>
+        </view>
+        <view class="bottom-btn" id="bottom-btn">
+            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button>
+            <button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+        </view>
+    </view>
+</template>
+
+<script>
+    import dayjs from 'dayjs'
+    import {
+        getUserInfo
+    } from "../../utils/auth";
+    import {
+        CommonUtils
+    } from "@/utils/common.js"
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    export default {
+        data() {
+            return {
+                // 璁$畻鍒楄〃楂樺害
+                bottomBtnTop: 0,
+                listTableTop: 0,
+                // 鍏叡鍙橀噺 
+                EnableScanBarCodePack: true,
+                EnableSubmit: true,
+                HBarCodePackFocus: false,
+                HBarCodeFocus: false,
+                HBarCode_Pack: '', //绠辨潯鐮�
+                HBarCode: '', // 鍖呮潯鐮�
+                tabs: 0,
+                HBillType: '3783',
+                HBillSubType: '1', //瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+                OperationType: 1, //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+                listOption: [],
+                listData: [],
+                columns: [{
+                        type: 'selection',
+                        fixed: true,
+                        width: 50
+                    },
+                    {
+                        name: 'index',
+                        label: '搴忓彿',
+                        width: 60,
+                        hidden: true
+                    },
+                    {
+                        name: '鏉$爜缂栧彿',
+                        label: '鏉$爜缂栧彿',
+                        width: 100,
+                    },
+                    {
+                        name: '鏁伴噺',
+                        label: '鏁伴噺',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡浠g爜',
+                        label: '鐗╂枡浠g爜',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡鍚嶇О',
+                        label: '鐗╂枡鍚嶇О',
+                        width: 100,
+                    },
+                    {
+                        name: '鏉$爜涓暟',
+                        label: '鏉$爜涓暟',
+                        width: 100,
+                    }
+                ],
+                selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
+                HModName: "Sc_PackUnionBill_Packing_PDA",
+                ModRightName: "CE_PackUnionBill_Packing", //妯″潡鏉冮檺鍙傛暟
+                titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
+                OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HBarCode_Pack_Temp: "", //浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+
+                // 琛ㄥ崟鎻愪氦鍊�
+                hform: {
+                    HDate: dayjs(new Date()).format('YYYY-MM-DD'),
+                    HMaker: getUserInfo()['Czymc'],
+                    HBillNo: '',
+                    HInterID: '',
+                    HStockOrgName: uni.getStorageSync("Organization"),
+                    HStockOrgID: uni.getStorageSync("OrganizationID"),
+                
+                    HQualityApproval: false,
+                },
+                // 鍒嗛〉妯″潡鍏冩暟鎹�
+                paginationMeta: {
+
+                }
+            }
+        },
+        methods: {
+            checkboxGroupChangeHandler(e) {
+                let checkBoxValues = Array.from(e.detail.value)
+                if(checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
+                    this.hform.HQualityApproval = true
+                }else {
+                    this.hform.HQualityApproval = false
+                }
+            },
+            onTableRowClickHandler(row, index) {
+                console.log('row: ',row);
+                if(!this.listData[index].checked){
+                    this.$set(this.listData[index], 'checked', true)
+                }else {
+                    this.listData[index].checked = !this.listData[index].checked
+                }
+            },
+            async HBarCodeFocusRefresh() {
+                this.HBarCode = ''
+                this.HBarCodeFocus = false
+                await this.$nextTick()
+                this.HBarCodeFocus = true
+            },
+            async HBarCodePackFocusRefresh() {
+                this.HBarCode_Pack = ''
+                this.HBarCodePackFocus = false
+                await this.$nextTick()
+                this.HBarCodePackFocus = true
+            },
+            toScanCode() {
+                MpaasScan.scanCode((scanCode) => {
+                    this.HBarCode_Pack = scanCode
+                    this.GetMeesageByBarCode_Pack(HBarCode_Pack)
+                })
+            },
+            GetMeesageByBarCode_Pack(HBarCode_Pack) {
+                // 鑾峰彇绠辨潯鐮佸搴旂殑鏁版嵁
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/Get_PackBarCode_PackUnionBill_New_Json',
+                    data: {
+                        HInterID: this.hform.HInterID || 0,
+                        HBillNo: this.hform.HBillNo,
+                        HBillType: this.HBillType,
+						HBillSubType:this.HBillSubType,
+                        HBarCode_Pack: this.HBarCode_Pack
+                        // HMaker: getUserInfo()['Czymc'],
+                        // HStockOrgID: uni.getStorageSync('OrganizationID')
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message,
+                            list
+                        } = res.data
+                        if (count == 1) {
+                            CommonUtils.playSound(1)
+                            this.hform.HBillNo = data[0].HBillNo
+                            this.hform.HInterID = data[0].HInterID
+                            this.HMaterNumber_Pack = data[0].HMaterNumber
+                            this.DisBillEntryList();
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        } else {
+                            CommonUtils.playSound(0)
+                            this.HBarCodePackFocusRefresh()
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            toScanCode2() {
+                MpaasScan.scanCode((scanCode) => {
+                    this.HBarCode = scanCode
+                    GetMeesageByBarCode(scanCode)
+                })
+            },
+            GetMeesageByBarCode(HBarCode) {
+                // 鑾峰彇寰呯粍鎵樻潯鐮佸搴旂殑鏁版嵁 
+                let HBarCode_Pack = this.HBarCode_Pack
+                let sOldBarCode = this.HBarCode
+                let HDeleteFlag = sOldBarCode.substring(0, 1)
+                let sBarCode = sOldBarCode.slice(1)
+                if (!HBarCode_Pack) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '鍖呮潯鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鍖呮潯鐮侊紒',
+                    })
+                }
+
+                if (HDeleteFlag == '*') {
+                    if (!sBarCode) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                        })
+                    } else {
+                        this.HBarCodeFocusRefresh()
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                        data: {
+                            "HInterID": this.hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": this.HBillType
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+                                this.DisBillEntryList()
+                            } else {
+                                CommonUtils.playSound(0)
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+                        }
+                    })
+                } else {
+                    let sBarCode = this.HBarCode
+                    if (!sBarCode) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�',
+                        })
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/Get_BarCode_PackUnionBill_New_Json',
+                        data: {
+                            "HInterID": this.hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": this.HBillType,
+                            "HBillNo": this.hform.HBillNo,
+							"HBillSubType":this.HBillSubType,
+                            "HBarCode_Pack": HBarCode_Pack,
+                            "HMaker": this.hform.HMaker,
+                            "HStockOrgID": this.hform.HStockOrgID,
+							"HMaterNumber_Pack":this.HMaterNumber_Pack
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+                                this.HBarCodeFocusRefresh()
+                                this.DisBillEntryList()
+                            } else {
+                                CommonUtils.playSound(0)
+                                this.HBarCodeFocusRefresh()
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+                        }
+                    })
+                }
+            },
+            DisBillEntryList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+                    data: {
+                        "HInterID": this.hform.HInterID,
+                        "HBillNo": this.hform.HBillNo,
+                        "HBillType": this.HBillType
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.listData = []
+                            for (let i = 0; i < data.length; i++) {
+                                this.listData.push(Object.assign(data[i], {
+                                    index: i
+                                }))
+                            }
+                        } else {
+                            // 娌℃湁浠讳綍璁板綍瑙嗕负浠�0寮�濮嬫柊澧�
+                            this.listData = []
+                        }
+                    }
+                })
+            },
+            handleSelect(selected, array) {
+                this.selectedRows = array
+            },
+            handleSelectAll(selected, array) {
+                this.selectedRows = array
+            },
+            getMaxNo() {
+                CommonUtils.doRequest2({
+                    url: "/WEBSController/GetMaxBillNoAndID_Json",
+                    data: {
+                        "HBillType": this.HBillType
+                    },
+                    resFunction: (d) => {
+                        console.log('d: ', d);
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = d.data
+                        if (count == 1) {
+                            this.hform.HInterID = data[0].HInterID;
+                            this.hform.HBillNo = data[0].HBillNo
+                        } else {
+
+                            uni.showModal({
+                                title: "娓╅Θ鎻愮ず",
+                                showCancel: false,
+                                content: Message
+
+                            })
+
+                        }
+                    }
+                })
+            },
+            submitPreCheck() {
+                if (CommonUtils.isEmpty(this.hform.HInterID)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+                    })
+                    return false
+                }
+                if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+                    })
+                    return false
+                }
+                if (this.listData.length < 1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+                    })
+                    return false
+                }
+                return true
+            },
+            cmdDelete() {
+                console.log('this.selectedRows: ', this.selectedRows);
+                if (this.selectedRows.length != 1) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+                    })
+                }
+                uni.showModal({
+                    title: '鍒犻櫎纭',
+                    content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+                    success: () => {
+                        if (confirm) {
+                            CommonUtils.doRequest2({
+                                url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HBillType: this.HBillType,
+                                    HBarCode: this.selectedRows[0].HBarCode
+                                },
+                                resFunction: (res) => {
+                                    let {
+                                        data,
+                                        count,
+                                        Message
+                                    } = res.data
+                                    if (count == 1) {
+                                        CommonUtils.playSound(1)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                        this.DisBillEntryList()
+                                    } else {
+                                        CommonUtils.playSound(0)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            },
+            cmdSubmit() {
+                let checkRes = this.submitPreCheck()
+                if (!checkRes) {
+                    return
+                }
+                this.EnableSubmit = false
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/set_SavePackUnionBill_Json',
+                    data: {
+                        "HInterID": this.hform.HInterID,
+                        "HBillType": this.HBillType,
+                        "HBillNo": this.hform.HBillNo,
+                        "HBarCode_Pack": this.HBarCode_Pack,
+                        "HMaker": this.hform.HMaker,
+                        "HStockOrgID": this.hform.HStockOrgID
+                    },
+                    resFunction: (res) => {
+                        let {
+                            data,
+                            count,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            uni.showModal({
+                                title: '娓╅Θ鎻愮ず',
+                                content: Message,
+                                confirmText: "鏂板",
+                                cancelText: '鍏抽棴',
+                                success: ({
+                                    confirm,
+                                    cancel
+                                }) => {
+                                    if (confirm) {
+                                        uni.redirectTo({
+                                            url: "/pages/zutuosaoma/form"
+                                        })
+                                    }
+
+                                    if (cancel) {
+                                        uni.navigateBack()
+                                    }
+                                }
+                            })
+                        } else {
+                            uni.showToast({
+                                icon: 'none',
+                                title: Message
+                            })
+                        }
+                    }
+                })
+            },
+            cmdExit() {
+                uni.navigateBack()
+            }
+        },
+        computed: {
+            listTableHeight: {
+                get() {
+                    return this.bottomBtnTop - this.listTableTop - 10
+                }
+            }
+        },
+        async onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#bottom-btn")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.bottomBtnTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#bottom-btn鑺傜偣");
+                    }
+                })
+                .exec();
+            query.select("#list-table")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.listTableTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#list-table鑺傜偣");
+                    }
+                })
+                .exec();
+            // #endif
+        },
+        onLoad(e) {
+            // 1涓� 瑁呯 2涓� 缁勬墭
+            this.BarCodeType = e.BarCodeType || 1
+            this.OperationType = e.OperationType || 1
+            this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
+
+            if (this.OperationType == 1) {
+                this.getMaxNo()
+            } else if (this.OperationType == 2) {
+                this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
+                this.DisBillEntryList()
+                this.tabs = 0
+            }
+
+
+            // 鍏夋爣榛樿鑱氱劍鍦ㄦ墭鏉$爜涓�
+            this.HBarCodePackFocusRefresh()
+        }
+    }
+</script>
+
+<style lang="scss">
+    input {
+        width: inherit;
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+    }
+
+    .form {
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+
+        .form-base-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 30rpx;
+        }
+
+        .bill-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 16rpx 30rpx;
+        }
+
+        .form-item {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+
+            .title {
+                width: 5rem;
+                flex-shrink: 0;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+
+            .right-icon {
+                flex-shrink: 0;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+
+        }
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/zutuo_xiaowei/form_xiaowei.vue b/pages/zutuo_xiaowei/form_xiaowei.vue
new file mode 100644
index 0000000..08b7514
--- /dev/null
+++ b/pages/zutuo_xiaowei/form_xiaowei.vue
@@ -0,0 +1,920 @@
+<template>
+    <view class="form">
+        <view class="form-base-info">
+            <view class="form-item">
+                <view class="title">鏉$爜</view>
+                <view class="right">
+                    <input type="text" :focus="HBarCodeFocus" v-model="HBarCode"
+                        @confirm="GetMeesageByBarCode(HBarCode)" />
+                </view>
+                <view class="right-icon">
+                    <uni-icons type="scan"
+                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20"
+                        @click="toScanCode2"></uni-icons>
+                </view>
+            </view>
+        </view>
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">瑁呯淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view>
+            <!-- 鍒犻櫎杩欒澶氫綑鐨勪唬鐮� -->
+            <!-- <view :class="tabs == 'closeResultTable' ? 'on':''" @tap="tabs = 1">鍗曟嵁淇℃伅</view> -->
+        </view>
+        <!-- 瑁呯淇℃伅 -->
+        <view v-if="tabs == 0">
+            <zb-table id="list-table" :checked-highlight="true" :fit="true" :style="{height: `${listTableHeight}px`}" :columns="columns" :data="listData"
+                :show-header="true" :border="true" :row-key="row => row.index" @toggleRowSelection="handleSelect"
+                @toggleAllSelection="handleSelectAll" @rowClick="onTableRowClickHandler" />
+        </view>
+        <!-- 鍗曟嵁淇℃伅 -->
+        <view v-if="tabs == 1">
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" v-model="hform.HDate">
+                            <input type="text" v-model="hform.HDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍒跺崟浜�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HMaker" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HBillNo" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">鍗曟嵁ID</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HInterID" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <view class="form-item">
+                    <view class="title">缁勭粐</view>
+                    <view class="right disabled">
+                        <input type="text" disabled :value="hform.HStockOrgName" />
+                    </view>
+                </view>
+            </view>
+            <view class="bill-info">
+                <checkbox-group @change="checkboxGroupChangeHandler">
+                <view class="form-item" style="justify-content: right;">
+                    <view class="title">璐ㄩ噺瀹℃壒</view>
+                    <checkbox value="qualityApproval"></checkbox>
+                </view>
+                </checkbox-group>
+            </view>
+        </view>
+        <view class="bottom-btn" id="bottom-btn">
+            <button :class="EnableSubmit?'btn-a':'btn-c'" :disabled="!EnableSubmit" size="mini" @tap="cmdSubmit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-d" size="mini" @tap="cmdDelete">鍒犻櫎</button>
+            <button class="btn-c" size="mini" @tap="cmdExit">閫�鍑�</button>
+        </view>
+
+        <view v-if="showResultTable" class="result-modal">
+            <view class="modal-mask" @tap="closeResultTable"></view>
+            <view class="modal-content">
+                <view class="modal-header">
+                    <text class="modal-title">瑁呯缁撴灉</text>
+                    <uni-icons type="close" size="20" @tap="closeResultTable"></uni-icons>
+                </view>
+                <view class="modal-body">
+                    <zb-table 
+                        :fit="true" 
+                        :style="{height: '400px'}" 
+                        :columns="resultTableColumns" 
+                        :data="resultTableData"
+                        :show-header="true" 
+                        :border="true" 
+                        :row-key="row => row.index" />
+                </view>
+                <view class="modal-footer">
+                    <button class="btn-a" size="mini" @tap="toAddNew">鏂板</button>
+                    <view style="flex: 1;"></view>
+                    <button class="btn-c" size="mini" @tap="closeResultTable">鍏抽棴</button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    import dayjs from 'dayjs'
+    import {
+        getUserInfo
+    } from "../../utils/auth";
+    import {
+        CommonUtils
+    } from "@/utils/common.js"
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+import getdateTime from '../../utils/getdateTime';
+    export default {
+        data() {
+            return {
+                // 璁$畻鍒楄〃楂樺害
+                bottomBtnTop: 0,
+                listTableTop: 0,
+                // 鍏叡鍙橀噺 
+                EnableScanBarCodePack: true,
+                EnableSubmit: true,
+                HBarCodePackFocus: false,
+                HBarCodeFocus: false,
+                HBarCode_Pack: '', //绠辨潯鐮�
+                HBarCode: '', // 鍖呮潯鐮�
+                tabs: 0,
+                HBillType: '3783',
+                HBillSubType: '1', //瀛愮被鍨嬶紙1瑁呯銆�2缁勬墭锛�
+                OperationType: 1, //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HMaterNumber_Pack: "", //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+                listOption: [],
+                listData: [],
+                columns: [{
+                        type: 'selection',
+                        fixed: true,
+                        width: 50
+                    },
+                    {
+                        name: 'index',
+                        label: '搴忓彿',
+                        width: 60,
+                        hidden: true
+                    },
+                    {
+                        name: '鏉$爜缂栧彿',
+                        label: '鏉$爜缂栧彿',
+                        width: 100,
+                    },
+                    {
+                        name: '鏁伴噺',
+                        label: '鏁伴噺',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡浠g爜',
+                        label: '鐗╂枡浠g爜',
+                        width: 100,
+                    },
+                    {
+                        name: '鐗╂枡鍚嶇О',
+                        label: '鐗╂枡鍚嶇О',
+                        width: 100,
+                    },
+                    {
+                        name: '鏉$爜涓暟',
+                        label: '鏉$爜涓暟',
+                        width: 100,
+                    }
+                ],
+                selectedRows: [], // 瀛樺偍閫変腑鐨勬暟鎹�
+                HModName: "Sc_PackUnionBill_Packing_PDA",
+                ModRightName: "CE_PackUnionBill_Packing", //妯″潡鏉冮檺鍙傛暟
+                titleData: [], //涓嶉渶瑕佹樉绀虹殑瀛楁
+                OperationType: 1, //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+                HBarCode_Pack_Temp: "", //浠庣紦瀛樺垪琛ㄤ腑杩斿洖绠辨潯鐮�
+				
+				//灞曠ず琛ㄥ崟
+				showResultTable: false, // 鎺у埗缁撴灉琛ㄦ牸鏄剧ず
+				    resultTableData: [], // 缁撴灉琛ㄦ牸鏁版嵁
+				    resultTableColumns: [
+				      {
+				        name: '鏍堟澘鐮�',
+				        label: '鏍堟澘鐮�',
+				        width: 120,
+				      },
+				      {
+				        name: '涓鐮�',
+				        label: '涓鐮�',
+				        width: 120,
+				      },
+				      {
+				        name: '鏃ユ湡',
+				        label: '鏃ユ湡',
+				        width: 100,
+				      },
+				      {
+				        name: '鐗╂枡',
+				        label: '鐗╂枡',
+				        width: 100,
+				      }
+				    ],
+				//
+
+                // 琛ㄥ崟鎻愪氦鍊�
+                hform: {
+                    HDate: dayjs(new Date()).format('YYYY-MM-DD'),
+                    HMaker: getUserInfo()['Czymc'],
+                    HInterID: '',
+                    HStockOrgName: uni.getStorageSync("Organization"),
+                    HStockOrgID: uni.getStorageSync("OrganizationID"),
+                
+                    HQualityApproval: false,
+					
+					HMainID:'',
+					HSubID:'',
+					HSourceBillSEQ:'',
+					HBillNo:'',
+					HMaterNumber:'',
+					HMaterID:'',
+					HMaterName:'',
+					HMaterModel:'',
+					HCusModel:'',
+					HCusMaterName:'',
+					HEmpID:getUserInfo()['Czybm'],
+					HEmpNumber:uni.getStorageSync("HEmpNumber"),
+					HEmpName:getUserInfo()['Czymc'],
+					HGroupID:0,
+					HGroupNumber:'',
+					HGroupName:'',
+					HMTONo:'',
+					HCheckEmpName:'',
+					HExpiryDate:dayjs(new Date()).format('YYYY-MM-DD'),
+					HExpirationDateFlag:0,
+					HRemark:'',
+					HCoilNO:'',
+					HFurnaceNO:'',
+					HFactory:'',
+					HAuxQty:0,
+					HheatNO:'',
+					HProduceDate:dayjs(new Date()).format('YYYY-MM-DD'),
+					HSPID:0,
+					HSPCode:'',
+					HSPName:'',
+					HWHID:0,
+					HWHCode:'',
+					HWHName:'',
+					HQtyMust:0,
+					HQty:1,
+					HBQty:1,
+					HMinQty:1,
+					HPackQty:0,
+					HPrice:0,
+					HMoney:0,
+					HUseLife:0,
+					HLeaveLife:0,
+					HDesignLife:0,
+					
+					//鎵樻潯鐮侊細
+					
+                },
+                // 鍒嗛〉妯″潡鍏冩暟鎹�
+                paginationMeta: {
+
+                }
+            }
+        },
+        methods: {
+            checkboxGroupChangeHandler(e) {
+                let checkBoxValues = Array.from(e.detail.value)
+                if(checkBoxValues.findIndex(elem => elem == 'qualityApproval') != -1) {
+                    this.hform.HQualityApproval = true
+                }else {
+                    this.hform.HQualityApproval = false
+                }
+            },
+            onTableRowClickHandler(row, index) {
+                console.log('row: ',row);
+                if(!this.listData[index].checked){
+                    this.$set(this.listData[index], 'checked', true)
+                }else {
+                    this.listData[index].checked = !this.listData[index].checked
+                }
+            },
+            async HBarCodeFocusRefresh() {
+                this.HBarCode = ''
+                this.HBarCodeFocus = false
+                await this.$nextTick()
+                this.HBarCodeFocus = true
+            },
+            async HBarCodePackFocusRefresh() {
+                this.HBarCode_Pack = ''
+                this.HBarCodePackFocus = false
+                await this.$nextTick()
+                this.HBarCodePackFocus = true
+            },
+        
+            toScanCode2() {
+                MpaasScan.scanCode((scanCode) => {
+                    this.HBarCode = scanCode
+                    GetMeesageByBarCode(scanCode)
+                })
+            },
+            GetMeesageByBarCode(HBarCode) {
+                // 鑾峰彇寰呯粍鎵樻潯鐮佸搴旂殑鏁版嵁 
+                let HBarCode_Pack = this.HBarCode_Pack
+                let sOldBarCode = this.HBarCode
+                let HDeleteFlag = sOldBarCode.substring(0, 1)
+                let sBarCode = sOldBarCode.slice(1)
+                if (HDeleteFlag == '*') {
+                    if (!sBarCode) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
+                        })
+                    } else {
+                        this.HBarCodeFocusRefresh()
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                        data: {
+                            "HInterID": this.hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": this.HBillType
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+                                this.DisBillEntryList()
+                            } else {
+                                CommonUtils.playSound(0)
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+                        }
+                    })
+                } else {
+                    let sBarCode = this.HBarCode
+                    if (!sBarCode) {
+                        return uni.showToast({
+                            icon: 'none',
+                            title: '鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�',
+                        })
+                    }
+                    CommonUtils.doRequest2({
+                        url: '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
+                        data: {
+                            "HInterID": this.hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": this.HBillType,
+							"HBillSubType":this.HBillSubType,
+							"HBarCode_Pack":'',
+                            "HBillNo": this.hform.HBillNo,
+							"HMaterNumber_Pack":this.HMaterNumber_Pack,
+                            "HMaker": this.hform.HMaker,
+                            "HStockOrgID": this.hform.HStockOrgID
+                        },
+                        resFunction: (res) => {
+                            let {
+                                data,
+                                count,
+                                Message
+                            } = res.data
+                            if (count == 1) {
+                                CommonUtils.playSound(1)
+								console.log(sBarCode)
+								this.FindMaterial(sBarCode)
+                                this.HBarCodeFocusRefresh()
+                                this.DisBillEntryList()
+                            } else {
+                                CommonUtils.playSound(0)
+                                this.HBarCodeFocusRefresh()
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+                        }
+                    })
+                }
+            },
+			FindMaterial(sBarCode)
+			{
+				CommonUtils.doRequest2({
+				    url: '/Gy_Material/findMaterialByNumber',
+				    data: {
+				        "HbarCode": sBarCode,
+				        "HSTOCKORGID": this.HStockOrgID,
+				    },
+					resFunction: (res) => {
+					    let {
+					        count,
+					        data,
+					        Message
+					    } = res.data
+						if (count == 1) {
+							console.log(res.data)
+							this.hform.HMaterID=data[0].HMaterID
+							this.hform.HMaterName=data[0].HMaterName
+							this.hform.HMaterModel=data[0].HMaterModel
+						}else { 
+                                uni.showToast({
+                                    icon: 'none',
+                                    title: Message
+                                })
+                            }
+					}
+				})
+			},
+            DisBillEntryList() {
+                CommonUtils.doRequest2({
+                    url: '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+                    data: {
+                        "HInterID": this.hform.HInterID,
+                        "HBillNo": this.hform.HBillNo,
+                        "HBillType": this.HBillType
+                    },
+                    resFunction: (res) => {
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = res.data
+                        if (count == 1) {
+                            this.listData = []
+                            for (let i = 0; i < data.length; i++) {
+                                this.listData.push(Object.assign(data[i], {
+                                    index: i
+                                }))
+                            }
+                        } else {
+                            // 娌℃湁浠讳綍璁板綍瑙嗕负浠�0寮�濮嬫柊澧�
+                            this.listData = []
+                        }
+                    }
+                })
+            },
+            handleSelect(selected, array) {
+                this.selectedRows = array
+            },
+            handleSelectAll(selected, array) {
+                this.selectedRows = array
+            },
+            getMaxNo() {
+                CommonUtils.doRequest2({
+                    url: "/WEBSController/GetMaxBillNoAndID_Json",
+                    data: {
+                        "HBillType": this.HBillType
+                    },
+                    resFunction: (d) => {
+                        console.log('d: ', d);
+                        let {
+                            count,
+                            data,
+                            Message
+                        } = d.data
+                        if (count == 1) {
+                            this.hform.HInterID = data[0].HInterID;
+                            this.hform.HBillNo = data[0].HBillNo
+                        } else {
+
+                            uni.showModal({
+                                title: "娓╅Θ鎻愮ず",
+                                showCancel: false,
+                                content: Message
+
+                            })
+
+                        }
+                    }
+                })
+            },
+            submitPreCheck() {
+                if (CommonUtils.isEmpty(this.hform.HInterID)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�'
+                    })
+                    return false
+                }
+                if (CommonUtils.isEmpty(this.hform.HBillNo)) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�'
+                    })
+                    return false
+                }
+                if (this.listData.length < 1) {
+                    uni.showToast({
+                        icon: 'none',
+                        title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�'
+                    })
+                    return false
+                }
+                return true
+            },
+            cmdDelete() {
+                console.log('this.selectedRows: ', this.selectedRows);
+                if (this.selectedRows.length != 1) {
+                    return uni.showToast({
+                        icon: 'none',
+                        title: '璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�'
+                    })
+                }
+                uni.showModal({
+                    title: '鍒犻櫎纭',
+                    content: '纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠!',
+                    success: () => {
+                        if (confirm) {
+                            CommonUtils.doRequest2({
+                                url: '/WEBSController/set_DelPackUnionBill_Temp_Pack_Json',
+                                data: {
+                                    HInterID: this.hform.HInterID,
+                                    HBillType: this.HBillType,
+                                    HBarCode: this.selectedRows[0].HBarCode
+                                },
+                                resFunction: (res) => {
+                                    let {
+                                        data,
+                                        count,
+                                        Message
+                                    } = res.data
+                                    if (count == 1) {
+                                        CommonUtils.playSound(1)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                        this.DisBillEntryList()
+                                    } else {
+                                        CommonUtils.playSound(0)
+                                        uni.showToast({
+                                            icon: 'none',
+                                            title: Message
+                                        })
+                                    }
+                                }
+                            })
+                        }
+                    }
+                })
+            },
+			getBarCode_pack() {
+				return new Promise((resolve, reject) => {
+					var sMainStr = JSON.stringify(this.hform);
+					var omain = sMainStr + ';' + this.hform.HStockOrgName + ';' + this.hform.HEmpName;
+					
+					CommonUtils.doRequest2({
+						url: '/Sc_BarCode/Sub_SaveBill_xiaowei',
+						method: 'POST', 
+						data: {
+							"msg": omain
+						},
+						resFunction: (res) => {
+							let { data, count, Message } = res.data;
+							if (count == 1) {
+								console.log('鏉$爜鐢熸垚鎴愬姛:', res.data.data[0]['鏉$爜缂栧彿']);
+								this.HBarCode_Pack = res.data.data[0]['鏉$爜缂栧彿'];
+								resolve(this.HBarCode_Pack); // 瑙f瀽Promise
+							} else {
+								uni.showToast({
+									icon: 'none',
+									title: Message || '鏉$爜鐢熸垚澶辫触'
+								});
+								this.EnableSubmit = true;
+								reject(Message);
+							}
+						},
+						errorFunction: (error) => {
+							console.error('璇锋眰澶辫触:', error);
+							uni.showToast({
+								icon: 'none',
+								title: '缃戠粶璇锋眰澶辫触'
+							});
+							this.EnableSubmit = true;
+							reject(error);
+						}
+					});
+				});
+			},
+			async cmdSubmit() {
+			  let checkRes = this.submitPreCheck()
+			  if (!checkRes) {
+				return
+			  }
+			  this.EnableSubmit = false
+			  
+			  try {
+				await this.getBarCode_pack();
+				console.log('鑾峰彇鍒扮殑鏉$爜:', this.HBarCode_Pack);
+				
+				// 浣跨敤 await 纭繚鎻愪氦瀹屾垚鍚庡啀鑾峰彇鏁版嵁
+				await CommonUtils.doRequest2({
+				  url: '/WEBSController/set_SavePackUnionBill_Json',
+				  data: {
+					"HInterID": this.hform.HInterID,
+					"HBillType": this.HBillType,
+					"HBillNo": this.hform.HBillNo,
+					"HBarCode_Pack": this.HBarCode_Pack, 
+					"HMaker": this.hform.HMaker,
+					"HStockOrgID": this.hform.HStockOrgID
+				  },
+				  resFunction: async (res) => {
+					let { data, count, Message } = res.data
+					if (count == 1) {
+					  // 绛夊緟鏁版嵁鑾峰彇瀹屾垚鍚庡啀鏄剧ず琛ㄦ牸
+					  await this.getResultTableData();
+					} else {
+					  uni.showToast({
+						icon: 'none',
+						title: Message
+					  })
+					  this.EnableSubmit = true;
+					}
+				  }
+				})
+			  } catch (error) {
+				console.error('鎻愪氦澶辫触:', error);
+				this.EnableSubmit = true;
+			  }
+			},
+			getResultTableData() {
+			  console.log('寮�濮嬭幏鍙栫粨鏋滄暟鎹紝鏉$爜:', this.HBarCode_Pack);
+			  
+			  CommonUtils.doRequest2({
+			    url: '/WEBSController/get_SavePackUnion_xiaowei',
+			    data: {
+			      "HBarCode_Pack": this.HBarCode_Pack
+			    },
+			    resFunction: (res) => {
+			      console.log('缁撴灉鎺ュ彛杩斿洖:', res);
+			      let { data, count, Message } = res.data
+			      if (count == 1) {
+			        console.log('鑾峰彇鍒扮粨鏋滄暟鎹�:', data);
+			        this.resultTableData = data;
+			        this.showResultTable = true; // 鏄剧ず缁撴灉琛ㄦ牸
+			        console.log('showResultTable 璁剧疆涓�:', this.showResultTable);
+			      } else {
+			        uni.showToast({
+			          icon: 'none',
+			          title: Message || '鑾峰彇鏁版嵁澶辫触'
+			        })
+			        this.EnableSubmit = true;
+			      }
+			    }
+			  })
+			},
+				// 鏂板鏂规硶
+				toAddNew() {
+				  // 閲嶇疆鏁版嵁锛屽噯澶囨柊澧�
+				  this.showResultTable = false;
+				  this.resultTableData = [];
+				  this.HBarCode_Pack = '';
+				  this.HBarCode = '';
+				  this.listData = [];
+				  this.getMaxNo(); // 閲嶆柊鑾峰彇鏂扮殑鍗曟嵁鍙�
+				  this.HBarCodePackFocusRefresh(); // 閲嶆柊鑱氱劍
+				},
+				
+				// 鍏抽棴缁撴灉琛ㄦ牸
+				closeResultTable() {
+				  this.showResultTable = false;
+				  uni.navigateBack();
+				},
+            cmdExit() {
+                uni.navigateBack()
+            }
+        },
+        computed: {
+            listTableHeight: {
+                get() {
+                    return this.bottomBtnTop - this.listTableTop - 10
+                }
+            }
+        },
+        async onReady() {
+            // #ifndef MP-WEIXIN
+            let query = uni.createSelectorQuery().in(this)
+            query.select("#bottom-btn")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.bottomBtnTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#bottom-btn鑺傜偣");
+                    }
+                })
+                .exec();
+            query.select("#list-table")
+                .boundingClientRect((data) => {
+                    if (data) {
+                        this.listTableTop = data.top
+                    } else {
+                        console.log("鏈壘鍒�#list-table鑺傜偣");
+                    }
+                })
+                .exec();
+            // #endif
+        },
+        onLoad(e) {
+            // 1涓� 瑁呯 2涓� 缁勬墭
+            this.BarCodeType = e.BarCodeType || 1
+            this.OperationType = e.OperationType || 1
+            this.HBarCode_Pack = e.HBarCode_Pack_Temp || ""
+
+            if (this.OperationType == 1) {
+                this.getMaxNo()
+            } else if (this.OperationType == 2) {
+               // this.GetMeesageByBarCode_Pack(this.HBarCode_Pack)
+                this.DisBillEntryList()
+                this.tabs = 0
+            }
+
+
+            // 鍏夋爣榛樿鑱氱劍鍦ㄦ墭鏉$爜涓�
+            this.HBarCodePackFocusRefresh()
+        }
+    }
+</script>
+
+<style lang="scss">
+    input {
+        width: inherit;
+        padding: 8rpx 20rpx;
+        font-size: 30rpx;
+    }
+
+    .form {
+        display: flex;
+        flex-direction: column;
+        gap: 20rpx;
+
+        .form-base-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 30rpx;
+        }
+
+        .bill-info {
+            display: flex;
+            flex-direction: column;
+            gap: 10rpx;
+            box-sizing: border-box;
+            padding: 16rpx 30rpx;
+        }
+
+        .form-item {
+            display: flex;
+            flex-direction: row;
+            gap: 10rpx;
+
+            .title {
+                width: 5rem;
+                flex-shrink: 0;
+            }
+
+            .right {
+                flex: 1;
+                border-radius: 22rpx;
+                border: 1px solid #acacac;
+            }
+
+            .disabled {
+                border: 1px solid #e4e4e4;
+                background-color: #e4e4e4;
+            }
+
+            .right-icon {
+                flex-shrink: 0;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+            }
+
+        }
+    }
+
+    .tabs {
+        width: 100%;
+        display: flex;
+        border-bottom: 1px solid #ddd;
+        margin: 20rpx 0;
+
+        view {
+            width: 25%;
+            font-size: 30rpx;
+            color: #555;
+            text-align: center;
+            padding: 16rpx 0;
+        }
+
+        .on {
+            color: #3a78ff;
+            font-weight: bold;
+            border-bottom: 3px solid #3a78ff;
+        }
+    }
+
+    .bottom-btn {
+        width: 100%;
+        box-sizing: border-box;
+        // height: 120rpx;
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        background-color: #fff;
+        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+        padding: 30rpx 40rpx 40rpx 40rpx;
+        display: flex;
+        flex-direction: row;
+        gap: 10rpx;
+
+        button {
+            border-radius: 50rpx;
+            width: 180rpx;
+            height: 66rpx;
+            line-height: 66rpx;
+            font-size: 28rpx;
+        }
+
+        .btn-a {
+            background-color: #3A78FF;
+            color: #fff;
+        }
+
+        .btn-b {
+            background-color: #41a863;
+            color: #fff;
+        }
+
+        .btn-c {
+            background-color: #acacac;
+            color: #fff;
+            // position: absolute;
+            // right: 120rpx;
+        }
+
+        .btn-d {
+            background-color: #ff8901;
+            color: #fff;
+        }
+    }
+	.result-modal {
+	  position: fixed;
+	  top: 0;
+	  left: 0;
+	  width: 100%;
+	  height: 100%;
+	  z-index: 9999;
+	  
+	  .modal-mask {
+	    position: absolute;
+	    top: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 100%;
+	    background: rgba(0, 0, 0, 0.5);
+	  }
+	  
+	  .modal-content {
+	    position: absolute;
+	    top: 50%;
+	    left: 50%;
+	    transform: translate(-50%, -50%);
+	    width: 90%;
+	    max-width: 700rpx;
+	    background: #fff;
+	    border-radius: 20rpx;
+	    overflow: hidden;
+	    
+	    .modal-header {
+	      padding: 30rpx;
+	      border-bottom: 1px solid #eee;
+	      display: flex;
+	      justify-content: space-between;
+	      align-items: center;
+	      
+	      .modal-title {
+	        font-size: 32rpx;
+	        font-weight: bold;
+	      }
+	    }
+	    
+	    .modal-body {
+	      padding: 30rpx;
+	      max-height: 60vh;
+	      overflow-y: auto;
+	    }
+	    
+	    .modal-footer {
+	      padding: 30rpx;
+	      border-top: 1px solid #eee;
+	      display: flex;
+	      align-items: center;
+	    }
+	  }
+	}
+</style>
\ No newline at end of file

--
Gitblit v1.9.1