~jhz/STUWMS.git

parent: 0c29db37 | 补丁 | 提交 | ignore whitespace

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2026-04-01 979da8420343defc4fb233a9f1a1b084117bea83

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
#	manifest.json

7个文件已修改

	manifest.json	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/gongxuOut/Cj_StationOutBill.vue	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/index/login.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/index/tab4.vue	68 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaigxIn/Cj_StationEntrustInBill.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/weiwaigxOut/Cj_StationEntrustOutBill.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 manifest.json

@@ -2,6 +2,7 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",

    "versionName" : "3.012",
    "versionCode" : 312,
    "transformPx" : false,

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -476,11 +476,9 @@
                })
            },
            HKeeperNameChange(e) {
                console.log(this.HKeeperList)
                let keeperItem = this.HKeeperList.find(elem => elem.HName == e)
                console.log(keeperItem)
                this.detailManifestItem.HKeeperID = keeperItem.HItemID
                this.detailManifestItem.HKeeperName = keeperItem.HName
                this.sourceBillInfo.HKeeperID = keeperItem.HItemID
                this.sourceBillInfo.HKeeperName = keeperItem.HName


            },
@@ -645,7 +643,7 @@
                            "HWHID": this.detailManifestItem.HWHID || 0,
                            "HSPID": this.detailManifestItem.HSPID || 0,
                            "HSupID": this.detailManifestItem.HSupID || 0,
                            "HKeeperID": this.detailManifestItem.HKeeperID || 0,
                            "HKeeperID": this.sourceBillInfo.HKeeperID || 0,
                            "HMaterID": this.detailManifestItem.HMaterID,
                            "F_WPVT_Text_tzk": this.detailManifestItem.F_WPVT_Text_tzk,
                            "HSourceBillType": this.detailManifestItem.HSourceBillType,
@@ -665,6 +663,7 @@
                    } = res.data
                    if (count == 1) {
                        CommonUtils.showTips({
                            title: '提示',
                            message: '上传成功'
                        })
                        this.attachmentInfo = []
@@ -673,7 +672,7 @@
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: '上传失败: ${Message}'
                            message: `上传失败: ${Message}`
                        })
                    }


 pages/gongxuOut/Cj_StationOutBill.vue

@@ -663,9 +663,9 @@
                }
                
            }
            this.getHMaterList()
            this.getHProcList()
            this.getHSupList()
            //this.getHMaterList()
            //this.getHProcList()
            //this.getHSupList()
            this.getHSourceList()
            this.getHGroupList()
            this.getHEmpList()
@@ -991,12 +991,7 @@
                                this.arrayHSourceName[i] = res.data.data.Gy_Source[i].生产资源
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -1057,12 +1052,7 @@
                                this.arrayHGroupName[i] = res.data.data[i].班组
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -1097,11 +1087,6 @@
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {

 pages/index/login.vue

@@ -114,7 +114,7 @@
                    "陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
                    "张瑞广本地测试": 'http://localhost:8082/API/',
                    "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
                    "杨权鑫本地测试": 'http://172.20.10.2:8082/API/',
                    "杨权鑫本地测试": 'http://192.168.3.107:8082/API/',
                    "王仪本地测试": 'http://192.168.0.74:8080/API/',
                    // 小卫内外网
                    "苏州卫智科技-外网": 'http://221.224.60.42:8082/API_WW/',

 pages/index/tab4.vue

@@ -263,42 +263,42 @@
        },
        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
                        }, {})
            // 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) {
            //             return {
            //                 code: 1,
            //                 msg: Message,
            //                 data: retVal
            //             }
            //         } else {
            //             return {
            //                 code: 0,
            //                 msg: Message,
            //                 data: []
            //             }
            //         }
            //     } catch (err) {
            
                }
            },
            //     }
            // },
            judgeHidden() {
                return process.env.NODE_ENV === 'development'
            },

 pages/weiwaigxIn/Cj_StationEntrustInBill.vue

@@ -427,7 +427,7 @@
                this.getNewData()
            }
            // this.getHMaterList()
            this.getHProcList()
            //this.getHProcList()
            this.getHSupList()
            this.getHEmpList()
            
@@ -650,11 +650,6 @@
                                this.arrayHSupName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        }else{
                            uni.showToast({
                                title:res.data.Message,
                                icon:'none'
                            })
                        }
                    },
                    fail: (res) => {

 pages/weiwaigxOut/Cj_StationEntrustOutBill.vue

@@ -783,12 +783,7 @@
                                this.arrayHSupName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);
@@ -823,12 +818,7 @@
                                this.arrayHEmpName[i] = res.data.data[i].HName
                            }
                            this.$forceUpdate();
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                        } 
                    },
                    fail: (res) => {
                        console.log(res);

			@@ -2,6 +2,7 @@
			"name" : "智云LMES",
			"appid" : "__UNI__B002F49",
			"description" : "",

			"versionName" : "3.012",
			"versionCode" : 312,
			"transformPx" : false,

			@@ -476,11 +476,9 @@
			})
			},
			HKeeperNameChange(e) {
			console.log(this.HKeeperList)
			let keeperItem = this.HKeeperList.find(elem => elem.HName == e)
			console.log(keeperItem)
			this.detailManifestItem.HKeeperID = keeperItem.HItemID
			this.detailManifestItem.HKeeperName = keeperItem.HName
			this.sourceBillInfo.HKeeperID = keeperItem.HItemID
			this.sourceBillInfo.HKeeperName = keeperItem.HName


			},
			@@ -645,7 +643,7 @@
			"HWHID": this.detailManifestItem.HWHID \|\| 0,
			"HSPID": this.detailManifestItem.HSPID \|\| 0,
			"HSupID": this.detailManifestItem.HSupID \|\| 0,
			"HKeeperID": this.detailManifestItem.HKeeperID \|\| 0,
			"HKeeperID": this.sourceBillInfo.HKeeperID \|\| 0,
			"HMaterID": this.detailManifestItem.HMaterID,
			"F_WPVT_Text_tzk": this.detailManifestItem.F_WPVT_Text_tzk,
			"HSourceBillType": this.detailManifestItem.HSourceBillType,
			@@ -665,6 +663,7 @@
			} = res.data
			if (count == 1) {
			CommonUtils.showTips({
			title: '提示',
			message: '上传成功'
			})
			this.attachmentInfo = []
			@@ -673,7 +672,7 @@
			} else {
			CommonUtils.showTips({
			title: '温馨提示',
			message: '上传失败: ${Message}'
			message: `上传失败: ${Message}`
			})
			}

			@@ -663,9 +663,9 @@
			}

			}
			this.getHMaterList()
			this.getHProcList()
			this.getHSupList()
			//this.getHMaterList()
			//this.getHProcList()
			//this.getHSupList()
			this.getHSourceList()
			this.getHGroupList()
			this.getHEmpList()
			@@ -991,12 +991,7 @@
			this.arrayHSourceName[i] = res.data.data.Gy_Source[i].生产资源
			}
			this.$forceUpdate();
			} else {
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			}
			}
			},
			fail: (res) => {
			console.log(res);
			@@ -1057,12 +1052,7 @@
			this.arrayHGroupName[i] = res.data.data[i].班组
			}
			this.$forceUpdate();
			} else {
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			}
			}
			},
			fail: (res) => {
			console.log(res);
			@@ -1097,11 +1087,6 @@
			this.arrayHEmpName[i] = res.data.data[i].HName
			}
			this.$forceUpdate();
			} else {
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			}
			},
			fail: (res) => {

			@@ -114,7 +114,7 @@
			"陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
			"张瑞广本地测试": 'http://localhost:8082/API/',
			"余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
			"杨权鑫本地测试": 'http://172.20.10.2:8082/API/',
			"杨权鑫本地测试": 'http://192.168.3.107:8082/API/',
			"王仪本地测试": 'http://192.168.0.74:8080/API/',
			// 小卫内外网
			"苏州卫智科技-外网": 'http://221.224.60.42:8082/API_WW/',

			@@ -263,42 +263,42 @@
			},
			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
			}, {})
			// 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) {
			// return {
			// code: 1,
			// msg: Message,
			// data: retVal
			// }
			// } else {
			// return {
			// code: 0,
			// msg: Message,
			// data: []
			// }
			// }
			// } catch (err) {

			}
			},
			// }
			// },
			judgeHidden() {
			return process.env.NODE_ENV === 'development'
			},

			@@ -427,7 +427,7 @@
			this.getNewData()
			}
			// this.getHMaterList()
			this.getHProcList()
			//this.getHProcList()
			this.getHSupList()
			this.getHEmpList()

			@@ -650,11 +650,6 @@
			this.arrayHSupName[i] = res.data.data[i].HName
			}
			this.$forceUpdate();
			}else{
			uni.showToast({
			title:res.data.Message,
			icon:'none'
			})
			}
			},
			fail: (res) => {

			@@ -783,12 +783,7 @@
			this.arrayHSupName[i] = res.data.data[i].HName
			}
			this.$forceUpdate();
			} else {
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			}
			}
			},
			fail: (res) => {
			console.log(res);
			@@ -823,12 +818,7 @@
			this.arrayHEmpName[i] = res.data.data[i].HName
			}
			this.$forceUpdate();
			} else {
			uni.showToast({
			title: res.data.Message,
			icon: 'none'
			})
			}
			}
			},
			fail: (res) => {
			console.log(res);