chenhaozhe
6 天以前 c1077a5ff53bc83bbf487c30bc93061c8cd93ca8
首巡末 判断不合格问题修复
模具 设备 图表图例修改
10个文件已修改
60 ■■■■■ 已修改文件
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shoujianjianyan/firstCheckBill.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/qitachukujiaoyan/qitachukujiaoyan.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "3.005",
    "versionCode" : 305,
    "versionName" : "3.006",
    "versionCode" : 306,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/ZLGL/QualityReport/Sb_EquipDotCheckBillReport.vue
@@ -448,7 +448,12 @@
                        trigger: 'item'
                    },
                    legend: {
                        top: 'bottom'
                        top: 'bottom',
                        itemWidth: 12, // 图例图标宽度(可选,让布局更紧凑)
                        itemHeight: 12, // 图例图标高度(可选)
                        textStyle: {
                            fontSize: 11 // 字体大小(可选,避免太占空间)
                        }
                    },
                    series: [{
                        name: '点检次数',
pages/ZLGL/QualityReport/Sb_EquipMaintainBillReport.vue
@@ -448,7 +448,12 @@
                        trigger: 'item'
                    },
                    legend: {
                        top: 'bottom'
                        top: 'bottom',
                        itemWidth: 12, // 图例图标宽度(可选,让布局更紧凑)
                        itemHeight: 12, // 图例图标高度(可选)
                        textStyle: {
                            fontSize: 11 // 字体大小(可选,避免太占空间)
                        }
                    },
                    series: [{
                        name: '保养次数',
pages/ZLGL/QualityReport/Sc_MouldMaintainBillMainReport.vue
@@ -108,7 +108,7 @@
                condition: {
                    year: dayjs(new Date()).format("YYYY"),
                    month: dayjs(new Date()).format("M"),
                    dimension: '器具'
                    dimension: '保养项目'
                }
            };
        },
@@ -448,7 +448,12 @@
                        trigger: 'item'
                    },
                    legend: {
                        top: 'bottom'
                        top: 'bottom',
                        itemWidth: 12, // 图例图标宽度(可选,让布局更紧凑)
                        itemHeight: 12, // 图例图标高度(可选)
                        textStyle: {
                            fontSize: 11 // 字体大小(可选,避免太占空间)
                        }
                    },
                    series: [{
                        name: '保养次数',
pages/ZLGL/QualityReport/Sc_MouldRepairWorkBillReport.vue
@@ -108,7 +108,7 @@
                condition: {
                    year: dayjs(new Date()).format("YYYY"),
                    month: dayjs(new Date()).format("M"),
                    dimension: '器具'
                    dimension: '责任人'
                }
            };
        },
@@ -448,7 +448,12 @@
                        trigger: 'item'
                    },
                    legend: {
                        top: 'bottom'
                        top: 'bottom',
                        itemWidth: 12, // 图例图标宽度(可选,让布局更紧凑)
                        itemHeight: 12, // 图例图标高度(可选)
                        textStyle: {
                            fontSize: 11 // 字体大小(可选,避免太占空间)
                        }
                    },
                    series: [{
                        name: '维修项目比例',
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -2022,6 +2022,7 @@
                    });
                    return false;
                }
                this.hform.HCheckQty = this.hform.HCheckQty || 0
                if (this.hform.HCheckQty == 0) {
                    CommonUtils.showTips({
                        message: "检验数量不得为0!",
@@ -2035,7 +2036,7 @@
                    for (let key in this.checkItems) {
                        if (this.checkItems.hasOwnProperty(key)) {
                            let element = this.checkItems[key];
                            if(element.HResult == 0){
                            if(element.HResult == 2){
                                count ++
                            }
                            
pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -1986,10 +1986,11 @@
                // 判断 最后结果为不合格的情况下,检验项目中是否有不合格项
                if(this.hform.HLastResult == 0 || this.hform.HLastResult == false){
                    let count = 0
                    console.log('this.checkItems: ',this.checkItems);
                    for (let key in this.checkItems) {
                        if (this.checkItems.hasOwnProperty(key)) {
                            let element = this.checkItems[key];
                            if(element.HResult == 0){
                            if(element.HResult == 2){
                                count ++
                            }
                            
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1690,7 +1690,7 @@
                    for (let key in this.checkItems) {
                        if (this.checkItems.hasOwnProperty(key)) {
                            let element = this.checkItems[key];
                            if(element.HResult == 0){
                            if(element.HResult == 2){
                                count ++
                            }
                            
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/qitachukujiaoyan/qitachukujiaoyan.vue
@@ -256,7 +256,7 @@
            },
            add(){
                uni.navigateTo({
                    url:'./detail?OperationType=1'
                    url:'./qitachukudanjiaoyan?OperationType=1'
                })
            },
            //编辑