1

chenhaozhe

8 天以前 b81f429a24f7c49be118988c594f4c47f7dd1a7a

1

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.098",
    "versionCode" : 298,
    "versionName" : "2.099",
    "versionCode" : 299,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages.json

@@ -1825,9 +1825,6 @@
            "style": {
                "navigationBarTitleText": "设备工艺参数点检"
            }



        },
        {
            "path": "pages/Sc_PackUnionCarryUpBill/Sc_PackUnionCarryUpBill_Fast",
@@ -1967,6 +1964,13 @@
            "style": {
                "navigationBarTitleText": "投料防错单列表"
            }
        },
        {
            "path" : "pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery",
            "style" : 
            {
                "navigationBarTitleText" : "设备工艺参数查询"
            }
        }
    ],
    "tabBar": {

 pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue

@@ -289,6 +289,7 @@
                <view class="over" v-if="HCheckFileList.length == 0">暂无数据</view>
            </view>
        </template>
        <view style="height: 120rpx;"></view>
        <!-- 操作按钮 -->
        <view class="buttons" id="buttons">
            <button class="btn-a" size="mini" @tap="submit">提交</button>
@@ -966,7 +967,6 @@
                        url: "/LEMS/MES_IF_EquipICMOTechParamList_Json",
                        data: {
                            hinterid: HInterID,
                            HEntryID,
                            HEntryID,
                            user: getUserInfo()["Czymc"]
                        }

 pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue

@@ -104,8 +104,13 @@
                </view>
            </uni-card>
        </view>
        <view class="over" v-if="BillsDisplay.length == 0">暂无数据</view>

        <template v-if="BillsDisplay.length == 0">
            <view class="over">暂无数据</view>
        </template>
        <template v-else>
            <view class="over" v-if="!readCompelete">正在获取数据...</view>
            <view class="over" v-if="readCompelete">数据已读完...</view>
        </template>
    </view>
</template>

@@ -136,6 +141,7 @@
                sWhere: "",
                showDetail: -1,
                operations: -1,
                readCompelete: false,

                page: 1,
                size: 20,
@@ -144,7 +150,8 @@
        },
        // 触底加载
        onReachBottom() {
            console.log('触发触底加载...');
            this.page++;
            this.onSearchClickHandler()
        },
        methods: {
            onDateRangePickerChangeHandler({
@@ -198,12 +205,18 @@
                    this.getWorkLinkList()
            },
            switchTab(tabIndex) {
                this.tabs = tabIndex
                if(tabIndex == this.tabs){
                    
                }else {
                    this.tabs = tabIndex
                    this.BillsDisplay= []
                    this.page = 1
                }
                this.sWhere = ''
                switch (tabIndex) {
                    case 0:
                        this.sWhere =
                            ` and (接收人 = '${getUserInfo()['HEmpName']}' or 抄送接收人 = '${getUserInfo()['HEmpName']}') and 阅读状态 = '未阅'`
                            ` and (抄送接收人 = '${getUserInfo()['HEmpName']}') and 阅读状态 = '未阅'`
                        break;
                    case 1:
                        this.sWhere = ` and 接收人 = '${getUserInfo()['HEmpName']}'`
@@ -243,7 +256,7 @@
                    if (count == 1) {
                        console.log('data: ', data);

                        this.BillsDisplay = data
                        this.BillsDisplay.push(...data) 


                        let fieldList = CommonUtils.fieldListFilterRole({

 pages/index/login.vue

@@ -134,7 +134,7 @@
                    //天擎航天
                    "天擎航天": "http://space-engine.com.cn:81/API/",
                },
                serverUrlName: uni.getStorageSync('serverUrlName') || '宁波华舟包装',
                serverUrlName: uni.getStorageSync('serverUrlName'),

                arrayOrganization: [],
                Organization: '',

 pages/index/tab4.vue

@@ -8,7 +8,15 @@
        <view class="mains">
            <view v-if="!canEdit" :hidden="item.hidden||!item.id" class="box" v-for="(item,index) in itemData"
                :key="index" @tap="toUrl(item)">
                <image :src="item.img" mode=""></image>
                <template v-if="item.corner">
                    <uni-badge :text="item.cornerCount" type="error" :max-num="99" size="normal" absolute="rightTop"
                        :offset="[7, 7]">
                        <image :src="item.img" mode=""></image>
                    </uni-badge>
                </template>
                <template v-else>
                    <image :src="item.img" mode=""></image>
                </template>
                <view class="texts">
                    {{item.text}}
                </view>
@@ -41,6 +49,7 @@
            return {
                updateCount: 0,
                menuListName: 'tab4',
                initFinished: false,
                canEdit: false,
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                itemData: [
@@ -223,7 +232,66 @@
        onLoad() {
            this.getHiddenItem()
        },
        async onShow() {
            if (this.initFinished) {
                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
                if (MessageIdentifier.code == 0) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: MessageIdentifier.msg
                    })
        
                    return
                }
        
                this.itemData.forEach((e, index) => {
                    if (MessageIdentifier.data[e.text] != undefined) {
                        this.itemData[index]["corner"] = true
                        this.itemData[index]["cornerCount"] = MessageIdentifier.data[e.text]
                    }
                })
        
                this.$forceUpdate()
            }
        },
        methods: {
            // 根据模块获取未处理消息条数
            async getMessageIdentifierCount(menuListName) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/getMessageIdentified',
                        data: {
                            user: getUserInfo()["HEmpName"],
                            moduleName: menuListName
                        }
                    })
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count == 1) {
                        let retVal = Array.from(data).reduce((acc, item) => {
                            acc[item['moduleName']] = item.count
                            return acc
                        }, {})
            
                        return {
                            code: 1,
                            msg: Message,
                            data: retVal
                        }
                    } else {
                        return {
                            code: 0,
                            msg: Message,
                            data: []
                        }
                    }
                } catch (err) {
            
                }
            },
            judgeHidden() {
                return process.env.NODE_ENV === 'development'
            },
@@ -231,10 +299,35 @@
                let data = await getMenuList({
                    menuName: this.menuListName
                })
                Array.from(data).forEach(e => {
                    this.itemData[e["HIndex"]].hidden = !CommonUtils.stringToBoolean(e["HShowMode"])
                    this.itemData[e["HIndex"]].id = e["HEntryID"]; //id为0强制隐藏
                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        this.itemData[e["HIndex"]]["hidden"] = !CommonUtils.stringToBoolean(e[
                            "HShowMode"] || false)
                        this.itemData[e["HIndex"]].id = e["HEntryID"]; //id为0强制隐藏
                    }
                })
                
                let MessageIdentifier = await this.getMessageIdentifierCount(this.menuListName)
                if (MessageIdentifier.code == 0) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: MessageIdentifier.msg
                    })
                
                    return
                }
                
                Array.from(data).forEach((e, index) => {
                    if (index < this.itemData.length) {
                        if (MessageIdentifier.data[this.itemData[e["HIndex"]].text]) {
                            this.$set(this.itemData[e["HIndex"]], "corner", true)
                            this.$set(this.itemData[e["HIndex"]], "cornerCount", MessageIdentifier.data[this
                                .itemData[e["HIndex"]].text])
                        }
                    }
                })
                this.initFinished = true
                this.$forceUpdate()
            },
            switchHidden(index) {
                this.updateCount++;

 pages/qitachuku/qitachukudan.vue

@@ -148,7 +148,7 @@
                        dataKey="HName" dataValue="HName" v-model="hform.HStockStyle">
                    </zxz-uni-data-select>
                    <view class="righton" v-if="!showHSupName">
                        <input name="HSupName" disabled v-model="hform.HSupName" placeholder="请选择供应商" />
                        <input name="HStockStyle" disabled v-model="hform.HSupName" placeholder="请选择供应商" />
                    </view>
                </view>


 pages/shebeiyunxingzhuangtai/detail.vue

@@ -16,6 +16,7 @@
            <button size="mini" data-type="equipResume" plain>履历</button>
            <button size="mini" data-type="equipmentProcess" plain>工艺</button>
            <button size="mini" data-type="OEEStatusReport" plain>状态</button>
            <button size="mini" data-type="equipTechParam" plain>工艺参数</button>
        </view>

    </view>
@@ -518,19 +519,27 @@
                                    this.HEquipID
                            });
                            break;
                        // 导航到设备工艺参数
                        case "equipTechParam":
                            uni.navigateTo({
                                url: "/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery?HEquipID=" +
                                    this.HEquipID
                            });
                            break
                        default:
                            return;
                    }
                }
            },
            async getDiagram(HDeptID, HSourceID) {
            async getDiagram(HDeptID, HSourceID,HEquipID) {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport",
                        data: {
                            sWhere: {
                                "HDeptID": HDeptID,
                                "HSourceID": HSourceID
                                "HSourceID": HSourceID,
                                "HEquipID": HEquipID
                            },
                            user: getUserInfo()["Czymc"],
                            OrganizationID: this.organInfo.id
@@ -559,7 +568,7 @@
            this.HICMOInterID = HICMOInterID
            this.HICMOEntryID = HICMOEntryID

            await this.getDiagram(HDeptID, HSourceID)
            await this.getDiagram(HDeptID, HSourceID, HEquipID)
        },
    }
</script>

 pages/shengchantuiliaoCheck/MateOutBackCheckBill.vue

@@ -83,7 +83,7 @@
            </view>
            <view v-if="tabs == 2">
                <view class="list" v-for="(item,index) in Materlist" :key="index">
                    <uni-card :title="item.物料名称" :extra="'数量:'+item.数量" style="margin: 10px;">
                    <uni-card :title="item.物料名称" :extra="'数量:'+item.数量" style="margin: 10px;" @tap="delMater(item)">
                        <view class="card-detail">
                            <view class="detail">
                                <text>单据数量：</text>{{item.单据数量}}
@@ -195,14 +195,16 @@
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import { CommonUtils } from '../../utils/common';
    import {
        CommonUtils
    } from '../../utils/common';
    export default {
        data() {
            return {
                userInfo: getUserInfo(),
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                HModName: 'Kf_MateOutBackBill_Check_PDA',//已调整
                ModRightName: 'CE_MateOutBackCheck',//已调整
                HModName: 'Kf_MateOutBackBill_Check_PDA', //已调整
                ModRightName: 'CE_MateOutBackCheck', //已调整
                OperationType: 1,

                barCodeFocus: false,
@@ -220,7 +222,7 @@

                Materlist: [],
                hform: {
                    HBillType: 1244,//已调整
                    HBillType: 1244, //已调整
                    HBillerID: uni.getStorageSync('HBillerID'),
                    HRedBlueFlag: false,

@@ -274,6 +276,45 @@
            this.getHBaseList()
        },
        methods: {
            //删除物料码
            delMater(item) {
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 " ' + item.物料名称 + ' " 所有扫码记录？删除后将不可恢复！',
                    success: (res) => {
                        if (res.confirm) {
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json',
                                data: {
                                    HInterID: this.hform.HInterID,
                                    HBillType: this.hform.HBillType,
                                    HSourceInterID: item.HSourceInterID,
                                    HSourceEntryID: item.HSourceEntryID,
                                    HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl
                                },
                                success: (res) => {
                                    if (res.data.count == 1) {
                                        this.DisBillEntryList()
                                    } else {
                                        uni.showToast({
                                            title: res.data.Message,
                                            icon: 'none'
                                        })
                                    }
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        }
                    }
                });
            },
            // 获取仓位
            async getStockPlaceRemote(HSPGroupID) {
                try {
@@ -285,7 +326,7 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
            

                    if (res.data.count == 1) {
                        this.HStockPlaceNameList = res.data.data
                        for (var i = 0; i < res.data.data.length; i++) {
@@ -297,7 +338,7 @@
                            icon: 'none'
                        })
                    }
            

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
@@ -320,9 +361,9 @@
                            Organization: uni.getStorageSync('Organization')
                        },
                    })
            

                    if (res.data.count == 1) {
            

                        this.hform.HStockPlaceID = res.data.data[0].HMainID
                        this.hform.HStockPlaceName = res.data.data[0].仓位名称
                        this.hform.HWHID = res.data.data[0].HWHID
@@ -333,7 +374,7 @@
                            icon: 'none'
                        })
                    }
            

                } catch (err) {
                    uni.showToast({
                        title: '仓位数据请求失败',
@@ -425,7 +466,7 @@
                        if (this.HWHNameList[i]['启用仓位'] == 'Y') {
                            this.showHStockPlaceName = true
                            this.getStockPlaceRemote(this.HWHNameList[i]["HSPGroupID"])
                        } 
                        }
                    }
                }
            },
@@ -771,7 +812,7 @@
                    data: {
                        HInterID: this.hform.HInterID,
                        HBillType: this.hform.HBillType,
                        sWhere: '',
                        sWhere: '',
                        HSourceBarCodeCtl: this.hform.HSourceBarCodeCt
                    },
                    success: (res) => {