chenhaozhe
3 天以前 4a949664f3924900787165d619edef68534fb416
首巡末 单据 新增必填项
异常反馈单 主内码和子内码 错误赋值问题修改
10个文件已修改
96 ■■■■ 已修改文件
main.js 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/baogong/OA_ErrMsgBackBill.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab1.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab2.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab4.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.js
@@ -30,12 +30,21 @@
// uniapp 全局请求拦截器
uni.addInterceptor('request', {
    invoke(args) {
        // 获取到当前调用的页面
        const pages = getCurrentPages()
        const currentPage = pages[pages.length - 1]
        // 拿到页面定义的 modName
        const modName = currentPage?.$vm.HModName || ''
        // 请求头带上 token
        let token = uni.getStorageSync('Token')
        if (token) {
            // 先初始化,防止 undefined 报错
            args.header = args.header || {}
            args.header.Authorization = `Bearer ${token}`
            args.header["X-HModName"] = modName
        }
    },
    success(res) {
@@ -43,7 +52,7 @@
        if (res.data && res.data.token) {
            uni.setStorageSync('Token', res.data.token)
        }
        // 401 自动跳登录
        if (res.statusCode === 401) {
@@ -51,7 +60,7 @@
            uni.showModal({
                title: '温馨提示',
                content: res.data.Message,
                showCancel:false,
                showCancel: false,
                success: () => {
                    uni.reLaunch({
                        url: '/pages/index/login'
@@ -59,12 +68,12 @@
                }
            })
        }
         // 403 返回上一个页面
        // 403 返回上一个页面
        if (res.statusCode === 403) {
            uni.showModal({
                title: '温馨提示',
                content: res.data.Message,
                showCancel:false,
                showCancel: false,
                success: () => {
                    uni.navigateBack()
                }
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "3.006",
    "versionCode" : 306,
    "versionName" : "3.009",
    "versionCode" : 309,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -114,7 +114,7 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">设备名称:</view>
                    <view class="title required">设备名称:</view>
                    <view class="righton">
                        <input v-model="hform.HBarName" disabled />
                    </view>
@@ -734,6 +734,22 @@
                }
            },
            async submit() {
                if(!this.hform.HBillNo) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 单据号不存在'
                    })
                    return
                }
                if(!this.hform.HEquipID) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 设备不能为空'
                    })
                    return
                }
                try {
                    let oMain = JSON.stringify(this.hform);
                    let sSubStr = JSON.stringify(this.HCheckFileList);
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -85,7 +85,7 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">设备名称:</view>
                    <view class="title required">设备名称:</view>
                    <view class="righton">
                        <input v-model="hform.HBarName" disabled />
                    </view>
@@ -440,6 +440,13 @@
                        state: false
                    }
                }
                if (!this.hform.HBillNo) {
                    return {
                        Message: "单据号为空 不允许提交!",
                        state: false
                    }
                }
                return {
                    Message: "",
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -79,7 +79,7 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">模具名称:</view>
                    <view class="title required">模具名称:</view>
                    <view class="righton">
                        <input v-model="hform.HBarName" disabled />
                    </view>
@@ -788,6 +788,22 @@
                }
            },
            async submit() {
                if(!this.hform.HBillNo) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 单据号不存在'
                    })
                    return
                }
                if(!this.hform.HMouldID) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 模具不能为空'
                    })
                    return
                }
                try {
                    let oMain = JSON.stringify(this.hform);
                    let sSubStr = JSON.stringify(this.HCheckFileList);
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -109,7 +109,7 @@
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">模具名称:</view>
                    <view class="title required">模具名称:</view>
                    <view class="righton">
                        <input v-model="hform.HBarName" disabled />
                    </view>
@@ -870,6 +870,22 @@
                }
            },
            async submit() {
                if(!this.hform.HBillNo) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 单据号不存在'
                    })
                    return
                }
                if(!this.hform.HMouldID) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: '单据提交失败: 模具不能为空'
                    })
                    return
                }
                try {
                    let oMain = JSON.stringify(this.hform);
                    let sSubStr = JSON.stringify(this.HCheckFileList);
pages/baogong/OA_ErrMsgBackBill.vue
@@ -902,8 +902,8 @@
                        this.hform.HSourceID = data[0].HSourceID //生产资源id
                        this.hform.HSourceName = data[0].生产资源名称 //生产资源
                        this.hform.HProcExchBillNo = data[0].工序流转卡号 //源单单号
                        this.hform.HProcExchEntryID = data[0].HProcExchInterID //源单主内码
                        this.hform.HProcExchInterID = data[0].HProcExchEntryID //源单子内码
                        this.hform.HProcExchEntryID = data[0].HProcExchEntryID //源单主内码
                        this.hform.HProcExchInterID = data[0].HProcExchInterID //源单子内码
                        this.hform.HICMOBillNo = data[0].生产订单号
                        this.hform.HICMOInterID = data[0].HICMOInterID
                        this.hform.HICMOEntryID = data[0].HICMOEntryID
pages/index/tab1.vue
@@ -9,7 +9,7 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                    <uni-badge style="z-index: 997;" :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
pages/index/tab2.vue
@@ -9,7 +9,7 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="bindingData[item.cornerCount]" type="error" :max-num="99" size="normal" absolute
                    <uni-badge style="z-index: 997;" :text="bindingData[item.cornerCount]" type="error" :max-num="99" size="normal" absolute
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
@@ -205,7 +205,7 @@
                    {
                        "img": "../../static/icon/icon18.png",
                        "text": "其他出库校验暂存列表",
                        "url": "/pages/qitachuku/qitachuku",
                        "url": "/pages/qitachukujiaoyan/qitachukujiaoyan",
                        "id": 21,
                        "hidden": false
                    },
pages/index/tab4.vue
@@ -9,7 +9,7 @@
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                    <uni-badge style="z-index: 997;" :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>