From 45b4cbd921589ff8d6ea6ff5bb3a02a7eb6435d7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 04 九月 2025 16:59:48 +0800
Subject: [PATCH] 生产领料单 问题修复
---
pages/quyangdan/table.vue | 36 +++++++++
pages/huanyangdan/table.vue | 22 +++++
pages.json | 28 +++++++
pages/index/tab2.vue | 17 ++++
pages/quyangdan/form.vue | 22 +++++
pages/huanyangdan/form.vue | 19 ++++
pages/xiaoshouchuku/form.vue | 17 +++-
components/BillListPopup/BillListPopup.vue | 5
pages/caigouruku/form.vue | 5
pages/shengchanlingliaoshengdan/form.vue | 12 ++
10 files changed, 172 insertions(+), 11 deletions(-)
diff --git a/components/BillListPopup/BillListPopup.vue b/components/BillListPopup/BillListPopup.vue
index d92ee61..a42ea13 100644
--- a/components/BillListPopup/BillListPopup.vue
+++ b/components/BillListPopup/BillListPopup.vue
@@ -23,7 +23,7 @@
</view>
<scroll-view id="#BillListPanel" scroll-y="true" style="height: 55vh;">
<view class="options-wrapper" v-show="HBillList.length != 0">
- <uni-card :is-active="bill.isActive" v-for="(bill, index) in HBillList[curPage-1]" :key="index"
+ <uni-card :is-active="bill.isActive" :class="bill.isActive?'uni-card--is-active':''" v-for="(bill, index) in HBillList[curPage-1]" :key="index"
:title="bill['鐗╂枡鍚嶇О']" :extra="`鏁伴噺: ${bill['鏁伴噺']}`"
@tap="clickCard(bill['HSourceInterID'], bill['鍗曟嵁鍙�'], index)">
<view class="item">
@@ -166,6 +166,7 @@
} else {
this.multiSouceBillList.splice(index, 1)
}
+ console.log('this.multiSouceBillList: ',this.multiSouceBillList);
},
getBillList() {
this.HBillList = []
@@ -285,7 +286,7 @@
}
}
- .uni-card[is-active] {
+ .uni-card--is-active {
background-color: rgba(0, 122, 255, 0.2);
}
}
diff --git a/pages.json b/pages.json
index affb683..d2dd977 100644
--- a/pages.json
+++ b/pages.json
@@ -753,6 +753,34 @@
"style": {
"navigationBarTitleText": "鏉＄爜鐢熸垚"
}
+ },
+ {
+ "path" : "pages/huanyangdan/table",
+ "style" :
+ {
+ "navigationBarTitleText" : "杩樻牱鍗曠淮鎶�"
+ }
+ },
+ {
+ "path" : "pages/huanyangdan/form",
+ "style" :
+ {
+ "navigationBarTitleText" : "杩樻牱鍗�"
+ }
+ },
+ {
+ "path" : "pages/quyangdan/table",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍙栨牱鍗曠淮鎶�"
+ }
+ },
+ {
+ "path" : "pages/quyangdan/form",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍙栨牱鍗�"
+ }
}
],
"tabBar": {
diff --git a/pages/caigouruku/form.vue b/pages/caigouruku/form.vue
index f51aa2a..4a25769 100644
--- a/pages/caigouruku/form.vue
+++ b/pages/caigouruku/form.vue
@@ -1191,6 +1191,7 @@
this.hform.HWHName_B = ''
this.hform.HSPName_B = ''
} else {
+ this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
@@ -1421,7 +1422,7 @@
let sMain = JSON.stringify(this.materMeta) + ';' + this.hform.HBillType + ';' + this.hform.HSourceBillNo
try {
// 涓烘潯鐮佽缃嚭搴撳崟鍙峰拰鍑哄簱娆℃暟
- await this.Set_BarCodeBill(sMain)
+ // await this.Set_BarCodeBill(sMain)
uni.showModal({
title: '鎻愮ず',
content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
@@ -1591,7 +1592,7 @@
}
input {
- width: 100%;
+ width: inherit;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
diff --git a/pages/huanyangdan/form.vue b/pages/huanyangdan/form.vue
new file mode 100644
index 0000000..492629a
--- /dev/null
+++ b/pages/huanyangdan/form.vue
@@ -0,0 +1,19 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ }
+ }
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/huanyangdan/table.vue b/pages/huanyangdan/table.vue
new file mode 100644
index 0000000..c060bd6
--- /dev/null
+++ b/pages/huanyangdan/table.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index f7d578a..29b8e54 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -216,6 +216,20 @@
id: 29,
hidden: false,
},
+ {
+ img: '../../static/icon/icon8.png',
+ text: '鍙栨牱鍗�',
+ url: '/pages/quyangdan/table',
+ id: 30,
+ hidden: !this.judgeHidden(),
+ },
+ {
+ img: '../../static/icon/icon8.png',
+ text: '杩樻牱鍗�',
+ url: '/pages/huanyangdan/table',
+ id: 31,
+ hidden: !this.judgeHidden(),
+ },
// , {
// img: '../../static/icon/icon1.png',
// text: '璁惧妗ｆ鏌ヨ',
@@ -266,6 +280,9 @@
this.getHiddenItem()
},
methods: {
+ judgeHidden() {
+ return process.env.NODE_ENV === 'development'
+ },
async getHiddenItem() {
let data = await getMenuList({
menuName: this.menuListName
diff --git a/pages/quyangdan/form.vue b/pages/quyangdan/form.vue
new file mode 100644
index 0000000..65057e7
--- /dev/null
+++ b/pages/quyangdan/form.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/quyangdan/table.vue b/pages/quyangdan/table.vue
new file mode 100644
index 0000000..c8e5017
--- /dev/null
+++ b/pages/quyangdan/table.vue
@@ -0,0 +1,36 @@
+<template>
+ <view>
+ <view class="page-header"></view>
+ <scroll-view class="page-content">
+ </scroll-view>
+ <!-- 鍒嗛〉鍣� -->
+ <view class="page-footer"></view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ // 婊氬姩鎺у埗
+ scrollTop: 0,
+ old: {
+ scrollTop: 0
+ }
+ }
+ },
+ methods: {
+ goTop: function(e) {
+ // 瑙ｅ喅view灞備笉鍚屾鐨勯棶棰�
+ this.scrollTop = this.old.scrollTop
+ this.$nextTick(function() {
+ this.scrollTop = 0
+ });
+ }
+ }
+ }
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/shengchanlingliaoshengdan/form.vue b/pages/shengchanlingliaoshengdan/form.vue
index 9aff4e2..dbb36bc 100644
--- a/pages/shengchanlingliaoshengdan/form.vue
+++ b/pages/shengchanlingliaoshengdan/form.vue
@@ -312,6 +312,7 @@
reHSourceBillNo: true,
showHSupName: true,
barCodeFocus: false,
+ HSourceFlag : false,
tabs: 0,
HMainSourceBillType: '鐢熶骇鐢ㄦ枡娓呭崟',
@@ -398,9 +399,11 @@
// this.btnType = 1
this.RoadBillMain(e.HInterID)
this.barCodeFocus = true
+ this.hform.HSourceFlag = true
} else {
this.getNewData()
this.HSourceBillNoFocus = true
+ this.hform.HSourceFlag = true
}
// this.getHBaseList()
this.getHSupList()
@@ -413,7 +416,6 @@
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
console.log("鏄惁搴旂敤澶氭簮鍗�: ", e.enableMultiSourceBill)
if(e.enableMultiSourceBill){
-
for(let item of e.MultiSourceBillList) {
try{
await this.getHBarCodeData(item.HBillNo)
@@ -441,7 +443,8 @@
computed: {
enableMultiSourceBill: {
get() {
- if(uni.getStorageSync("Organization").includes("娴疯瘹") && this.hform.HMainSourceBillType == 3720){
+ // uni.getStorageSync("Organization").includes("娴疯瘹") &&
+ if(this.hform.HMainSourceBillType == 3720){
return true
}
return false
@@ -960,6 +963,7 @@
},
success: (res) => {
if (res.data.count == 1) {
+ this.hform.HSourceFlag = true
var data = res.data.data
console.log(2, data);
this.hform.HSupName = data.hSupNameField
@@ -1021,7 +1025,7 @@
var sHQty = this.hform.HQty
var sSourceBillNo = this.hform.HSourceBillNo
var sSourceBillType = this.hform.HMainSourceBillType
- var HSourceFlag = this.hform.HSourceBillNo == '' ? false : true
+ var HSourceFlag = this.hform.HSourceFlag
console.log(this.hform.HSourceBillNo, HSourceFlag)
if (HDeleteFlag == "*") {
if (sBarCode == "") {
@@ -1120,6 +1124,7 @@
} else if (data.hBarTypeField == '婧愬崟鏉＄爜') {
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
+ this.hform.HSourceFlag = true
if (data.hDeptIDField != 0) {
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
@@ -1329,6 +1334,7 @@
if (res.data.count == 1) {
this.hform.HInterID = res.data.data[0].HInterID
this.hform.HBillNo = res.data.data[0].HBillNo
+ this.hform.HSourceFlag = false
} else {
uni.showToast({
title: res.data.Message,
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index 70404d6..f2c893e 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -1224,6 +1224,7 @@
this.hform.HWHName_B = ''
this.hform.HSPName_B = ''
} else {
+ this.hform.HBarCode_B = data.BarCodeDetailslist[0].HBarCode
this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
@@ -1442,10 +1443,14 @@
console.log(1, res);
uni.hideLoading()
if (res.data.count == 1) {
- let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
- .HBillType + ';' + this.hform.HSourceBillNo
try {
- await this.Set_BarCodeBill(sMain)
+ if(this.hform.HMainSourceBillType == '1402') {
+ if(/鍏磋揪|鏅轰簯/.test(uni.getStorageSync('Organization'))){
+ let sMain = JSON.stringify(this.materMeta) + ';' + this.hform
+ .HBillType + ';' + this.hform.HSourceBillNo + ';鍏磋揪'
+ this.Set_BarCodeBill(sMain)
+ }
+ }
uni.showModal({
title: '鎻愮ず',
content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
@@ -1504,6 +1509,10 @@
if (count == 1) {
resolve()
} else {
+ uni.showToast({
+ icon:'none',
+ title: Message
+ })
reject(Message)
}
}
@@ -1611,7 +1620,7 @@
}
input {
- width: 100%;
+ width: inherit;
padding: 8rpx 20rpx;
font-size: 30rpx;
}
--
Gitblit v1.9.1