wtt
2025-08-13 2cf4a63a3d1ee8f568dc8399d478790e6f197d9e
委外出站发出接收,出站汇报测试完善
5个文件已修改
94 ■■■■ 已修改文件
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/gongxuOut/form.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxIn/form.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxIn/table.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/weiwaigxOut/form.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.49",
    "versionCode" : 149,
    "versionName" : "1.0.51",
    "versionCode" : 151,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/gongxuOut/form.vue
@@ -14,7 +14,7 @@
                <view class="title"><text>*</text>流水号:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
                        @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
                        @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -661,6 +661,8 @@
                if(detail.value[0]){
                    this.getNewHRelBeginDate()
                    this.hform.HRelEndTime = getDateTime.dateTimeStr('y-m-d h:i');
                }else{
                    this.hform.HWorkTimes = 0;
                }
            },
            //通过登录用户获取默认值
pages/weiwaigxIn/form.vue
@@ -4,16 +4,28 @@
            <view class="form-item">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HBarCode" disabled placeholder="请扫描条码"/>
                    <input v-model="hform.HBarCode"  placeholder="请扫描条码" @confirm="toInCode(e)"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>流水号:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号" @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title">工序编码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">未发出数量:</view>
                <view class="righton">
                    <input disabled v-model="hform.HNotReportQty" placeholder="请输入合格数量" />
                </view>
            </view>
            <view class="form-item">
                <view class="title"><text>*</text>发出数量:</view>
@@ -324,6 +336,8 @@
                    HBillNo:'',
                    HBarCode:'',
                    HProcNo:'',
                    HProcNumber: '',
                    HNotReportQty: 0,
                    HQty:'',
                    HEmpName:'',
                    HEmpID:'',
@@ -460,6 +474,18 @@
                        this.getHBarCodeData(ret.resp_result)
                    }
                })
            },
            toInCode(e) {
                var str = this.hform.HBarCode
                if (str.includes('@')) {
                    const parts = str.split('@');
                    this.hform.HBarCode = parts[0]
                    this.hform.HProcNo = parts[1]
                    this.getHBarCodeData(parts[0], 1)
                    // this.getHProcNoData(parts[0],parts[1])
                } else {
                    this.getHBarCodeData(this.hform.HBarCode)
                }
            },
            //扫流水号
            toScanProcNo(){
@@ -804,6 +830,8 @@
                            this.hform.HProcID= data.HProcID
                            this.hform.HCenterName= data.工作中心
                            this.hform.HCenterID= data.HCenterID
                            this.hform.HNotReportQty = data['未发出数量']
                            this.hform.HProcNumber = data['工序代码']
                            if(!this.hform.HSupName){
                                this.hform.HSupName= data.供应商
                                this.hform.HSupID= data.HSupID
@@ -851,6 +879,9 @@
                });
            },
            submit() {
                //去除分号以免后端分解报错
                this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                if(!this.hform.HBarCode){
                    uni.showToast({
                        title:'请扫描设备条形码',
pages/weiwaigxIn/table.vue
@@ -171,7 +171,7 @@
                <view class="op" v-if="operations == index">
<!--                     <button class="op1" size="mini" plain @tap.stop="check(item)">审核</button>
                    <button class="op2" size="mini" plain @tap.stop="antiCheck(item)">反审核</button> -->
                    <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button>
                    <button class="op3" size="mini" plain @tap.stop="edit(item)" v-if="false">编辑</button>
                    <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button>
                    <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                </view>
@@ -195,7 +195,7 @@
                arrayStatus:['全部','未审核','已审核','已关闭'],
                hform:{
                    HStatus:'全部',
                    HBeginDate:'',
                    HBeginDate:new Date().toISOString().split('T')[0],
                    HEndDate:'',
                    HICMOBillNo:'',
                    HBillNo:'',
@@ -236,6 +236,7 @@
                return newList
            },
            getList(){
                this.sWhere += ` and 制单人 like N'%${this.userInfo.Czymc}'`
                // console.log(this.sWhere)
                uni.showLoading({
                    title:'加载中...'
@@ -307,11 +308,11 @@
                        this.sWhere += " and 关闭人<>''";
                    }
                }
                if (this.hform.BenginHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.BenginHCreateDate + "'";
                if (this.hform.HBeginDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HBeginDate + "'";
                }
                if (this.hform.EndHCreateDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.EndHCreateDate + "'";
                if (this.hform.HEndDate) {
                    this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.hform.HEndDate + "'";
                }
                if (this.hform.HBillNo) {
                    this.sWhere += " and 单据号 like '%" + this.hform.HBillNo + "%'";
@@ -428,6 +429,9 @@
        width: 640rpx;
        margin: 20rpx auto;
    }
    picker input{
        pointer-events: none;
    }
    .other{
        margin-top: 8rpx;
        text-align: center;
pages/weiwaigxOut/form.vue
@@ -14,11 +14,17 @@
                <view class="title"><text>*</text>流水号:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HProcNo" placeholder="请输入(或扫描)流水号"
                        @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
                        @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
                    size="20" @click="toScanProcNo"></uni-icons>
            </view>
            <view class="form-item">
                <view class="title">工序编码:</view>
                <view class="righton">
                    <input disabled v-model="hform.HProcNumber" placeholder="请输入工序编码" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">未报工数量:</view>
@@ -58,7 +64,7 @@
                        @input="HEmpNameChange"></uni-combox>
                </view>
            </view>
            <view class="form-item">
            <!-- <view class="form-item">
                <view class="title">工序:</view>
                <view class="right">
                    <uni-combox :candidates="arrayHProcName" placeholder="请选择工序" v-model="hform.HProcName"
@@ -71,7 +77,7 @@
                    <uni-combox :candidates="arrayHDept" placeholder="请选择部门" v-model="hform.HDept"
                        @input="HHDeptChange"></uni-combox>
                </view>
            </view>
            </view> -->
            <view class="form-item">
                <view class="title">送货单号:</view>
                <view class="right">
@@ -407,6 +413,7 @@
                    HNotReportQty: 0,
                    HQty: 0,
                    HPieceQty: 0,
                    HProcNumber: '',
                    HWasterQty: 0,
                    HEmpName: '',
                    HEmpID: 0,
@@ -494,8 +501,8 @@
            this.getHProcList()
            this.getHSupList()
            this.getHEmpList()
            this.getHProcList()
            this.getHDeptList()
            //this.getHProcList()
            //this.getHDeptList()
            this.getDefValByUser()
@@ -1014,6 +1021,7 @@
                            this.hform.HCenterName = data.工作中心
                            this.hform.HCenterID = data.HCenterID
                            this.hform.HNotReportQty = data['未报工数量']
                            this.hform.HProcNumber = data['工序代码']
                            if (!this.hform.HSupName) {
                                this.hform.HSupName = data.供应商
                                this.hform.HSupID = data.HSupID
@@ -1068,6 +1076,9 @@
                })
            },
            submit() {
                //去除分号以免后端分解报错
                this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
                this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
                if (!this.hform.HBarCode) {
                    uni.showToast({
                        title: '请扫描设备条形码',
@@ -1083,12 +1094,14 @@
                        title: '请选择供应商',
                        icon: 'none'
                    })
                }else if (!this.hform.HDeptID) {
                    uni.showToast({
                        title: '请选择部门',
                        icon: 'none'
                    })
                } else if (!this.hform.HEmpName) {
                }
                // else if (!this.hform.HDeptID) {
                //     uni.showToast({
                //         title: '请选择部门',
                //         icon: 'none'
                //     })
                // }
                else if (!this.hform.HEmpName) {
                    uni.showToast({
                        title: '请选择操作员',
                        icon: 'none'