调整 工作联系单 查询 调用接口
调整 设备状态查询 工艺参数页面入口
生产领料检验 新增 条码自增列 参数 调整修改数量调用接口
5个文件已修改
49 ■■■■ 已修改文件
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliao/PPickingCheckBill.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "3.003",
    "versionCode" : 303,
    "versionName" : "3.004",
    "versionCode" : 304,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue
@@ -237,12 +237,15 @@
                this.sWhere +=
                    ` and 日期 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 日期 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
                try {
                    // TODO: 调整为存储过程分页接口
                    let res = await CommonUtils.doRequest2Async({
                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListProcess',
                        data: {
                            sWhere: this.sWhere,
                            user: getUserInfo()["Czymc"],
                            // sWhere: this.sWhere,
                            beginDate: this.startDate,
                            endDate: this.endDate,
                            type: this.tabs + 1,
                            user: getUserInfo()["HEmpName"] || getUserInfo()["Czymc"],
                            page: this.page,
                            size: this.size
                        }
pages/index/login.vue
@@ -171,13 +171,13 @@
        methods: {
            async ApplyLanguagePack(lang, forceUpdate = false) {
                // // 读取语言包并加载
                let {
                    data,
                    getRemoteFile
                } = await getLanguagePackJson(lang)
                if (getRemoteFile) {
                    this.$i18n.setLocaleMessage(lang, data)
                }
                // let {
                //     data,
                //     getRemoteFile
                // } = await getLanguagePackJson(lang)
                // if (getRemoteFile) {
                //     this.$i18n.setLocaleMessage(lang, data)
                // }
                this.$i18n.locale = lang
            },
            onLanguageChangeHandler(e) {
pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai.vue
@@ -37,6 +37,9 @@
                        <view class="detail" v-if="item['OEE']">
                            <text>OEE:</text>{{item['OEE']}}
                        </view>
                        <view class="detail">
                            <button class="btn-a" size="mini" @tap.stop="toTechparam(item)">工艺参数</button>
                        </view>
                    </view>
                </view>
@@ -100,6 +103,11 @@
            };
        },
        methods: {
            toTechparam(item) {
                uni.navigateTo({
                    url: `/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery?HEquipID=${item['设备id']}`
                })
            },
            async DepartmentChange(e) {
                let index = e.detail.value
                this.selectedDepartment = this.departmentsTitles[index]
@@ -408,4 +416,11 @@
            }
        }
    }
    .btn-a {
        background-color: #3A78FF;
        color: #fff;
        margin: 0;
        padding: 0 8rpx;
     }
</style>
pages/shengchanlingliao/PPickingCheckBill.vue
@@ -269,6 +269,7 @@
                    HTMQty_B: '',
                    HWHName_B: '',
                    HSPName_B: '',
                    HInterID_B: 0, // 条码自增列
                },
                HFIFOList: [], // 先进先出列表缓存 
@@ -341,6 +342,7 @@
                        data: {
                            HInterID: this.hform.HInterID,
                            HBillType: this.hform.HBillType,
                            HItemID: this.hform.HInterID_B, // 条码自增列
                            HBarCode: HBarCodeOld,
                            HQty: HQtyOld
                        }
@@ -353,6 +355,7 @@
                    if (count == 1) {
                        this.DisBillEntryList()
                        this.tabs = 2
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
@@ -1116,6 +1119,7 @@
                                this.hform.HTMQty_B = ''
                                this.hform.HWHName_B = ''
                                this.hform.HSPName_B = ''
                                this.hform.HInterID_B = 0
                            } else {
                                this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
@@ -1126,6 +1130,7 @@
                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
                                this.hform.HInterID_B = data.BarCodeDetailslist[0].HItemID
                            }
                        } else {
                            uni.showToast({