From 4d213bd76317bb3f735eee24c4fcbf0fc73b3055 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 18 九月 2025 12:39:19 +0800
Subject: [PATCH] 生产领料校验选源单方式优化
---
manifest.json | 5 +-
components/BillListPopup/BillListPopup_Check.vue | 2
pages/gongxuOut/moneystatistics.vue | 56 +--------------------------
pages/shengchanlingliao/form.vue | 2
4 files changed, 7 insertions(+), 58 deletions(-)
diff --git a/components/BillListPopup/BillListPopup_Check.vue b/components/BillListPopup/BillListPopup_Check.vue
index ee9efde..62c2d72 100644
--- a/components/BillListPopup/BillListPopup_Check.vue
+++ b/components/BillListPopup/BillListPopup_Check.vue
@@ -120,7 +120,7 @@
this.length = 0
this.page = 0
this.HBillNo = ''
- this.HMater = ''
+ //this.HMater = ''
this.HCustom = ''
this.HBillList = []
this.enablefocus = false
diff --git a/manifest.json b/manifest.json
index 98d8434..8f7c5bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,9 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
-
- "versionName" : "1.0.82",
- "versionCode" : 182,
+ "versionName" : "1.0.84",
+ "versionCode" : 184,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuOut/moneystatistics.vue b/pages/gongxuOut/moneystatistics.vue
index 536af14..0f107a2 100644
--- a/pages/gongxuOut/moneystatistics.vue
+++ b/pages/gongxuOut/moneystatistics.vue
@@ -157,7 +157,8 @@
userInfo:getUserInfo(),
serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
showmore:false,
-
+ arrayHEmpName: [], //鎺ユ敹浜�
+ HEmpNameList: [],
hform:{
HMonth:'',
HEmp:'',
@@ -173,6 +174,7 @@
},
onLoad() {
this.getList()
+ this.getHEmpList()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
@@ -241,58 +243,6 @@
this.showList = []
console.log(this.hform)
-
- if (this.hform.HStatus) {
- if(this.hform.HStatus == '鍏ㄩ儴'){
- this.sWhere += "";
- }else if(this.hform.HStatus == '鏈鏍�'){
- this.sWhere += " and 瀹℃牳浜�=''";
- }else if(this.hform.HStatus == '宸插鏍�'){
- this.sWhere += " and 瀹℃牳浜�<>''";
- }else if(this.hform.HStatus == '宸插叧闂�'){
- this.sWhere += " and 鍏抽棴浜�<>''";
- }
- }
- if (this.hform.HBeginDate) {
- this.sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + this.hform.HBeginDate + "'";
- }
- if (this.hform.HEndDate) {
- this.sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + this.hform.HEndDate + "'";
- }
- if (this.hform.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
- }
- if (this.hform.HNumber) {
- this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.hform.HNumber + "%'";
- }
- if (this.hform.HName) {
- this.sWhere += " and 褰撳墠宸ュ簭 like '%" + this.hform.HName + "%'";
- }
- if (this.hform.HWorkBillNo) {
- this.sWhere += " and 浠诲姟鍗� like '%" + this.hform.HWorkBillNo + "%'";
- }
- if (this.hform.HProcExchBillNo) {
- this.sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + this.hform.HProcExchBillNo + "%'";
- }
- if (this.hform.checkHWasterQty) {
- this.sWhere += " and 鎶ュ簾鏁伴噺>0 ";
- }
- if (this.hform.ColName && this.hform.Comparator) {
- var com = "";
- if(this.hform.Comparator == '鍖呭惈'){
- com = "like'%" + this.hform.ColContent + "%'";
- }else if(this.hform.Comparator == '宸﹀寘鍚�'){
- com = "like'%" + this.hform.ColContent + "'";
- }else if(this.hform.Comparator == '鍙冲寘鍚�'){
- com = "like'" + this.hform.ColContent + "%'";
- }else if(this.hform.Comparator == '涓嶅寘鍚�'){
- com = "not like'%" + this.hform.ColContent + "%'";
- }else{
- com = "" + this.hform.Comparator + "'" + this.hform.ColContent + "'";
- }
-
- this.sWhere += " and " + this.hform.ColName + " " + com;
- }
this.getList()
},
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index eeceafd..eec2015 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -897,7 +897,7 @@
showBillList(){
this.$refs.billList.showPopup()
},
- toScanCode() {
+ toScanCodeMater() {
var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
mpaasScanModule.mpaasScan({
'hideAlbum': true,
--
Gitblit v1.9.1