wtt
2 天以前 44095eec404a9a1e0a45f0b8daeee1b5b1c2b017
app出战汇报,委外接入发出报工优化
1个文件已添加
9个文件已修改
678 ■■■■ 已修改文件
components/ProcListPopup/ProcListPopup.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/StationOutBillPopup/StationEntrustOutBillListPopup.vue 85 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/StationOutBillPopup/StationOutBillListPopup.vue 392 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/Cj_StationOutBill.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/Cj_StationOutBillList.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxIn/Cj_StationEntrustInBill.vue 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxIn/Cj_StationEntrustInBillList.vue 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/ProcListPopup/ProcListPopup.vue
@@ -19,6 +19,10 @@
                                <view class="left">工序序列: </view>
                                <view class="right">{{bill['工序序列']}}</view>
                            </view>
                            <view class="item">
                                <view class="left">可汇报数量: </view>
                                <view class="right">{{bill['可汇报数量']}}</view>
                            </view>
                        </uni-card>
                    </view>
                    <view class="over" v-show="HBillList.length == 0">暂无数据</view>
components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
@@ -110,12 +110,10 @@
        },
        mounted() {
            this.getNewData();               // 获取新单号
            this.getHSourceList();            // 生产资源
            this.getHGroupList();              // 生产班组
            this.getHEmpList();                 // 操作员
            this.getHCenterList();               // 工作中心
            this.getDefValByUser();              // 用户默认值
        },
        methods: {
@@ -126,7 +124,6 @@
                    this.hform.HQty = '';
                    this.hform.HBadCount = 0;
                    this.hform.HWasterQty = 0;
                    this.getNewData();
                }
            },
@@ -139,13 +136,13 @@
                }
                else
                {
                this.hform.HInterID=item.HInterID
                console.log(this.hform.HInterID)
                    this.hform.HInterID=item.HInterID
                    console.log(this.hform.HInterID)
                }
                this.hform.HQty=item.接收合格数量
                this.hform.HWasterQty=item.报废数量
                this.hform.HBadCount=item.不良数量
                this.hform.HSourceID=item.HSourceID
                this.hform.HSourceID=item.HSourceID
                this.hform.HSourceName=item.生产资源
@@ -158,42 +155,7 @@
                this.$refs.popup.open();
            },
            // 通过登录用户获取默认值
            getDefValByUser() {
                uni.request({
                    url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
                    method: "GET",
                    async: false,
                    data: {
                        "Czybm": this.userInfo.Czybm,
                        "Czymc": this.userInfo.Czymc
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            var data = res.data.data[0];
                            this.hform.HGroupID = data.HGroupID;
                            this.hform.HGroupName = data.生产班组名称;
                            this.hform.HEmpID = data.HEmpID;
                            this.hform.HEmpName = data.操作员名称;
                            this.hform.HSourceID = data.HSourceID;
                            this.hform.HSourceName = data.生产资源名称;
                            this.hform.HCenterID = data.HWorkCenterID;
                            this.hform.HCenterName = data.工作中心名称;
                        } else {
                            uni.showToast({
                                title: '获取默认值失败',
                                icon: 'none'
                            });
                        }
                    },
                    fail: () => {
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        });
                    },
                });
            },
            // 生产资源列表
            getHSourceList() {
@@ -205,9 +167,7 @@
                            this.HSourceNameList = res.data.data.Gy_Source;
                            this.arrayHSourceName = this.HSourceNameList.map(item => item.生产资源);
                            this.$forceUpdate();
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                        }
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
@@ -229,9 +189,7 @@
                            this.HGroupNameList = res.data.data;
                            this.arrayHGroupName = this.HGroupNameList.map(item => item.班组);
                            this.$forceUpdate();
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                        }
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
@@ -257,9 +215,7 @@
                            this.HEmpNameList = res.data.data;
                            this.arrayHEmpName = this.HEmpNameList.map(item => item.HName);
                            this.$forceUpdate();
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                        }
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
@@ -281,9 +237,7 @@
                            this.HCenterNameList = res.data.data.Gy_Source;
                            this.arrayHCenterName = this.HCenterNameList.map(item => item.工作中心);
                            this.$forceUpdate();
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                        }
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
@@ -295,24 +249,6 @@
                if (found) this.hform.HCenterID = found.HItemID;
            },
            // 获取新单据号(内部使用)
            getNewData() {
                uni.request({
                    url: this.serverUrl + '/Web/GetMAXNum',
                    data: { HBillType: '3791' },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.hform.HInterID = res.data.data[0].HInterID;
                            this.hform.HBillNo = res.data.data[0].HBillNo;
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            },
            // 提交前校验
            preSubmitCheck() {
@@ -373,7 +309,10 @@
                                this.$refs.popup.close();
                            }, 1500);
                        } else {
                            uni.showToast({ title: res.data.Message, icon: 'none' });
                            CommonUtils.showTips({
                                title: "温馨提示",
                                message: `${res.data.Message}`,
                            });
                        }
                    },
                    fail: () => {
components/StationOutBillPopup/StationOutBillListPopup.vue
New file
@@ -0,0 +1,392 @@
<template>
    <view>
        <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
            <view class="form">
                <!-- 合格数量 -->
                <view class="form-item">
                    <view class="title">合格数量:</view>
                    <view class="right">
                        <input v-model="hform.HQty" placeholder="请输入合格数量" />
                    </view>
                </view>
                <!-- 不良数量 -->
                <view class="form-item">
                    <view class="title">不良数量:</view>
                    <view class="right">
                        <input v-model="hform.HBadCount" placeholder="请输入不良数量" />
                    </view>
                </view>
                <!-- 报废数量 -->
                <view class="form-item">
                    <view class="title">报废数量:</view>
                    <view class="right">
                        <input v-model="hform.HWasterQty" placeholder="请输入报废数量" />
                    </view>
                </view>
                <!-- 生产资源 -->
                <view class="form-item">
                    <view class="title">生产资源:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHSourceName" placeholder="请选择生产资源" v-model="hform.HSourceName"
                            @input="HSourceNameChange"></uni-combox>
                    </view>
                </view>
                <!-- 工作中心
                <view class="form-item">
                    <view class="title">工作中心:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHCenterName" placeholder="请选择工作中心" v-model="hform.HCenterName"
                            @input="HCenterNameChange"></uni-combox>
                    </view>
                </view> -->
                <!-- 生产班组 -->
                <view class="form-item">
                    <view class="title">生产班组:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHGroupName" placeholder="请选择生产班组" v-model="hform.HGroupName"
                            @input="HGroupNameChange"></uni-combox>
                    </view>
                </view>
                <!-- 操作员 -->
                <view class="form-item">
                    <view class="title"><text>*</text>操作员:</view>
                    <view class="right">
                        <uni-combox :candidates="arrayHEmpName" placeholder="请选择操作员" v-model="hform.HEmpName"
                            @input="HEmpNameChange"></uni-combox>
                    </view>
                </view>
                <!-- 底部提交按钮 -->
                <view class="bottom-btn">
                    <button class="btn-a" size="mini" @tap="submit">提交</button>
                </view>
            </view>
        </uni-popup>
    </view>
</template>
<script>
    import getDateTime from '@/utils/getdateTime.js';
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '../../utils/common';
    export default {
        name: "BillListPopup_gongxuOut",
        data() {
            return {
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                // 下拉框候选数组
                arrayHSourceName: [],
                HSourceNameList: [],
                arrayHGroupName: [],
                HGroupNameList: [],
                arrayHEmpName: [],
                HEmpNameList: [],
                arrayHCenterName: [],
                HCenterNameList: [],
                hform: {
                    HInterID: '',          // 内部使用,不展示
                    HBillNo: '',            // 内部使用,不展示
                    HQty: '',
                    HBadCount: 0,
                    HWasterQty: 0,
                    HSourceName: '',
                    HSourceID: 0,
                    HCenterName: '',
                    HCenterID: 0,
                    HGroupName: '',
                    HGroupID: 0,
                    HEmpName: '',
                    HEmpID: 0,
                }
            }
        },
        mounted() {
            this.getHSourceList();            // 生产资源
            this.getHGroupList();              // 生产班组
            this.getHEmpList();                 // 操作员
            this.getHCenterList();               // 工作中心
        },
        methods: {
            // 弹窗开关处理
            popupChangeHandler(e) {
                if (e.show === false) {
                    // 关闭时重置数量
                    this.hform.HQty = '';
                    this.hform.HBadCount = 0;
                    this.hform.HWasterQty = 0;
                }
            },
            // 打开弹窗
            showPopup(item) {
                if(item.hmainid!="0")
                {
                    this.hform.HInterID=item.hmainid
                    console.log(this.hform.HInterID)
                }
                else
                {
                    this.hform.HInterID=item.HInterID
                    console.log(this.hform.HInterID)
                }
                this.hform.HQty=item.出站数量
                this.hform.HWasterQty=item.报废数量
                this.hform.HBadCount=item.不良数量
                this.hform.HSourceID=item.HSourceID
                this.hform.HSourceName=item.生产资源
                // this.hform.HCenterID=item.HCenterID
                // this.hform.HCenterName=item.工作中心
                this.hform.HGroupID=item.HGroupID
                this.hform.HGroupName=item.生产班组
                this.hform.HEmpID=item.HEmpID
                this.hform.HEmpName=item.操作员
                this.$refs.popup.open();
            },
            // 生产资源列表
            getHSourceList() {
                uni.request({
                    url: this.serverUrl + '/api/newBill/getSourceList',
                    data: { sWhere: '' },
                    success: (res) => {
                        if (res.data.code == 1) {
                            this.HSourceNameList = res.data.data.Gy_Source;
                            this.arrayHSourceName = this.HSourceNameList.map(item => item.生产资源);
                            this.$forceUpdate();
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            },
            HSourceNameChange(e) {
                const found = this.HSourceNameList.find(item => item.生产资源 == e);
                if (found) this.hform.HSourceID = found.HItemID;
            },
            // 生产班组列表
            getHGroupList() {
                uni.request({
                    url: this.serverUrl + '/Web/GetProductionTeamList_Json',
                    data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HGroupNameList = res.data.data;
                            this.arrayHGroupName = this.HGroupNameList.map(item => item.班组);
                            this.$forceUpdate();
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            },
            HGroupNameChange(e) {
                const found = this.HGroupNameList.find(item => item.班组 == e);
                if (found) this.hform.HGroupID = found.HItemID;
            },
            // 操作员列表
            getHEmpList() {
                uni.request({
                    url: this.serverUrl + '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: 0,
                        HDeptID: uni.getStorageSync("HDeptID")
                    },
                    success: (res) => {
                        if (res.data.count == 1) {
                            this.HEmpNameList = res.data.data;
                            this.arrayHEmpName = this.HEmpNameList.map(item => item.HName);
                            this.$forceUpdate();
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            },
            HEmpNameChange(e) {
                const found = this.HEmpNameList.find(item => item.HName == e);
                if (found) this.hform.HEmpID = found.HItemID;
            },
            // 工作中心列表
            getHCenterList() {
                uni.request({
                    url: this.serverUrl + '/api/newBill/getWorkCenterList',
                    data: { sWhere: '' },
                    success: (res) => {
                        if (res.data.code == 1) {
                            this.HCenterNameList = res.data.data.Gy_Source;
                            this.arrayHCenterName = this.HCenterNameList.map(item => item.工作中心);
                            this.$forceUpdate();
                        }
                    },
                    fail: () => {
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            },
            HCenterNameChange(e) {
                const found = this.HCenterNameList.find(item => item.工作中心 == e);
                if (found) this.hform.HCenterID = found.HItemID;
            },
            // 提交前校验
            preSubmitCheck() {
                if (CommonUtils.isEmpty(this.hform.HQty)) {
                    return { pass: false, message: '合格数量不能为空' };
                }
                if (CommonUtils.isEmpty(this.hform.HBadCount)) {
                    return { pass: false, message: '不良数量不能为空' };
                }
                if (CommonUtils.isEmpty(this.hform.HWasterQty)) {
                    return { pass: false, message: '报废数量不能为空' };
                }
                if (!this.hform.HEmpName) {
                    return { pass: false, message: '请选择操作员' };
                }
                return { pass: true, message: '' };
            },
            // 提交
            submit() {
                const { pass, message } = this.preSubmitCheck();
                if (!pass) {
                    return uni.showToast({ icon: 'none', title: message });
                }
                uni.showLoading({ title: '提交中...' });
                const submitData = {
                    HInterID: this.hform.HInterID,
                    HBillNo: this.hform.HBillNo,
                    HQty: this.hform.HQty,
                    HBadCount: this.hform.HBadCount,
                    HWasterQty: this.hform.HWasterQty,
                    HSourceID: this.hform.HSourceID,
                    HSourceName: this.hform.HSourceName,
                    HCenterID: 0,
                    HCenterName: '',
                    HGroupID: this.hform.HGroupID,
                    HGroupName: this.hform.HGroupName,
                    HEmpID: this.hform.HEmpID,
                    HEmpName: this.hform.HEmpName,
                };
                uni.request({
                    url: this.serverUrl + '/Cj_StationOutBill/setOtherProperty',
                    method: 'POST',
                    data: {
                        oMain: JSON.stringify(submitData)+ ";" + uni.getStorageSync('HUserName'),
                    },
                    success: (res) => {
                        uni.hideLoading();
                        if (res.data.count == 1) {
                            uni.showToast({ title: '提交成功', icon: 'none' });
                            setTimeout(() => {
                                this.$refs.popup.close();
                            }, 1500);
                        } else {
                            CommonUtils.showTips({
                                title: "温馨提示",
                                message: `${res.data.Message}`,
                            });
                        }
                    },
                    fail: () => {
                        uni.hideLoading();
                        uni.showToast({ title: '接口请求失败', icon: 'none' });
                    },
                });
            }
        }
    }
</script>
<style lang="scss" scoped>
    .form {
        box-sizing: border-box;
        border-radius: 15rpx 15rpx 0 0;
         padding: 20rpx 20rpx 160rpx 20rpx;
        background-color: #fff;
        display: flex;
        flex-direction: column;
        gap: 10rpx;
        overflow-y: auto;
        // max-height: 70vh;
        max-height: calc(80vh - 120px);
    }
    .form-item {
        display: flex;
        align-items: center;
        font-size: 30rpx;
        padding: 6rpx 0;
        .title {
            width: 180rpx;
            flex-shrink: 0;
            text {
                color: red;
                font-weight: bold;
            }
        }
        .right {
            flex: 1;
            border-radius: 22rpx;
            border: 1px solid #acacac;
        }
        input, .uni-combox {
            width: 100%;
            padding: 8rpx 20rpx;
            font-size: 30rpx;
        }
    }
    .bottom-btn {
        width: 100%;
        box-sizing: border-box;
        position: fixed;
        bottom: 0;
        left: 0;
        background-color: #fff;
        box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
        padding: 30rpx 40rpx 40rpx 40rpx;
        display: flex;
        justify-content: center;
        button {
            border-radius: 50rpx;
            width: 300rpx;
            height: 66rpx;
            line-height: 66rpx;
            font-size: 28rpx;
            background-color: #3A78FF;
            color: #fff;
        }
    }
</style>
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "3.000",
    "versionCode" : 300,
    "versionName" : "3.004",
    "versionCode" : 304,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/gongxuOut/Cj_StationOutBill.vue
@@ -1815,10 +1815,10 @@
                                    });
                                }
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                                CommonUtils.showTips({
                                    title: "温馨提示",
                                    message: `${res.data.Message}`,
                                });
                            }
                        },
                        fail: (res) => {
pages/gongxuOut/Cj_StationOutBillList.vue
@@ -239,7 +239,10 @@
<script>
    import { getUserInfo } from "@/utils/auth.js";
    import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
    import StationOutBillPopup from "../../components/StationOutBillPopup/StationOutBillListPopup.vue";
    import {
        MpaasScan
    } from "../../utils/mpaasScan";
    export default {
        components:{StationOutBillPopup},
        data() {
@@ -251,7 +254,7 @@
                arrayColName:['任务单','单据号','流转卡号','产品名称','产品代码','当前工序','当前工序代码','日期','规格型号','流水号','出站数量','不良数量','报废数量','包装标识','包装标识代码','出站时间','操作员','操作员代码','生产资源','生产资源代码','生产班组','生产班组代码','LOT数量','制单人'],
                arrayComparator:['=','>=','>','<=','<','<>','包含','左包含','右包含','不包含'],
                hform:{
                    HStatus:'全部',
                    HStatus:'未审核',
                    HBeginDate: new Date().toISOString().split('T')[0],
                    HEndDate:'',
                    HWorkBillNo:'',
@@ -275,7 +278,7 @@
            }
        },
        onLoad() {
            this.getList()
            this.search()
            // console.log(this.userInfo,uni.getStorageSync('HUserName'))
        },
        onReachBottom: function() {
@@ -297,23 +300,17 @@
                let newList = list.slice(sindex,eindex)
                return newList
            },
            async toScanCode() {
                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
                mpaasScanModule.mpaasScan({
                    'hideAlbum': true,
                    'timeoutInterval':'10', //超时时间
                    'timeoutText':'未识别到二维码' //超时提醒
                },(ret) => {
                    console.log(ret.resp_result)
                    if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
                        console.log('条码内容:' + ret.resp_result);
                        this.hform.HProcExchBillNo = ret.resp_result
                        this.search()
                    }
                })
            toScanCode() {
                MpaasScan.scanCode((res) => {
                    if (res) {
                        this.hform.HProcExchBillNo = res
                        this.search()
                    }
                });
            },
            getList(){
                this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
                //this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
                uni.showLoading({
                    title:'加载中...'
                })
pages/weiwaigxIn/Cj_StationEntrustInBill.vue
@@ -380,7 +380,7 @@
                    HSEQNumber:0,
                    // HICMOInterID:'',
                    // HICMOQty:'',
                    // HProcExchHinteID:'',
                    HProcExchHinteID:0,
                    // HPlanQty:'',
                    // HPieceQty:'',
                    // HTaxRate:'',
@@ -1087,23 +1087,30 @@
                                        })
                                    },1000)
                                }else{
                                    uni.showModal({
                                        title: '提示',
                                        content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                        success: (res) => {
                                            if (res.confirm) {
                                                console.log('用户点击确定');
                                                uni.redirectTo({
                                                    url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
                                                })
                                            } else if (res.cancel) {
                                                console.log('用户点击取消');
                                                setTimeout(()=>{
                                                    uni.navigateBack();
                                                },50)
                                            }
                                        }
                                    });
                                    //自动审核
                                    //this.check()
                                    if(res.data.Verify=="Y"){
                                        this.check()
                                    }else{
                                        uni.showModal({
                                            title: '提示',
                                            content: res.data.Message + '。是否继续新增?(点击取消返回上级页面)',
                                            success: (res) => {
                                                if (res.confirm) {
                                                    console.log('用户点击确定');
                                                    uni.redirectTo({
                                                        url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
                                                    })
                                                } else if (res.cancel) {
                                                    console.log('用户点击取消');
                                                    setTimeout(()=>{
                                                        uni.navigateBack();
                                                    },50)
                                                }
                                            }
                                        });
                                    }
                                }
                            }else{
                                uni.showToast({
@@ -1130,18 +1137,16 @@
                    dataType:"json",
                    data:{ 
                        CurUserName: uni.getStorageSync('HUserName'),
                        HInterID: this.linterid,
                        HInterID: this.hform.HInterID,
                    },
                    success: (res) => {
                        console.log(1,res);
                        uni.hideLoading()
                        if(res.data.count == 1){
                            this.btnType = 3
                            let pages = getCurrentPages();
                            let prePage = pages[pages.length - 2];
                            prePage.$vm.getList()
                            uni.showModal({
                                title: '操作成功',
                                title: '审核成功',
                                content: '是否继续停留在当前页面?‘是’可进行反审核,‘否’则回到上一级列表',
                                confirmText:'是',
                                cancelText:'否',
@@ -1164,7 +1169,7 @@
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title:'接口请求失败',
                            title:'审核失败接口请求失败',
                            icon:'none'
                        })
                    },
@@ -1184,12 +1189,10 @@
                        console.log(1,res);
                        uni.hideLoading()
                        if(res.data.count == 1){
                            let pages = getCurrentPages();
                            let prePage = pages[pages.length - 2];
                            prePage.$vm.getList()
                            this.btnType = 2
                            uni.showModal({
                                title: '操作成功',
                                title: '自动审核成功',
                                content: '是否继续停留在当前页面?‘是’可进行审核,‘否’则回到上一级列表',
                                confirmText:'是',
                                cancelText:'否',
pages/weiwaigxIn/Cj_StationEntrustInBillList.vue
@@ -186,6 +186,9 @@
<script>
    import { getUserInfo } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '../../utils/common';
    export default {
        data() {
            return {
@@ -408,14 +411,46 @@
                });
            },
            // //审核
            // check(item){
            //     console.log(item)
            //     if (item.HBillStatus > 0) {
            //         uni.showToast({
            //             title:'单据不为未审核状态!'
            //         })
            //     }
            // },
            async check(item, mode) {
                console.log('审核单据: ',item);
                try{
                    let res = await CommonUtils.doRequest2Sync({
                        method: 'GET',
                        url: '/Cj_StationEntrustInBill/set_CheckBill',
                        data: {
                            HInterID: item["hmainid"],
                            CurUserName: getUserInfo()["Czymc"]
                        }
                    })
                    if(!res) {
                        return
                    }
                    let {count, data, Message} = res.data
                    if(count == 1) {
                        CommonUtils.showTips({
                            message: `${item["审核人"]?'反审核':'审核'}成功`
                        })
                        this.$forceUpdate()
                        setTimeout(() => {
                            this.cmdSearch()
                        }, 2000)
                    }else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `单据${item["审核人"]?'反审核':'审核'}失败: ${Message}`
                        })
                    }
                }catch(err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `单据${item["审核人"]?'反审核':'审核'}错误: ${err}`
                    })
                }
            },
            // //反审核
            // antiCheck(item){
                
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
@@ -1299,10 +1299,10 @@
                                    });
                                }
                            } else {
                                uni.showToast({
                                    title: res.data.Message,
                                    icon: 'none'
                                })
                                CommonUtils.showTips({
                                    title: "温馨提示",
                                    message: `${res.data.Message}`,
                                });
                            }
                        },
                        fail: (res) => {
pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
@@ -6,8 +6,11 @@
                    <view class="right">
                        <input v-model="hform.HProcExchBillNo" placeholder="请输入工序流转卡号" />
                    </view>
                    <uni-icons type="scan"
                        style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
                        size="20" @click="toScanCode"></uni-icons>
                    
                </view>
            </view>
            <view class="form-item">
                <view class="title">状态:</view>
                <view class="right">
@@ -145,6 +148,9 @@
                    <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>
@@ -232,6 +238,9 @@
<script>
    import { getUserInfo } from "@/utils/auth.js";
    import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
    import {
        MpaasScan
    } from "../../utils/mpaasScan";
    export default {
        components:{StationOutBillPopup},
        data() {
@@ -271,7 +280,7 @@
        },
        onLoad() {
            this.getList()
            this.search()
            // console.log(this.userInfo,uni.getStorageSync('HUserName'))
        },
        onReachBottom: function() {
@@ -293,20 +302,13 @@
                let newList = list.slice(sindex,eindex)
                return newList
            },
            async toScanCode() {
                var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
                mpaasScanModule.mpaasScan({
                    'hideAlbum': true,
                    'timeoutInterval':'10', //超时时间
                    'timeoutText':'未识别到二维码' //超时提醒
                },(ret) => {
                    console.log(ret.resp_result)
                    if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
                        console.log('条码内容:' + ret.resp_result);
                        this.hform.HProcExchBillNo = ret.resp_result
                        this.search()
                    }
                })
            toScanCode() {
                MpaasScan.scanCode((res) => {
                    if (res) {
                        this.hform.HProcExchBillNo = res
                        this.search()
                    }
                });
            },
            getList(){
                // this.sWhere += ` and 制单人 like '%${this.userInfo.Czymc}'`