Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

yusijie

2025-12-31 69df57b2e2e9e215d440bb017af6cd4a011eb427

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 components/BillListPopup/BillListPopup.vue

@@ -10,6 +10,11 @@
                    <view class="title"><text>物料: </text></view>
                    <view class="right"><input type="text" :focus="enablefocus" v-model="HMater"
                            @confirm="getBillList" /></view>
                    <view class="icon-wrapper-big">
                        <uni-icons class="right-icon" 
                        :class="'enable-icon-button'"
                        type="scan" size="20" @click="toScanCode"></uni-icons>
                    </view>
                </view>
                <view class="search-condition">
                    <view class="title"><text>关联项: </text></view>
@@ -71,6 +76,9 @@
        CommonUtils
    } from '../../utils/common';
    import dayjs from 'dayjs';
    import {
        MpaasScan
    } from "../../utils/mpaasScan";
    export default {
        name: "BillListPopup",
        data() {
@@ -115,6 +123,15 @@
            event: 'change'
        },
        methods: {
            //扫码
            toScanCode() {
                MpaasScan.scanCode((res) => {
                    if (res) {
                        this.HMater = res;
                        this.getBillList();
                    }
                });
            },
            popupChangeHandler(e) {
                if (e.show === true) {
                    this.getBillList()
@@ -347,4 +364,10 @@
            background-color: rgba(0, 122, 255, 0.2);
        }
    }
    .enable-icon-button {
        background-color: #3a78ff;
        padding: 6rpx;
        color: #fff;
        border-radius: 100%;
    }
</style>

 components/ZLGL/CheckProjectPopup.vue

@@ -5,7 +5,7 @@
                <view class="search-condition">
                    <view class="title"><text>日期: </text></view>
                    <view class="daterange" style="flex: 1;">
                        <view class="right general">
                        <!-- <view class="right general">
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HBeginDate">
                                <view>{{HBeginDate}}</view>
                            </uni-datetime-picker>
@@ -15,7 +15,7 @@
                            <uni-datetime-picker type="date" :clear-icon="false" v-model="HEndDate">
                                <view>{{HEndDate}}</view>
                            </uni-datetime-picker>
                        </view>
                        </view> -->
                    </view>
                </view>
                <view class="buttons">
@@ -109,8 +109,8 @@
                panelHeight: 0,
                HProcessName: '',
                HMaterName: '',
                HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                // HBeginDate: dayjs(new Date()).subtract(30, 'd').format("YYYY-MM-DD"),
                // HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                multiSouceBillList: []
            };
        },
@@ -161,9 +161,9 @@
            getsWhere() {
                let sWhere =
                    ` and ISNULL(审核人,'')!=''  and HOrgID  = '${ uni.getStorageSync("OrganizationID")}'`
                if (this.HBeginDate && this.HEndDate) {
                    sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                }
                // if (this.HBeginDate && this.HEndDate) {
                //     sWhere += ` and  CONVERT(varchar(100),日期, 23) between '${this.HBeginDate}' and '${this.HEndDate}'`
                // }

                if (this.HMaterName && this.HProcessName) {
                    sWhere += ` and 物料名称 = '${this.HMaterName}' and 工序名称 = '${this.HProcessName}'`

 pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue

@@ -94,7 +94,7 @@
                <view class="form-item">
                    <view class="title">源单类型:</view>
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
                        <picker :range="arrayHMainSourceBillType" 
                            @change="HMainSourceBillTypeChange">
                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                                placeholder="请选择源单类型" />
@@ -232,12 +232,12 @@
                    HBarCode: '',
                    HInterID: '',
                    HBillType: 3802,
                    HWHName: getUserInfo().HWHName,
                    HWHName: getUserInfo().HWhName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
                    HKeeperName: getUserInfo().User,
                    HKeeperID: getUserInfo().User,//发料人
                    HKeeperName: getUserInfo().HKeeperName,
                    HKeeperID: getUserInfo().HKeeperID,//发料人
                    HSecManagerName: getUserInfo().HEmpName,
                    HSecManagerID: getUserInfo().HEmpID,//领料人
                    HDeptName: getUserInfo().HDept,

 pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue

@@ -273,7 +273,7 @@
                    HBarCode: '',
                    HInterID: '',
                    HBillType: 3803,
                    HWHName: getUserInfo().HWHName,
                    HWHName: getUserInfo().HWhName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
@@ -282,8 +282,8 @@
                    HDeptID: getUserInfo().HDeptID,
                    HSecManagerID: getUserInfo().HEmpID,
                    HSecManagerName:  getUserInfo().HEmpName,
                    HKeeperID: 0,
                    HKeeperName: '',
                    HKeeperName: getUserInfo().HKeeperName,
                    HKeeperID: getUserInfo().HKeeperID,//发料人
                    //源单信息
                    HMainSourceBillType: uni.getStorageSync('billType_3803') ? uni.getStorageSync('billType_3803') :
                        3849,

 pages/ZLGL/QualityReportStep/QualityReportStepBill.vue

@@ -511,7 +511,8 @@
                        HBarCode: HBarCode,
                        HInterID: 0,
                        HEntryID: 0,
                        Mode: 1 //扫码模式
                        Mode: 1 ,//扫码模式
                        user:getUserInfo()["Czymc"]
                    }
                })
            
@@ -571,7 +572,8 @@
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 //选单模式
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })
            

 pages/ZLGL/chuchangjiaoyandan/QC_OutCompCheckBill.vue

@@ -775,7 +775,8 @@
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 //选单模式
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })


 pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue

@@ -769,7 +769,8 @@
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 //选单模式
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })

@@ -868,7 +869,8 @@
                        HBarCode: HBarCode,
                        HInterID: 0,
                        HEntryID: 0,
                        Mode: 1 //扫码模式
                        Mode: 1 ,//扫码模式
                        user:getUserInfo()["Czymc"]
                    }
                })


 pages/ZLGL/mojianjianyan/lastPieceCheckBill.vue

@@ -696,7 +696,8 @@
                        HBarCode: HBarCode,
                        HInterID: 0,
                        HEntryID: 0,
                        Mode: 1 //扫码模式
                        Mode: 1, //扫码模式
                        user:getUserInfo()["Czymc"]
                    }
                })
            
@@ -709,7 +710,7 @@
                if (count == 1) {
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['HMaterNumber']
                    this.hform.HMaterNumber = data[0]['产品代码']
                    this.hform.HMainSourceBillNo = data[0]['HBillNo']
                    this.hform.HSourceBillNo = data[0]['HBillNo']
                    this.hform.HMainSourceInterID = data[0].HInterID
@@ -739,6 +740,69 @@
                    })
                }
            },
            async HandleBillSelectComplete(e) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
                        data: {
                            HBillType: this.hform.HBillType,
                            HSourceBillType: this.hform.HSourceBillType,
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })
			
                    let {
                        data,
                        Message,
                        count
                    } = res.data
                    if (count == 1) {
                        console.log('获取源单：', data)
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
                        this.hform.HMainSourceBillNo = data[0]['HBillNo']
                        this.hform.HSourceBillNo = data[0]['HBillNo']
                        this.hform.HMainSourceInterID = data[0].HInterID
                        this.hform.HMainSourceEntryID = data[0].HEntryID
                        this.hform.HQCSchemeName = data[0].检验方案名称
                        this.hform.HQCSchemeID = data[0].检验方案ID
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hform.HICMOBillNo= data[0].任务单号
                        this.hform.HICMOInterID= data[0].HICMOInterID
                        this.hform.HICMOEntryID= data[0].HICMOEntryID
                        this.hform.HICMOQty= data[0].生产数量
                        this.hform.HProcExchBillNo= data[0].单据号
                        this.hform.HProcExchInterID= data[0].HInterID
                        this.hform.HProcExchEntryID= data[0].HEntryID
                        this.hform.HProcExchQty= data[0].流转卡数量
                        this.hform.HSourceName= data[0].生产资源
                        this.hform.HSourceID= data[0].HSourceID
                        this.hform.HProcID= data[0].HProcID
                        this.hform.HProcName= data[0].当前工序
			
                        this.get_CheckItem();
                        this.hasSourceBill = true
                        this.$refs['billList'].exit()
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: Message
                        })
                    }
			
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: "源单下推错误: " + err
                    })
                }
			
            },
            async GetCheckItemID() {
                if (!this.hform.HMaterName && !this.hform.HProcName) {
                    try {

 pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue

@@ -782,7 +782,8 @@
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 //选单模式
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })

@@ -880,7 +881,8 @@
                        HBarCode: HBarCode,
                        HInterID: 0,
                        HEntryID: 0,
                        Mode: 1 //扫码模式
                        Mode: 1, //扫码模式
                        user:getUserInfo()["Czymc"]
                    }
                })


 pages/ZLGL/shoujianjianyan/firstCheckBill.vue

@@ -705,7 +705,7 @@
            toScanCode() {
                MpaasScan.scanCode((res) => {
                    if (res) {
                        this.getSourceBillInfo(HBarCode);
                        this.getSourceBillInfo(res);
                    }
                });
            },
@@ -719,7 +719,8 @@
                        HBarCode: HBarCode,
                        HInterID: 0,
                        HEntryID: 0,
                        Mode: 1 //扫码模式
                        Mode: 1, //扫码模式
                        user:getUserInfo()["Czymc"]
                    }
                })
            
@@ -732,7 +733,7 @@
                if (count == 1) {
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['HMaterNumber']
                    this.hform.HMaterNumber = data[0]['产品代码']
                    this.hform.HMainSourceBillNo = data[0]['HBillNo']
                    this.hform.HSourceBillNo = data[0]['HBillNo']
                    this.hform.HMainSourceInterID = data[0].HInterID
@@ -772,6 +773,69 @@
                // }
                
            },
            async HandleBillSelectComplete(e) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
                        data: {
                            HBillType: this.hform.HBillType,
                            HSourceBillType: this.hform.HSourceBillType,
                            HBarCode: "",
                            HInterID: e?.HInterID,
                            HEntryID: e?.HEntryID,
                            Mode: 2 ,//选单模式
                            user:getUserInfo()["Czymc"]
                        }
                    })
			
                    let {
                        data,
                        Message,
                        count
                    } = res.data
                    if (count == 1) {
                        console.log('获取源单：', data)
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
                        this.hform.HMainSourceBillNo = data[0]['HBillNo']
                        this.hform.HSourceBillNo = data[0]['HBillNo']
                        this.hform.HMainSourceInterID = data[0].HInterID
                        this.hform.HMainSourceEntryID = data[0].HEntryID
                        this.hform.HQCSchemeName = data[0].检验方案名称
                        this.hform.HQCSchemeID = data[0].检验方案ID
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hform.HICMOBillNo= data[0].任务单号
                        this.hform.HICMOInterID= data[0].HICMOInterID
                        this.hform.HICMOEntryID= data[0].HICMOEntryID
                        this.hform.HICMOQty= data[0].生产数量
                        this.hform.HProcExchBillNo= data[0].单据号
                        this.hform.HProcExchInterID= data[0].HInterID
                        this.hform.HProcExchEntryID= data[0].HEntryID
                        this.hform.HProcExchQty= data[0].流转卡数量
                        this.hform.HSourceName= data[0].生产资源
                        this.hform.HSourceID= data[0].HSourceID
                        this.hform.HProcID= data[0].HProcID
                        this.hform.HProcName= data[0].当前工序
			
                        this.get_CheckItem();
                        this.hasSourceBill = true
                        this.$refs['billList'].exit()
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: Message
                        })
                    }
			
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: "源单下推错误: " + err
                    })
                }
			
            },
            async GetCheckItemID() {
                if (!this.hform.HMaterName && !this.hform.HProcName) {
                    try {

 pages/index/mine.vue

@@ -27,12 +27,16 @@

<script>
    import { getUserInfo } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '@/utils/common'
    export default {
        data() {
            return {
                userInfo:getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
                vers:uni.getStorageSync('vers'),
                checkCount:0,
              itemData:[{
                  img:'../../static/icon00.png',
                  text:'待我审核',
@@ -69,8 +73,11 @@
              ]
            }
        },
        onLoad() {
        async onLoad() {
            console.log(this.userInfo)
            await this.cmdSearchFirst()
            await this.cmdSearchLast()
            this.itemData[0].text = `待我审核(${this.checkCount})`
        },
        methods: {
            toUrl(item){
@@ -100,8 +107,84 @@
                        }
                    }
                });
            },
            //获取待审批总数首件
            async cmdSearchFirst() {
			    
                try {
                    let res = await CommonUtils.doRequest2Sync({
                        url: '/LEMS/CheckFlowList',
                        data: {
                            "sWhere": ' ',
                            "billType":8505,
                            "type":2,
                            "userid": getUserInfo()["Czybm"]
                        },
                    })
                    if (!res) {
                        return
                    }
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count > 0) {
                        this.checkCount += res.data.data.length
                        console.log(res.data.data.length)
			            
                    } else {
                        uni.showToast({
                            icon: 'none',
                            title: Message
                        })
                    }
                } catch (err) {
                    console.warn(err);
                    uni.showToast({
                        title: '接口请求失败:' + err,
                        icon: 'none'
                    })
                }
            },
            //末件全部
            async cmdSearchLast(){
                try {
                    let res = await CommonUtils.doRequest2Sync({
                        url: '/LEMS/CheckFlowList',
                        data: {
                            "sWhere": ' ',
                            "billType":8507,
                            "type":2,
                            "userid": getUserInfo()["Czybm"]
                        },
                    })
                    if (!res) {
                        return
                    }
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count > 0) {
                        this.checkCount += res.data.data.length
				        
                    } else {
                        uni.showToast({
                            icon: 'none',
                            title: Message
                        })
                    }
                } catch (err) {
                    console.warn(err);
                    uni.showToast({
                        title: '接口请求失败:' + err,
                        icon: 'none'
                    })
                }
            }
        }
        }
    }
</script>


 pages/index/tab4.vue

@@ -102,7 +102,7 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "生产入库校验单",
                        "text": "生产入库检验单",
                        "url": "/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2",
                        "id": 53,
                        "hidden": false

 pages/mujvzhuangtai/mujvzhuangtai.vue

@@ -3,13 +3,15 @@
        <view class="container">
            <view class="warehouse-selector">
                <view class="left">当前仓库：</view>
                <picker :range="warehouseRange" :value="warehouseSelected" @change="warehouseChange">
                    <view class="right">
                        <input type="text" disabled v-model="warehouseSelected" placeholder="请选择当前仓库">
                        <uni-icons type="forward" color="#808080"
                            style="border-left: 1rpx solid #aaaaaa;padding: 0 8rpx;" size="18"></uni-icons>
                    </view>
                </picker>
                <zxz-uni-data-select
                    v-model="HWHID"
                    dataKey="HName"
                    dataValue="HItemID"
                    :filterable="true"
                    :localdata="HWHList"
                    :clear="false"
                    @change="warehouseChange"
                ></zxz-uni-data-select>
            </view>

            <!-- 分割线 -->
@@ -31,6 +33,9 @@
                            </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['设计寿命']}}
@@ -80,12 +85,12 @@
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import { CommonUtils } from '@/utils/common';
    export default {
        data() {
            return {
                warehouseRange: [],
                warehouseIDRange: [],
                warehouseSelected: "",
                HWHList: [],
                HWHID:getUserInfo()["HWhID"],
                userInfo: getUserInfo(),
                organInfo: {
                    id: uni.getStorageSync("OrganizationID") || "",
@@ -130,10 +135,8 @@
                })
                uni.hideLoading()
            },
            async warehouseChange(e) {
                let index = e.detail.value
                this.warehouseSelected = this.warehouseRange[index]
                let id = this.warehouseIDRange[index]
            async warehouseChange() {
                let id = this.HWHID
                this.moulds = []
                this.doRequest(
                    "/Web/Get_Sc_MouldStatusAnalysisList", {
@@ -163,36 +166,27 @@
                )
            },
            async initWHSelector() {
                this.doRequest(
                    "/Gy_Warehouse/listTree", {
                        sWhere: "",
                        user: this.userInfo.Czymc,
                        Organization: this.organInfo.name
                    },
                    function(res) {
                        console.log(res)
                        let {
                            count,
                            data
                        } = res.data
                        this.warehouseRange = []
                        this.warehouseIDRange = []
                        if (count > 0) {
                            JSON.parse(data)[0].children.forEach(item => {
                                this.warehouseRange.push(`${item.Number}-${item.Title}`)
                                this.warehouseIDRange.push(item.Id)
                            })
                        }

                        this.warehouseChange({
                            detail: {
                                value: 0
                            }
                        })
                    },
                    function(err) {
                        console.error(err)
                    },
                CommonUtils.doRequest(
                    "/Web/GetWarehouseList_Json_New", {
                        Warehouse: "",
                        HOrgID: uni.getStorageSync('OrganizationID')
                    },
                    (res) => {
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count == 1) {
                            this.HWHList = data
                            this.warehouseChange();
                        } else {
                            uni.showToast({
                                title: '仓库数据请求失败',
                                icon: 'none'
                            })
                        }
                    },
                )
            },
            ToDetail(item) {
@@ -205,37 +199,35 @@
            await this.initWHSelector()
        },
        onPullDownRefresh() {
            let whIndex = this.warehouseRange.indexOf(this.warehouseSelected);
            if(whIndex != -1){
                let id = this.warehouseIDRange[whIndex]
                this.moulds = []
                this.doRequest(
                    "/Web/Get_Sc_MouldStatusAnalysisList", {
                        sWhere: ` and HWHID = ${id}`,
                        user: this.userInfo.Czymc,
                        Organization: this.organInfo.name
                    },
                    function(res) {
                        console.log(res)
                        let res1 = res.data
                        let {
                            data,
                            count
                        } = res1
                        if (count > 0) {
                            console.log(data)
                            this.moulds = data.map(item => {
                                return Object.assign(item, {
                                    imgSrc: "../../static/mold.png"
                                })
            let id = this.HWHID
            this.moulds = []
            this.doRequest(
                "/Web/Get_Sc_MouldStatusAnalysisList", {
                    sWhere: ` and HWHID = ${id}  and HUSEORGID = ${uni.getStorageSync("OrganizationID")}`,
                    user: this.userInfo.Czymc,
                    Organization: this.organInfo.name
                },
                function(res) {
                    console.log(res)
                    let res1 = res.data
                    let {
                        data,
                        count
                    } = res1
                    if (count > 0) {
                        console.log(data)
                        this.moulds = data.map(item => {
                            return Object.assign(item, {
                                imgSrc: "../../static/mold.png"
                            })
                        }
                    },
                    function(err) {
                        console.error(err)
                        })
                    }
                )
            }
                },
                function(err) {
                    console.error(err)
                }
            )
			
            uni.stopPullDownRefresh()
        }
    }

 pages/qijvguzhangdengji/mouldMistakeBill.vue

@@ -803,9 +803,10 @@
                    message = '未填写部门'
                } else if (!this.hform.HEmpName) {
                    message = '未填写发现人'
                } else if (!this.hform.HManagerName) {
                    message = '未填写负责人'
                }
                } 
                // else if (!this.hform.HManagerName) {
    //                 message = '未填写负责人'
    //             }

                if (!message) {
                    return true

 utils/auth.js

@@ -74,7 +74,7 @@
}
export function getUserInfo() {
  let userinfo = uni.getStorageSync('userinfo');
  // console.log('userinfo', userinfo)
  console.log('userinfo', userinfo)
  if (userinfo) {
    return JSON.parse(userinfo);
  }