From 565c64fb35730c9215338737d6a549742c587709 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 02 二月 2026 20:26:47 +0800
Subject: [PATCH] 直接调拨单 生产调拨单校验 修复 扫描仓位后，仓位下拉框中没有值的问题
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 5 ++++-
pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue | 12 ++++++++++--
pages/shengchandiaobo/MoveStockBill.vue | 4 ++--
manifest.json | 4 ++--
pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue | 16 +++++++++++-----
pages/zhijiediaobo/MoveStockBill.vue | 6 ++++--
pages/index/login.vue | 2 +-
7 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/manifest.json b/manifest.json
index febe6cf..3633c9a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.0.69",
- "versionCode" : 269,
+ "versionName" : "2.0.71",
+ "versionCode" : 271,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
index f4f8be8..aa6e9b4 100644
--- a/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
+++ b/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill.vue
@@ -450,7 +450,7 @@
},
addNew() {
uni.redirectTo({
- url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ url: './Sb_EqpMaintenanceBill?operationType=1'
})
},
goBack() {
@@ -581,11 +581,15 @@
},
// 鑾峰彇鑱屽憳鏁版嵁
async getEmpList() {
+ let sWhere= " where 1=1"
+ if(this.hform.HDeptName){
+ // sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
+ }
try {
let res = await CommonUtils.doRequest2Async({
url: '/PublicPageMethod/UserList',
data: {
- sWhere: " where 1=1",
+ sWhere: sWhere
}
})
@@ -654,8 +658,11 @@
},
async GetMessageByHMainSourceBillNo(HSouceBillNo) {
try {
+ let url = ''
+ let dataField = ''
// 鏍规嵁婧愬崟绫诲瀷閫夋嫨涓嶅悓鐨勬帴鍙�
- if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�') {
+ if (this.hform.HMainSourceBillType === '璁惧缁翠慨鐧昏鍗�')
+ {
url = "/Sb_EqpRepairWorkBill/GetEqpConkBookBillListPage";
dataField = {
sWhere: ` and 鍗曟嵁鍙� = '${HSouceBillNo}'`,
@@ -796,7 +803,6 @@
let sSubStr = JSON.stringify(this.HDetailList);
let sMainSub = oMain + ';' + sSubStr;
- console.log('sMainSub: ',sMainSub);
let res = await CommonUtils.doRequest2Sync({
url: "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
data: {
@@ -845,7 +851,7 @@
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
uni.redirectTo({
- url: './Sb_EquipRepairSendWorkBill?operationType=1'
+ url: './Sb_EqpMaintenanceBill?operationType=1'
})
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
diff --git a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue b/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
index 94d4657..571373a 100644
--- a/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
+++ b/pages/ZLGL/Kf_SellOutBill_CusBar/Kf_SellOutBill_CusBar_APP.vue
@@ -305,6 +305,8 @@
<button class="btn-a" v-if="operationType!=4" size="mini" @tap="addNew">鏂板</button>
<button class="btn-c" size="mini" @tap="goBack">閫�鍑�</button>
</view>
+ <BillListPopupVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="hform.HMainSourceBillType"
+ :HStockOrgID="hform.HStockOrgID" @BillSelectComplete="handleSourceBill"></BillListPopupVue>
</view>
</template>
@@ -323,11 +325,13 @@
getUserStockRelation
} from '@/utils/userRelationManager';
import FIFOListComponentVue from "@/components/FIFOListModule/FIFOListComponent.vue";
+ import BillListPopupVue from "@/components/BillListPopup/BillListPopup.vue";
export default {
// 閿�鍞嚭搴撳崟(楠岃瘉)
name: 'Kf_SellOutBill_CusBar_APP',
components: {
- FIFOListComponentVue
+ FIFOListComponentVue,
+ BillListPopupVue
},
data() {
return {
@@ -455,6 +459,10 @@
}
},
methods: {
+ // 鎺ユ敹婧愬崟
+ handleSourceBill(e){
+
+ },
// 鏉＄爜鍒犻櫎
async delMater(item) {
uni.showModal({
@@ -1485,7 +1493,7 @@
}
try {
- console.log('HStockPlaceID: ',this.hform.HStockPlaceID);
+ console.log('HStockPlaceID: ', this.hform.HStockPlaceID);
let oMain = JSON.stringify(this.hform)
console.log('oMain: ', oMain);
let res = await CommonUtils.doRequest2Sync({
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index f076bce..14b9aea 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -642,6 +642,7 @@
HMainSourceEntryID: "1",
HMainSourceBillNo: "",
HStockOrgID: uni.getStorageSync('OrganizationID'),
+ HRemarkSN: '' // SN鐮佽褰�
},
// 妫�楠岄」鐩拰鎶芥牱妫�楠� 鍊�
checkItems: {},
@@ -689,6 +690,7 @@
});
},
async getSourceBillInfo(HBarCode) {
+ let HBarCodeOld = HBarCode
console.log('HBarCode: ', HBarCode);
let res = await CommonUtils.doRequest2Async({
url: "/WEBSController/get_CheckBillBarCode_Json_CheckItem",
@@ -767,6 +769,7 @@
this.hform.HProcID = data[0].HProcID
this.hform.HProcName = data[0].褰撳墠宸ュ簭
}
+ this.hform.HRemarkSN = HBarCodeOld // 鎵�鎵弿鐨勬潯鐮佸瓨SN瀛楁
this.get_CheckItem();
} else {
CommonUtils.showTips({
@@ -855,7 +858,7 @@
this.hform.HProcID = data[0].HProcID
this.hform.HProcName = data[0].褰撳墠宸ュ簭
}
-
+
this.get_CheckItem();
this.hasSourceBill = true
this.$refs['billList'].exit()
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 33c1755..a2dc24f 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -127,7 +127,7 @@
"瀹佹尝鍗庤垷鍖呰2": "http://192.168.88.167:8082/API_NW/",
"瀹佹尝鍗庤垷鍖呰": "http://61.164.64.222:8082/API_WW/",
},
- serverUrlName: uni.getStorageSync('serverUrlName') || '瀹佹尝鍥涚淮灏�-澶栫綉',
+ serverUrlName: uni.getStorageSync('serverUrlName') || '閿﹂殕-鏅鸿兘瀹跺眳-澶栫綉',
arrayOrganization: [],
Organization: '',
diff --git a/pages/shengchandiaobo/MoveStockBill.vue b/pages/shengchandiaobo/MoveStockBill.vue
index 6687f92..226aa1d 100644
--- a/pages/shengchandiaobo/MoveStockBill.vue
+++ b/pages/shengchandiaobo/MoveStockBill.vue
@@ -498,7 +498,7 @@
this.hform.HOutStockPlaceID = res.data.data[0].HMainID
this.hform.HOutStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HSCWHID = res.data.data[0].HWHID
- this.hform.HSCWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HSCWHNameChange(res.data.data[0].鎵�灞炰粨搴�)
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -548,7 +548,7 @@
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
- this.hform.HWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HWHInNameChange(res.data.data[0].鎵�灞炰粨搴�)
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
diff --git a/pages/zhijiediaobo/MoveStockBill.vue b/pages/zhijiediaobo/MoveStockBill.vue
index ffcb32b..d1d0cdb 100644
--- a/pages/zhijiediaobo/MoveStockBill.vue
+++ b/pages/zhijiediaobo/MoveStockBill.vue
@@ -694,7 +694,8 @@
this.hform.HOutStockPlaceID = res.data.data[0].HMainID
this.hform.HOutStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HSCWHID = res.data.data[0].HWHID
- this.hform.HSCWHName = res.data.data[0].鎵�灞炰粨搴�
+ // this.hform.HSCWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HSCWHNameChange(res.data.data[0].鎵�灞炰粨搴�)
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
@@ -744,7 +745,8 @@
this.hform.HStockPlaceID = res.data.data[0].HMainID
this.hform.HStockPlaceName = res.data.data[0].浠撲綅鍚嶇О
this.hform.HWHID = res.data.data[0].HWHID
- this.hform.HWHName = res.data.data[0].鎵�灞炰粨搴�
+ // this.hform.HWHName = res.data.data[0].鎵�灞炰粨搴�
+ this.HWHInNameChange(res.data.data[0].鎵�灞炰粨搴�)
} else {
uni.showToast({
title: '浠撲綅鏁版嵁璇锋眰澶辫触',
--
Gitblit v1.9.1