From 3b695d385245530e646dd452e60a438db4e0be4a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 07 一月 2026 10:37:11 +0800
Subject: [PATCH] 设备 保养记录单 完成 添加 设备点检记录单 设备保养记录单

---
 pages/MJGL/style/MJListStyle.scss                            |  133 ++++
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue     |   92 ++
 pages/index/tab3.vue                                         |   14 
 pages.json                                                   |   16 
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue     |  718 +++++++++++++++++++++++
 pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue |  434 ++++++++++++++
 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue |  434 ++++++++++++++
 7 files changed, 1,812 insertions(+), 29 deletions(-)

diff --git a/pages.json b/pages.json
index 5fc87d6..8157dc2 100644
--- a/pages.json
+++ b/pages.json
@@ -1431,6 +1431,22 @@
             {
                 "navigationBarTitleText" : "鍦ㄥ簱妫�楠屽崟鍒楄〃"
             }
+        },
+        {
+            "path" : "pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+            "style" : 
+            {
+                "navigationBarTitleText" : "璁惧鐐规璁板綍鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
+        },
+        {
+            "path" : "pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+            "style" : 
+            {
+                "navigationBarTitleText" : "璁惧淇濆吇璁板綍鍗曠紦瀛�",
+                "enablePullDownRefresh": true
+            }
         }
         
     ],
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
index 1aef13a..c4a1998 100644
--- a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -50,13 +50,13 @@
                         <radio-group @change="radioChange" class="radio_Container">
                             <label>
                                 <view>
-                                    <radio value="OK" :checked="hform.HLastResult == 'OK'" />
+                                    <radio value="OK" :checked="calcHLastResult == 'OK'" />
                                     <text>OK</text>
                                 </view>
                             </label>
                             </label>
                             <view>
-                                <radio value="NG" :checked="hform.HLastResult == 'NG'" />
+                                <radio value="NG" :checked="calcHLastResult == 'NG'" />
                                 <text>NG</text>
                             </view>
                             </label>
@@ -141,7 +141,10 @@
         </template>
         <!-- 鏄庣粏淇℃伅 -->
         <template v-if="tabs == 1">
-            <view class="form">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
                 <view class="form-item">
                     <view class="left">
                         璁惧鐐规瑙勭▼
@@ -289,7 +292,6 @@
     import {
         MpaasScan
     } from "@/utils/mpaasScan.js"
-    import "@/pages/MJGL/style/MJBillStyle.scss"
     import {
         getUserInfo
     } from "../../../utils/auth";
@@ -358,9 +360,36 @@
                 get() {
                     return this.btnTop - this.tabsBottom - 5
                 }
+            },
+            calcHLastResult: {
+                get() {
+                    if (this.HCheckFileList.length == 0) {
+                        return 'OK'
+                    } else {
+                        let okCount = this.HCheckFileList.reduce((acc, item) => {
+                            if (item.HDotCheckResult) {
+                                return acc + 1
+                            }
+                            return acc
+                        }, 0)
+                        if (okCount == this.HCheckFileList.length) {
+                            return 'OK'
+                        }
+                        return 'NG'
+                    }
+                }
             }
+
         },
         methods: {
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipDotCheckBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
             checkBoxChangeHandler(index, e) {
                 let cr = e.detail.value
                 if (cr.length == 0) {
@@ -511,17 +540,28 @@
                         Message
                     } = res.data
 
-                    console.log('data: ', data);
-                    this.hform.HEquipID = data[0].HInterID
-                    this.hform.HBarName = data[0].璁惧鍚嶇О
-                    this.hform.HBarSpec = data[0].璁惧瑙勬牸
-                    this.hform.HBarModel = data[0].璁惧鍨嬪彿
-                    this.hform.HQty = 1
+                    if (count == 1) {
+                        console.log('data: ', data);
+                        this.hform.HEquipID = data[0].HInterID
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
 
-                    // 鑾峰彇妫�楠岃绋�
-                    this.GetItemByEquipFile()
+                        // 鑾峰彇妫�楠岃绋�
+                        this.GetItemByEquipFile()
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
                 } catch (err) {
-
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
                 }
             },
             async GetItemByEquipFile() {
@@ -626,13 +666,16 @@
                         },
                         method: "POST"
                     })
-                    
-                    if(!res) {
-                       return 
+
+                    if (!res) {
+                        return
                     }
-                    
-                    let {count, Message} = res.data
-                    if(count == 1){
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
                         uni.showModal({
                             title: '鎻愮ず',
                             content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
@@ -640,7 +683,7 @@
                                 if (res.confirm) {
                                     console.log('鐢ㄦ埛鐐瑰嚮纭畾');
                                     uni.redirectTo({
-                                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                                        url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
                                     })
                                 } else if (res.cancel) {
                                     console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
@@ -650,14 +693,14 @@
                                 }
                             }
                         });
-                    }else {
+                    } else {
                         CommonUtils.showTips({
                             title: "娓╅Θ鎻愮ず",
                             message: "鎻愪氦鍗曟嵁澶辫触: " + Message
                         })
                     }
-                    
-                    
+
+
                 } catch (err) {
                     CommonUtils.showTips({
                         title: "娓╅Θ鎻愮ず",
@@ -704,5 +747,6 @@
     }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
 </style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
new file mode 100644
index 0000000..73b339a
--- /dev/null
+++ b/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
@@ -0,0 +1,434 @@
+<template>
+    <view class="content">
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view> -->
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="form" v-if="tabs == 0">
+            <view class="buttons" @tap="add">
+                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+            </view>
+        </view>
+        <view class="form" v-if="tabs == 1">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">婧愬崟鍗曞彿:</view>
+                <view class="right">
+                    <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                </view>
+            </view>
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+            <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.璁惧浠g爜">
+                        <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧鍚嶇О">
+                        <text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+                    </view>
+                    <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                        <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                    </view>
+                    <view class="detail" v-if="item.寮�濮嬫棩鏈�">
+                        <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.寮�濮嬫棩鏈�).format("YYYY-MM-DD HH:mm:DD")}}
+                    </view>
+                    <view class="detail" v-if="item.缁撴潫鏃ユ湡">
+                        <text>缁撴潫鏃ユ湡锛�</text>{{dayjs(item.缁撴潫鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                    </view>
+                    <view class="detail" v-if="item.鐐规璁″垝缂栧彿">
+                        <text>鐐规璁″垝缂栧彿锛�</text>{{item.鐐规璁″垝缂栧彿}}
+                    </view>
+                    <view class="detail" v-if="item.鐐规璁″垝">
+                        <text>鐐规璁″垝锛�</text>{{item.鐐规璁″垝}}
+                    </view>
+                    <view class="detail" v-if="item.鎽樿">
+                        <text>鎽樿锛�</text>{{item.鎽樿}}
+                    </view>
+                    <view class="detail" v-if="item.鐐规瑙勬牸鎽樿">
+                        <text>鐐规瑙勬牸鎽樿锛�</text>{{item.鐐规瑙勬牸鎽樿}}
+                    </view>
+                    <view class="detail" v-if="item.hmainid">
+                        <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                    </view>
+                    <view class="detail" v-if="item.鏈�缁堢粨璁�">
+                        <text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <!-- <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+                    </view> -->
+                    <view style="flex: 1"></view>
+                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+            <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鐘舵��">
+                        <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+                    </view>
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡浠g爜">
+                        <text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+                        <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+                    </view>
+                    <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                        <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+                    </view>
+                    <view class="detail" v-if="item.缁勭粐">
+                        <text>缁勭粐锛�</text>{{item.缁勭粐}}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+                    </view>
+                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+
+        <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3903,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "DJ",
+                    sWhere: "",
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onReachBottom: function() {
+            this.page++
+            setTimeout(() => {
+                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+            }, 100)
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        methods: {
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            getPage(page, list) {
+                let sindex = (parseInt(page) - 1) * 20
+                let eindex = parseInt(page) * 20
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.getList()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        this.listData = data
+                        this.showList = this.getPage(this.page, data)
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                // if (this.hform.HBillNo) {
+                //     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                // }
+                // if (this.hform.HSourceBillNo) {
+                //     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+                // }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 1206,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "DJ"
+                }
+                this.getList()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
index 492629a..501d3b2 100644
--- a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -1,19 +1,727 @@
 <template>
     <view>
-        
+        <view class="tabs" id="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
+            <view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鏄庣粏淇℃伅</view>
+            <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍏朵粬淇℃伅</view>
+            <view :class="tabs == 3 ? 'on':''" @tap="tabs = 3">闄勪欢淇℃伅</view>
+        </view>
+        <!-- 鍩烘湰淇℃伅 -->
+        <template v-if="tabs == 0">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">璁惧鏉$爜:</view>
+                    <view class="right">
+                        <input v-model="hform.HBarCode" @confirm="GetMessageByBarCode(hform.HBarCode)"
+                            placeholder="璇疯緭鍏�(鎴栨壂鎻�)璁惧鏉$爜" />
+                    </view>
+                    <view class="icon-wrapper">
+                        <uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇寮�濮�:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HBeginDate">
+                            <input :value="hform.HBeginDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇缁撴潫:</view>
+                    <view class="right">
+                        <uni-datetime-picker type="date" :clear-icon="false" v-model="hform.HEndDate">
+                            <input :value="hform.HEndDate" />
+                        </uni-datetime-picker>
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鏈�缁堢粨璁�:</view>
+                    <view class="right none-border">
+                        <radio-group @change="radioChange" class="radio_Container">
+                            <label>
+                                <view>
+                                    <radio value="OK" :checked="calcHLastResult == 'OK'" />
+                                    <text>OK</text>
+                                </view>
+                            </label>
+                            </label>
+                            <view>
+                                <radio value="NG" :checked="calcHLastResult == 'NG'" />
+                                <text>NG</text>
+                            </view>
+                            </label>
+                        </radio-group>
+                    </view>
+                </view>
+
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鍙�:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HBillNo" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍗曟嵁鏃ユ湡:</view>
+                    <view class="righton">
+                        <input disabled v-model="hform.HDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">閮ㄩ棬:</view>
+                    <zxz-uni-data-select class="right" :localdata="HDeptList" dataKey="閮ㄩ棬鍚嶇О" dataValue="HItemID"
+                        v-model="hform.HDeptID">
+
+                    </zxz-uni-data-select>
+                    <!-- <input disabled v-model="hform.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" /> -->
+                </view>
+                <view class="form-item">
+                    <view class="title">澶囨敞:</view>
+                    <view class="right">
+                        <input v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍚嶇О:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarName" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧瑙勬牸:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarSpec" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">璁惧鍨嬪彿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HBarModel" disabled />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇濆吇璁″垝:</view>
+                    <view class="righton">
+                        <input v-model="hform.HPlanNo" disabled />
+                    </view>
+                </view>
+            </view>
+        </template>
+        <!-- 鏄庣粏淇℃伅 -->
+        <template v-if="tabs == 1">
+            <view :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form">
+                    <view class="form-item">
+                        <view class="left">
+                            璁惧淇濆吇瑙勭▼
+                        </view>
+                        <view class="right">
+                            <input type="text" :value="hform.HEquipMaintainRuleInterNo" />
+                        </view>
+                        <view class="icon-wrapper">
+                            <uni-icons type="search" size="20" @click="toCheckFile"></uni-icons>
+                        </view>
+                    </view>
+                </view>
+                <view class="list" v-for="(item,index) in HCheckFileList" :key="index">
+                    <uni-card style="margin: 10px;">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>搴忓彿锛�</text>{{index+1}}
+                            </view>
+                            <view class="detail">
+                                <text>缁撴灉锛�</text>
+                                <checkbox-group style="display: inline-block;"
+                                    @change="checkBoxChangeHandler(index, $event)">
+                                    <checkbox value="enabled" :checked="item.HMaintainResult" />
+                                </checkbox-group>
+                            </view>
+                            <view class="detail">
+                                <text>淇濆吇椤圭洰锛�</text>{{item.HMaintainItem}}
+                            </view>
+                            <view class="detail" v-if="item.HMaintainPart">
+                                <text>淇濆吇閮ㄤ綅锛�</text>{{item.HMaintainPart}}
+                            </view>
+                            <view class="detail" v-if="item.HClaim">
+                                <text>鍏蜂綋瑕佹眰锛�</text>{{item.HClaim}}
+                            </view>
+                            <view class="detail">
+                                <text>璐熻矗浜猴細</text>{{item.HManagerName}}
+                            </view>
+                            <view class="detail" v-if="item.Remark">
+                                <text>澶囨敞锛�</text>{{item.Remark}}
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+                <view class="over" v-if="HCheckFileList.length == 0">鏆傛棤鏁版嵁</view>
+            </view>
+        </template>
+        <!-- 鍏朵粬淇℃伅 -->
+        <template v-if="tabs == 2">
+            <view class="form" :style="{
+                height: containerHeight + 'px',
+                overflow: 'auto'
+            }">
+                <view class="form-item">
+                    <view class="title">鍒涘缓浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMaker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">鍒涘缓鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HMakeDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDater" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">淇敼鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HUpDateDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HChecker" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">瀹℃牳鏃堕棿:</view>
+                    <view class="righton">
+                        <input v-model="hform.HCheckDate" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾浜�:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteMan" />
+                    </view>
+                </view>
+                <view class="form-item">
+                    <view class="title">浣滃簾鏃ユ湡:</view>
+                    <view class="righton">
+                        <input v-model="hform.HDeleteDate" />
+                    </view>
+                </view>
+            </view>
+
+        </template>
+        <!-- 闄勪欢淇℃伅 -->
+        <template v-if="tabs == 3">
+            <view class="card-item-wrapper">
+                <view class="attachment-btns">
+                    <button type="primary" size="mini" @tap="fileUpload">閫夋嫨鏂囦欢</button>
+                    <view style="flex: 1;"></view>
+                </view>
+                <view v-for="(item, index) in attachmentInfo" :key="index">
+                    <uni-card :title="item['fileName']" :thumbnail="item.filePath">
+                        <view class="card-detail">
+                            <view class="detail">
+                                <text>澶у皬锛�</text>{{item["size"]}}
+                            </view>
+                            <view class="detail">
+                                <text>鐘舵�侊細</text>{{item["status"]}}
+                            </view>
+                            <view class="detail operation" v-if="item['status']!='涓婁紶鎴愬姛'">
+                                <text>鎿嶄綔锛�</text>
+                                <button class="btn-a" size="mini" @tap.stop="uploadFile(index)">涓婁紶</button>
+                                <button class="btn-b" size="mini" @tap.stop="delFile(index)">鍒犻櫎</button>
+                            </view>
+                        </view>
+                    </uni-card>
+                </view>
+            </view>
+        </template>
+        <!-- 鎿嶄綔鎸夐挳 -->
+        <view class="buttons" id="buttons">
+            <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+            <view style="flex: 1;"></view>
+            <button class="btn-a" size="mini" @tap="addNew">鏂板</button>
+            <button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
+        </view>
+        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>
     </view>
 </template>
 
 <script>
+    import dayjs from "dayjs";
+    import {
+        CommonUtils
+    } from "@/utils/common";
+    import {
+        MpaasScan
+    } from "@/utils/mpaasScan.js"
+    import {
+        getUserInfo
+    } from "../../../utils/auth";
+    import {
+        TrackOpTypes
+    } from "vue";
     export default {
+        name: 'sb_EquipMaintainBill',
         data() {
             return {
-                
+                tabs: 0,
+                HMainSourceBillType: "",
+                btnTop: 0,
+                tabsBottom: 0,
+                HModName: "sb_EquipMaintainBill",
+                HBillType: '3901',
+                operationType: 1,
+                uploadOptions: {},
+
+                HDeptList: [],
+                HShiftsList: [],
+                HCheckFileList: [],
+                attachmentInfo: [],
+
+                hform: {
+                    HBarCode: "",
+                    HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HQty: 0,
+                    HErrNote: "",
+                    HBigSafeNote: "",
+                    HShiftsName: "",
+                    HShiftsID: 0,
+                    HBillNo: "",
+                    HInterID: 0,
+                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+                    HDeptName: "",
+                    HDeptID: 0,
+                    HRemark: "",
+                    HBarName: "",
+                    HEquipID: 0,
+                    HBarSpec: "",
+                    HBarModel: "",
+                    HPlanNo: "",
+                    HPlanInterID: 0,
+                    HPlanEntryID: 0,
+                    HEquipMaintainPlanInterID: 0,
+                    HEquipMaintainPlanEntryID: "",
+                    HMaker: getUserInfo()['Czymc'],
+                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+                    HUpDater: "",
+                    HUpDateDate: "",
+                    HChecker: "",
+                    HCheckDate: "",
+                    HDeleteMan: "",
+                    HDeleteDate: "",
+                    lngBillKey: 0,
+                    lngBillSubKey: 0,
+                    HLastResult: "OK"
+                }
             };
+        },
+        computed: {
+            containerHeight: {
+                get() {
+                    return this.btnTop - this.tabsBottom - 5
+                }
+            },
+            calcHLastResult: {
+                get() {
+                    if (this.HCheckFileList.length == 0) {
+                        return 'OK'
+                    } else {
+                        let okCount = this.HCheckFileList.reduce((acc, item) => {
+                            if (item.HMaintainResult) {
+                                return acc + 1
+                            }
+                            return acc
+                        }, 0)
+                        if (okCount == this.HCheckFileList.length) {
+                            return 'OK'
+                        }
+                        return 'NG'
+                    }
+                }
+            }
+
+        },
+        methods: {
+            addNew() {
+                uni.redirectTo({
+                    url: './Sb_EquipMaintainBill?operationType=1'
+                })
+            },
+            goBack() {
+                uni.navigateBack()
+            },
+            checkBoxChangeHandler(index, e) {
+                let cr = e.detail.value
+                if (cr.length == 0) {
+                    this.HCheckFileList[index]["HMaintainResult"] = false
+                } else {
+                    this.HCheckFileList[index]["HMaintainResult"] = true
+                }
+            },
+            uploadFile(index) {
+                console.log('filePath: ', this.attachmentInfo[index].filePath);
+                // 閫氳繃涓存椂璺緞璇诲彇鏂囦欢
+                uni.uploadFile({
+                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
+                    filePath: this.attachmentInfo[index].filePath,
+                    name: 'file',
+                    formData: {
+                        HBillNo: this.hform.HBillNo,
+                        HRemark: "",
+                        HUserName: getUserInfo()["Czymc"]
+                    },
+                    success: (uploadRes) => {
+                        CommonUtils.showTips({
+                            message: "涓婁紶鎴愬姛"
+                        })
+                        this.attachmentInfo[index].status = "涓婁紶鎴愬姛"
+                    },
+                    fail: (err) => {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `涓婁紶澶辫触: ${err}`
+                        })
+                    }
+                })
+            },
+            delFile(index) {
+                console.log('attachmentInfo: ', this.attachmentInfo[index]);
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄� " ' + this.attachmentInfo[index].fileName + ' " 鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            this.attachmentInfo.splice(index, 1)
+                        }
+                    },
+                })
+
+            },
+            handleUploadCallback(res) { // 鏂囦欢涓婁紶鍥炶皟
+                console.log('file: ', res);
+                let fileInfo = res.data[0]
+                this.attachmentInfo.push({
+                    fileName: fileInfo.name,
+                    size: fileInfo.size,
+                    status: '绛夊緟涓婁紶',
+                    filePath: fileInfo.tempFilePath
+                })
+            },
+            // 涓婁紶鏂囦欢
+            fileUpload() {
+                this.$refs.XeUpload.upload('file', {});
+            },
+            //鑾峰彇鐝鏁版嵁
+            async getShiftList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Web/GetGy_ShiftsList_Json',
+                        data: {
+                            Shifts: "",
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HShiftsList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            //鑾峰彇浣跨敤閮ㄩ棬鏁版嵁
+            async getHDeptList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: '/Gy_Department/list',
+                        data: {
+                            sWhere: "",
+                            user: uni.getStorageSync('HUserName'),
+                            Organization: uni.getStorageSync('Organization')
+                        }
+                    })
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        this.HDeptList = data
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: Message
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: err
+                    })
+                }
+            },
+            toScanCode() {
+                MpaasScan.scanCode(cb => {
+                    this.hfrom.HBarCode = cb
+                    this.GetMessageByBarCode(cb)
+                })
+            },
+            async GetMessageByBarCode(HBarCode) {
+                try {
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Gy_EquipFileBill/txtHBarCode_KeyDown",
+                        data: {
+                            HBarCode: HBarCode,
+                            user: getUserInfo()["Czymc"]
+                        },
+                    })
+
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        data,
+                        count,
+                        Message
+                    } = res.data
+
+                    console.log('data: ', data);
+
+                    if (count == 1) {
+                        this.hform.HEquipID = data[0].HInterID
+                        this.hform.HBarName = data[0].璁惧鍚嶇О
+                        this.hform.HBarSpec = data[0].璁惧瑙勬牸
+                        this.hform.HBarModel = data[0].璁惧鍨嬪彿
+                        this.hform.HQty = 1
+
+                        // 鑾峰彇妫�楠岃绋�
+                        this.GetItemByEquipFile()
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: Message
+                        })
+                    }
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: err
+                    })
+                }
+            },
+            async GetItemByEquipFile() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetItemByEquipFile",
+                        data: {
+                            "EquipProjectID": this.hform.HEquipID,
+                            "Type": "BY",
+                            "HDate": this.hform.HBeginDate
+                        }
+                    })
+
+                    let {
+                        data,
+                        Message,
+                        count
+                    } = res.data
+                    if (count == 1) {
+                        this.hform.HEquipMaintainRuleInterID = data[0].淇濆吇瑙勭▼ID
+                        this.hform.HEquipMaintainRuleInterNo = data[0].淇濆吇瑙勭▼鍗曞彿
+                        this.hform.HPlanNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HEquipMaintainPlanInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ?
+                            0 : data[0].淇濆吇璁″垝ID
+                        this.hform.HEquipMaintainPlanEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) ==
+                            "" ? 0 : data[0].淇濆吇璁″垝瀛怚D
+                        this.hform.HMainSourceBillNo = data[0].淇濆吇璁″垝鍗�
+                        this.hform.HMainSourceInterID = (data[0].淇濆吇璁″垝ID == null ? 0 : data[0].淇濆吇璁″垝ID) == "" ? 0 :
+                            data[0].淇濆吇璁″垝ID
+                        this.hform.HMainSourceEntryID = (data[0].淇濆吇璁″垝瀛怚D == null ? 0 : data[0].淇濆吇璁″垝瀛怚D) == "" ? 0 :
+                            data[0].淇濆吇璁″垝瀛怚D
+
+                        this.HCheckFileList = Array.from(data).map(item => {
+                            return {
+                                "HMaintainResult": item.榛樿缁撹 == 1 ? true : false,
+                                "HMaintainItemID": item.淇濆吇椤圭洰ID,
+                                "HMaintainNumber": item.淇濆吇椤圭洰浠g爜,
+                                "HMaintainItem": item.淇濆吇椤圭洰鍚嶇О,
+                                "HMaintainPart": item.淇濆吇閮ㄤ綅,
+                                "HClaim": item.鍏蜂綋瑕佹眰,
+                                "HManagerID": item.璐熻矗浜篒D,
+                                "HManagerNumber": item.璐熻矗浜轰唬鐮�,
+                                "HManagerName": item.璐熻矗浜哄悕绉�,
+                                "HRemark": "",
+                                "HSourceInterID": item.淇濆吇璁″垝ID,
+                                "HSourceEntryID": item.淇濆吇璁″垝瀛怚D,
+                                "HSourceBillNo": item.淇濆吇璁″垝鍗�
+                            }
+                        })
+
+                    } else {
+                        CommonUtils.showTips({
+                            title: '娓╅Θ鎻愮ず',
+                            message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: '娓╅Θ鎻愮ず',
+                        message: `鑾峰彇鐐规瑙勭▼閿欒锛� ${err}`
+                    })
+                }
+            },
+            radioChange({
+                detail: {
+                    value
+                }
+            }) {
+                this.HLastResult = value
+            },
+            async getMaxNum() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: "/Web/GetMAXNum",
+                        data: {
+                            "HBillType": this.HBillType
+                        }
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+                    console.log('data: ', data);
+                    this.hform.HInterID = 0
+                    this.hform.HBillNo = data[0]["HBillNo"]
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鑾峰彇鍗曟嵁淇℃伅寮傚父: " + err
+                    })
+                }
+            },
+            async submit() {
+                try {
+                    let oMain = JSON.stringify(this.hform);
+                    let sSubStr = JSON.stringify(this.HCheckFileList);
+                    let sMainSub = oMain + ';' + sSubStr;
+                    let res = await CommonUtils.doRequest2Sync({
+                        url: "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
+                        data: {
+                            "msg": sMainSub
+                        },
+                        method: "POST"
+                    })
+
+                    if (!res) {
+                        return
+                    }
+
+                    let {
+                        count,
+                        Message
+                    } = res.data
+                    if (count == 1) {
+                        uni.showModal({
+                            title: '鎻愮ず',
+                            content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+                            success: (res) => {
+                                if (res.confirm) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                                    uni.redirectTo({
+                                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                                    })
+                                } else if (res.cancel) {
+                                    console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                                    setTimeout(() => {
+                                        uni.navigateBack();
+                                    }, 50)
+                                }
+                            }
+                        });
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: "鎻愪氦鍗曟嵁澶辫触: " + Message
+                        })
+                    }
+
+
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: "鎻愪氦鍗曟嵁澶辫触: " + err
+                    })
+                }
+            }
+        },
+        onLoad(e) {
+            console.log('e: ', e);
+            if (!e.operationType) {
+                this.operationType = 1
+            } else {
+                this.operationType = e.operationType
+            }
+
+            if (this.operationType == 1) {
+                // 鏂板
+                this.getMaxNum()
+            } else if (this.operationType == 2) {
+                // 澶嶅埗
+            } else if (this.operationType == 3) {
+                // 缂栬緫
+
+            } else if (this.operationType == 4) {
+                // 娴忚
+
+            }
+
+            this.getHDeptList()
+            this.getShiftList()
+        },
+        onReady() {
+            const query = uni.createSelectorQuery().in(this)
+            query.select("#buttons")
+                .boundingClientRect()
+                .select("#tabs")
+                .boundingClientRect()
+                .exec(res => {
+                    this.btnTop = Math.floor(res[0].top)
+                    this.tabsBottom = Math.ceil(res[1].bottom)
+                })
         }
     }
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJBillStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
new file mode 100644
index 0000000..73e55e9
--- /dev/null
+++ b/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
@@ -0,0 +1,434 @@
+<template>
+    <view class="content">
+        <view class="tabs">
+            <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
+            <!-- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view> -->
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="form" v-if="tabs == 0">
+            <view class="buttons" @tap="add">
+                <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+            </view>
+        </view>
+        <view class="form" v-if="tabs == 1">
+            <view class="form-item">
+                <view class="title">鍗曟嵁鍙�:</view>
+                <view class="right">
+                    <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+                </view>
+            </view>
+            <view class="form-item">
+                <view class="title">婧愬崟鍗曞彿:</view>
+                <view class="right">
+                    <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+                </view>
+            </view>
+            <view class="buttons">
+                <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
+                <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+            </view>
+        </view>
+
+        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+            <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.璁惧浠g爜">
+                        <text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
+                    </view>
+                    <view class="detail" v-if="item.璁惧鍚嶇О">
+                        <text>璁惧鍚嶇О锛�</text>{{item.璁惧鍚嶇О}}
+                    </view>
+                    <view class="detail" v-if="item.琛ㄥご澶囨敞">
+                        <text>琛ㄥご澶囨敞锛�</text>{{item.琛ㄥご澶囨敞}}
+                    </view>
+                    <view class="detail" v-if="item.寮�濮嬫棩鏈�">
+                        <text>寮�濮嬫棩鏈燂細</text>{{dayjs(item.寮�濮嬫棩鏈�).format("YYYY-MM-DD HH:mm:DD")}}
+                    </view>
+                    <view class="detail" v-if="item.缁撴潫鏃ユ湡">
+                        <text>缁撴潫鏃ユ湡锛�</text>{{dayjs(item.缁撴潫鏃ユ湡).format("YYYY-MM-DD HH:mm:DD")}}
+                    </view>
+                    <view class="detail" v-if="item.淇濆吇璁″垝缂栧彿">
+                        <text>淇濆吇璁″垝缂栧彿锛�</text>{{item.淇濆吇璁″垝缂栧彿}}
+                    </view>
+                    <view class="detail" v-if="item.淇濆吇璁″垝">
+                        <text>淇濆吇璁″垝锛�</text>{{item.淇濆吇璁″垝}}
+                    </view>
+                    <view class="detail" v-if="item.鎽樿">
+                        <text>鎽樿锛�</text>{{item.鎽樿}}
+                    </view>
+                    <view class="detail" v-if="item.鐐规瑙勬牸鎽樿">
+                        <text>鐐规瑙勬牸鎽樿锛�</text>{{item.鐐规瑙勬牸鎽樿}}
+                    </view>
+                    <view class="detail" v-if="item.hmainid">
+                        <text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.hmainid}}
+                    </view>
+                    <view class="detail" v-if="item.鏈�缁堢粨璁�">
+                        <text>鏈�缁堢粨璁猴細</text>{{item.鏈�缁堢粨璁簘}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <!-- <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+                        <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+                    </view> -->
+                    <view style="flex: 1"></view>
+                    <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+                        <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+        <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+            <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
+                @tap="showDetail = showDetail==index?-1:index">
+                <view class="card-detail">
+                    <view class="detail" v-if="item.鐘舵��">
+                        <text>鐘舵�侊細</text>{{item.鐘舵�亇}
+                    </view>
+                    <view class="detail" v-if="item.鍒跺崟浜�">
+                        <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+                    </view>
+                    <view class="detail" v-if="item.鏁伴噺">
+                        <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+                    </view>
+                    <view class="detail" v-if="item.婧愬崟鍗曞彿">
+                        <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡浠g爜">
+                        <text>鐗╂枡浠g爜锛�</text>{{item.鐗╂枡浠g爜}}
+                    </view>
+                    <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+                        <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+                    </view>
+                    <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+                        <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+                    </view>
+                    <view class="detail" v-if="item.缁勭粐">
+                        <text>缁勭粐锛�</text>{{item.缁勭粐}}
+                    </view>
+                </view>
+
+                <view class="more">
+                    <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+                        <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+                    </view>
+                    <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+                        <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+                    </view>
+                </view>
+            </uni-card>
+        </view>
+
+        <view class="over" v-if="!listData || listData.length == 0">鏆傛棤鏁版嵁</view>
+        <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
+        <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+    </view>
+</template>
+
+<script>
+    import {
+        getUserInfo
+    } from "@/utils/auth.js";
+    import BarCodePopupVue from "@/components/BarCodePopup/BarCodePopup.vue";
+    import {
+        CommonUtils
+    } from "../../../utils/common";
+    import dayjs from "dayjs";
+    export default {
+        data() {
+            return {
+                dayjs,
+                userInfo: getUserInfo(),
+                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+                tabs: 0,
+                urls: '/Web/GetEquipmentBillsList',
+                MvarReportTitle: '璁惧鐐规璁板綍鍗曠紦瀛�',
+                hform: {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3901,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    Type: "BY",
+                    sWhere: "",
+                },
+                sWhere: '',
+                listData: [],
+                showList: [],
+                showDetail: -1,
+
+                page: 1,
+            }
+        },
+        onShow() {
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            this.CheckModRight()
+            this.changeTab(0)
+            console.log(this.userInfo, uni.getStorageSync('HUserName'))
+        },
+        components: {
+            BarCodePopupVue
+        },
+        onReachBottom: function() {
+            this.page++
+            setTimeout(() => {
+                this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+            }, 100)
+        },
+        onPullDownRefresh: function() {
+            this.clear()
+            setTimeout(() => {
+                uni.stopPullDownRefresh();
+            }, 1000);
+        },
+        methods: {
+            async qrCodeDisplay(item) {
+                this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+                await this.$nextTick()
+                this.$refs.barcodePopup.open()
+            },
+            CheckModRight() {
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+                    data: {
+                        ModRightName: 'CE_OtherOut',
+                        HUserName: uni.getStorageSync('HUserName')
+                    },
+                    success: (res) => {
+                        if (res.data.count == 1) {} else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                });
+            },
+            getPage(page, list) {
+                let sindex = (parseInt(page) - 1) * 20
+                let eindex = parseInt(page) * 20
+                let newList = list.slice(sindex, eindex)
+                return newList
+            },
+            changeTab(e) {
+                this.tabs = e
+                this.page = 1
+                this.showList = []
+
+                if (this.tabs == 0) {
+                    this.urls = '/Web/GetEquipmentBillsList'
+                }
+                // if (this.tabs == 1) {
+                // 	this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+                // }
+                this.getList()
+            },
+            async getList() {
+                try {
+                    let res = await CommonUtils.doRequest2Async({
+                        url: this.urls,
+                        data: this.hform
+                    })
+
+                    let {
+                        count,
+                        data,
+                        Message
+                    } = res.data
+
+                    if (count == 1) {
+                        this.listData = data
+                        this.showList = this.getPage(this.page, data)
+                    } else {
+                        CommonUtils.showTips({
+                            title: "娓╅Θ鎻愮ず",
+                            message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${Message}`
+                        })
+                    }
+                } catch (err) {
+                    CommonUtils.showTips({
+                        title: "娓╅Θ鎻愮ず",
+                        message: `鑾峰彇璁惧鐐规璁板綍鍗曞け璐�: ${err}`
+                    })
+                }
+
+            },
+            search() {
+                this.sWhere = ''
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                console.log(this.hform)
+                // if (this.hform.HBillNo) {
+                //     this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+                // }
+                // if (this.hform.HSourceBillNo) {
+                //     this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+                // }
+                this.getList()
+            },
+            clear() {
+                this.listData = []
+                this.page = 1
+                this.showList = []
+
+                this.sWhere = ''
+                this.hform = {
+                    HBillNo: '',
+                    HSourceBillNo: '',
+                    HBillType: 3901,
+                    user: uni.getStorageSync('HUserName'),
+                    HStockOrgID: uni.getStorageSync('OrganizationID'),
+                    sWhere: '',
+                    Type: "BY"
+                }
+                this.getList()
+            },
+            add() {
+                uni.navigateTo({
+                    url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
+                })
+            },
+            //缂栬緫
+            edit(item) {
+                console.log(item)
+                uni.request({
+                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+                    data: {
+                        "HInterID": item.HInterID,
+                        "HBillNo": item.鍗曟嵁鍙�,
+                        "HBillType": this.hform.HBillType
+                    },
+                    success: (res) => {
+                        console.log(1, res);
+                        if (res.data.count == 1) {
+                            uni.navigateTo({
+                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
+                            })
+                        } else {
+                            uni.showToast({
+                                title: res.data.Message,
+                                icon: 'none'
+                            })
+                        }
+
+                    },
+                    fail: (res) => {
+                        console.log(res);
+                        uni.hideLoading()
+                        uni.showToast({
+                            title: '鎺ュ彛璇锋眰澶辫触',
+                            icon: 'none'
+                        })
+                    },
+                })
+            },
+            //鍒犻櫎
+            del(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
+                                data: {
+                                    HInterID: item.hmainid,
+                                    user: uni.getStorageSync('HUserName'),
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+            //鎾ら攢
+            revoke(item) {
+                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
+                uni.showModal({
+                    title: '鎻愮ず',
+                    content: '鏄惁纭鎾ら攢',
+                    success: (res) => {
+                        if (res.confirm) {
+                            console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+                            uni.request({
+                                url: this.serverUrl +
+                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+                                data: {
+                                    HInterID: item.HInterID,
+                                    HBillNo: item.鍗曟嵁鍙�,
+                                    HBillType: this.hform.HBillType,
+                                    HMaker: uni.getStorageSync('HUserName'),
+                                    MvarReportTitle: this.MvarReportTitle,
+                                },
+                                success: (res) => {
+                                    console.log(1, res);
+                                    if (res.data.count == 1) {
+                                        this.clear()
+                                    }
+                                    uni.showToast({
+                                        title: res.data.Message,
+                                        icon: 'none'
+                                    })
+                                },
+                                fail: (res) => {
+                                    console.log(res);
+                                    uni.hideLoading()
+                                    uni.showToast({
+                                        title: '鎺ュ彛璇锋眰澶辫触',
+                                        icon: 'none'
+                                    })
+                                },
+                            });
+                        } else if (res.cancel) {
+                            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+                        }
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/pages/MJGL/style/MJListStyle.scss"
+</style>
\ No newline at end of file
diff --git a/pages/MJGL/style/MJListStyle.scss b/pages/MJGL/style/MJListStyle.scss
index e69de29..e1ba798 100644
--- a/pages/MJGL/style/MJListStyle.scss
+++ b/pages/MJGL/style/MJListStyle.scss
@@ -0,0 +1,133 @@
+	.form {
+		width: 640rpx;
+		margin: 20rpx auto;
+		margin-top: 90rpx;
+	}
+
+	.tabs {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		z-index: 9;
+		display: flex;
+		background-color: #e5e5e5;
+
+		view {
+			width: 50%;
+			font-size: 30rpx;
+			color: #333;
+			text-align: center;
+			padding: 16rpx 0;
+		}
+
+		.on {
+			color: #3a78ff;
+			font-weight: bold;
+			border-bottom: 3px solid #3a78ff;
+		}
+	}
+
+	.buttons {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20rpx;
+
+		button {
+			border-radius: 50rpx;
+			width: 180rpx;
+			height: 66rpx;
+			line-height: 66rpx;
+			font-size: 28rpx;
+		}
+
+		.btn-a {
+			background-color: #acacac;
+			color: #fff;
+		}
+
+		.btn-b {
+			background-color: #41a863;
+			color: #fff;
+		}
+
+		.btn-c {
+			background-color: #3a78ff;
+			color: #fff;
+		}
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		padding: 6rpx 0;
+
+		.title {
+			width: 180rpx;
+
+			text {
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.right {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #acacac;
+		}
+
+		.righton {
+			width: 450rpx;
+			border-radius: 22rpx;
+			border: 1px solid #e4e4e4;
+			background-color: #e4e4e4;
+		}
+
+		input {
+			width: 100%;
+			padding: 8rpx 20rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.list {
+		width: 100%;
+
+		.card-detail {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			line-height: 120%;
+
+			.detail {
+				// width: 50%;
+				font-size: 26rpx;
+				margin-bottom: 12rpx;
+				color: #555;
+				margin-right: 20rpx;
+
+				text {
+					color: #999;
+					font-size: 26rpx;
+				}
+			}
+		}
+
+		.more {
+			color: #888;
+			font-size: 26rpx;
+			display: flex;
+			border-top: 1px solid #eee;
+			padding-top: 20rpx;
+
+			.part {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
\ No newline at end of file
diff --git a/pages/index/tab3.vue b/pages/index/tab3.vue
index 48b43a1..f5ae712 100644
--- a/pages/index/tab3.vue
+++ b/pages/index/tab3.vue
@@ -154,6 +154,13 @@
 					},
                     {
                         "img": "../../static/icon/icon8.png",
+                        "text": "璁惧淇濆吇璁板綍鍗曞垪琛�",
+                        "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList",
+                        "id": 52,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
                         "text": "璁惧淇濆吇璁板綍鍗�",
                         "url": "/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill",
                         "id": 53,
@@ -161,6 +168,13 @@
                     },
                     {
                         "img": "../../static/icon/icon8.png",
+                        "text": "璁惧鐐规璁板綍鍗曞垪琛�",
+                        "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList",
+                        "id": 54,
+                        "hidden": false
+                    },
+                    {
+                        "img": "../../static/icon/icon8.png",
                         "text": "璁惧鐐规璁板綍鍗�",
                         "url": "/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill",
                         "id": 55,

--
Gitblit v1.9.1