From 7067d800d0d5899b67206050ce80acba9329ef7e Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期四, 25 十二月 2025 10:29:28 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/weixiujilu/mouldRepairRecordBill.vue | 70 ++++++++++++++++++-----
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue | 4
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue | 56 ++----------------
pages/qijvguzhangdengji/mouldMistakeBill.vue | 33 +++++++++-
4 files changed, 92 insertions(+), 71 deletions(-)
diff --git a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
index b901a8b..40a87e3 100644
--- a/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
+++ b/pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -978,9 +978,9 @@
if(data.HCorrespondentTypeID==1){
this.hform.TypeName = "渚涘簲鍟�"
}else if(data.HCorrespondentTypeID==2){
- this.hform.TypeName = "閮ㄩ棬"
- }else{
this.hform.TypeName = "瀹㈡埛"
+ }else{
+ this.hform.TypeName = "閮ㄩ棬"
}
diff --git a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
index 1eb582d..6ab3387 100644
--- a/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
+++ b/pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -250,10 +250,8 @@
HStockPlaceNameList: [],
arrayHDeptName: [], //閮ㄩ棬
HDeptNameList: [],
- arrayHCusName: [],
+ arrayHCusName: [],//瀹㈡埛
HCusNameList: [],
- arrayHSupName: [], //瀹㈡埛
- HSupNameList: [],
arrayHSupplierName: [], //渚涘簲鍟�
HSuplierList: [],
linterid: '',
@@ -279,14 +277,9 @@
HWHID: getUserInfo().HWhID,
HStockPlaceName: getUserInfo().HSPName,
HStockPlaceID: getUserInfo().HSPID,
- HSactterUserName: getUserInfo().User,
- HSactterUserID: getUserInfo().User,
- HCollectUserName: getUserInfo().HEmpName,
- HCollectUserID: getUserInfo().HEmpID,
+
HDeptName: getUserInfo().HDept,
HDeptID: getUserInfo().HDeptID,
- HSupName: '',
- HSupID: '',
HSecManagerID: getUserInfo().HEmpID,
HSecManagerName: getUserInfo().HEmpName,
HKeeperID: 0,
@@ -630,7 +623,7 @@
},
getHSupList() {
CommonUtils.doRequest(
- "/Gy_Customer/list", {
+ "/Gy_Supplier/list", {
sWhere: "",
user: uni.getStorageSync('HUserName'),
Organization: uni.getStorageSync('Organization')
@@ -642,9 +635,9 @@
count
} = res1
if (count == 1) {
- this.HSupNameList = data
+ this.HSuplierList = data
for (var i = 0; i < data.length; i++) {
- this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
+ this.arrayHSupplierName[i] = data[i].渚涘簲鍟嗗悕绉�
}
this.$forceUpdate();
} else {
@@ -656,33 +649,7 @@
}
)
},
- getSupplier() {
- CommonUtils.doRequest(
- "/WEBSController/GetSupplier_Json", {
- HBarCode: uni.getStorageSync(''),
- Organization: uni.getStorageSync('Organization')
- },
- (res) => {
- let res1 = res.data
- let {
- data,
- count
- } = res1
- if (count == 1) {
- this.HSupNameList = data
- for (var i = 0; i < data.length; i++) {
- this.arrayHSupName[i] = data[i].瀹㈡埛鍚嶇О
- }
- this.$forceUpdate();
- } else {
- uni.showToast({
- title: data.Message,
- icon: 'none'
- })
- }
- }
- )
- },
+
//閫夋嫨浣跨敤閮ㄩ棬
HDeptNameChange(e) {
for (var i = 0; i < this.HDeptNameList.length; i++) {
@@ -786,16 +753,7 @@
if (!this.hform.HStockPlaceName) {
this.hform.HStockPlaceID = 0
}
- if (!this.hform.HSactterUserName) {
- this.hform.HSactterUserID = 0
- } else {
- this.HSecManagerID = this.hform.HSactterUserID
- }
- if (!this.hform.HCollectUserName) {
- this.hform.HCollectUserID = 0
- } else {
- this.HKeeperID = this.hform.HCollectUserID
- }
+
if (!this.hform.HDeptName) {
this.hform.HDeptID = 0
}
diff --git a/pages/qijvguzhangdengji/mouldMistakeBill.vue b/pages/qijvguzhangdengji/mouldMistakeBill.vue
index 80cc9b2..f9d29af 100644
--- a/pages/qijvguzhangdengji/mouldMistakeBill.vue
+++ b/pages/qijvguzhangdengji/mouldMistakeBill.vue
@@ -17,6 +17,15 @@
style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
size="20" @click="toScanCode"></uni-icons>
</view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" ></uni-icons>
+ </view>
<view class="form-item">
<view class="title">鏁呴殰鍙戠敓鏃ユ湡</view>
@@ -161,6 +170,7 @@
</view>
</view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
</view>
</template>
<script>
@@ -177,13 +187,15 @@
import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
+ import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
import dayjs from 'dayjs';
import { MpaasScan } from '../../utils/mpaasScan';
export default {
components: {
BillListPopupVue,
BarCodePopupVue,
- BillSelectPopupXiaoWeiVue
+ BillSelectPopupXiaoWeiVue,
+ BillListPopupMouldVue,
},
data() {
@@ -244,10 +256,10 @@
"HDate": dayjs(new Date()).format("YYYY-MM-DD hh:mm:ss"),
"HDeptName": getUserInfo()["HDeptName"],
"HDeptID": getUserInfo()["HDeptID"],
- "HEmpName": "",
- "HEmpID": "0",
- "HManagerName": "",
- "HManagerID": "0",
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HManagerName": getUserInfo().HSecManager,
+ "HManagerID": getUserInfo().HSecManagerID,
"HBarName": "",
"HMouldID": "0",
"HBarSpec": "",
@@ -291,6 +303,17 @@
this.InitEmp()
},
methods: {
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if(!mould.enableMultiSourceBill){
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
// 鏁呴殰绫诲埆
async InitConkType() { // 鍒濆鍖栨晠闅滅被鍒�
try {
diff --git a/pages/weixiujilu/mouldRepairRecordBill.vue b/pages/weixiujilu/mouldRepairRecordBill.vue
index e54de02..b6e167a 100644
--- a/pages/weixiujilu/mouldRepairRecordBill.vue
+++ b/pages/weixiujilu/mouldRepairRecordBill.vue
@@ -17,10 +17,19 @@
style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;flex-shrink: 0;"
size="20" @click="toScanCode"></uni-icons>
</view>
+ <view class="form-item" @click="searchModule">
+ <view class="title">鍣ㄥ叿</view>
+ <view class="righton" style="width: 350rpx;">
+ <input placeholder="璇烽�夋嫨鍣ㄥ叿" />
+ </view>
+ <uni-icons type="search"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" ></uni-icons>
+ </view>
<view class="form-item">
<view class="title">婧愬崟绫诲瀷</view>
<view class="right" v-show="showHMainSourceBillType">
- <picker :range="arrayHMainSourceBillType" v-model="HMainSourceBillType"
+ <picker :range="arrayHMainSourceBillType"
@change="HMainSourceBillTypeChange">
<input disabled name="HMainSourceBillType" v-model="HMainSourceBillType"
@@ -166,7 +175,7 @@
<view class="form-item">
<view class="title">鏂拌璁″鍛�</view>
<view class="right">
- <textarea v-model="hform.HNewDesignLife" style="height: 6em;" maxlength="2000"
+ <input v-model="hform.HNewDesignLife"
placeholder="璇疯緭鍏ユ柊璁捐瀵垮懡..." />
</view>
</view>
@@ -252,6 +261,7 @@
:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
</BillListPopupMouldConkBookBillVue>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
+ <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
</view>
</template>
<script>
@@ -267,11 +277,13 @@
} from '../../utils/userRelationManager';
import BillListPopupMouldConkBookBillVue from '../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
import dayjs from 'dayjs';
export default {
components: {
BarCodePopupVue,
- BillListPopupMouldConkBookBillVue
+ BillListPopupMouldConkBookBillVue,
+ BillListPopupMouldVue,
},
data() {
@@ -344,15 +356,12 @@
"HBillNo": "",
"HInterID": "0",
"HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
- "HDeptName": "",
- "HDeptID": "0",
- "Department": "",
- "HEmpName": "",
- "HEmpID": "0",
- "HEmp": "",
- "HManagerName": "",
- "HManagerID": "0",
- "HManager": "",
+ "HDeptName": getUserInfo()["HDeptName"],
+ "HDeptID": getUserInfo()["HDeptID"],
+ "HEmpName": getUserInfo().HEmpName,
+ "HEmpID": getUserInfo().HEmpID,
+ "HManagerName": getUserInfo().HSecManager,
+ "HManagerID": getUserInfo().HSecManagerID,
"HRepairName": "",
"HRepairID": "0",
"HRepairList": "",
@@ -362,7 +371,7 @@
"HSupIDList": "",
"HRepairType": "鍐呴儴缁翠慨",
"HNewModel": "",
- "HNewDesignLife": "",
+ "HNewDesignLife": "0",
"HBarName": "",
"HMouldID": "0",
"HBarSpec": "",
@@ -403,7 +412,7 @@
this.InitEmp()
this.InitSupplier()
this.InitRepairName()
-
+ this.loadCache()
uni.$on('BillSelectComplete', (e) => {
console.log("鎺ユ敹鍒扮殑娑堟伅: ", e)
this.hform.HMainSourceInterID = e.HInterID
@@ -420,6 +429,17 @@
uni.$off('BillSelectComplete')
},
methods: {
+ searchModule() {
+ this.$refs['billListMould'].showPopup()
+ },
+ MouldBillHandler(mould) {
+ if(!mould.enableMultiSourceBill){
+ let val = mould.val[0]
+ this.hform.HBarCode = val['鏉＄爜缂栧彿']
+ this.getHBarCodeData(this.hform.HBarCode)
+ }
+ this.$refs['billListMould'].exit()
+ },
// 缁翠慨椤圭洰
async InitRepairName() { // 鍒濆鍖栫淮淇」鐩�
try {
@@ -732,10 +752,30 @@
this.hform.HMainSourceBillType = -1
return
}
-
+ console.log(e.detail.value)
+ console.log(e)
this.HMainSourceBillType = this.arrayHMainSourceBillType[e.detail.value]
this.hform.HMainSourceBillType = this.arrayHMainSourceBillTypeID[e.detail.value]
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ // 閫夋嫨婧愬崟绫诲瀷鍚� 缂撳瓨褰撳墠椤甸潰閫夋嫨
+ uni.setStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`, {
+ HSourceBillTypeName: this.HMainSourceBillType,
+ HSourceBillType: this.hform.HMainSourceBillType
+ })
},
+ // 璇诲彇缂撳瓨
+ loadCache() {
+ const pages = getCurrentPages()
+ // 鑾峰彇椤甸潰鏍堜腑鐨勬渶鍚庝竴涓厓绱狅紝涔熷氨鏄綋鍓嶆樉绀虹殑椤甸潰
+ const currentPage = pages[pages.length - 1]
+ let HBillTypeCache = uni.getStorageSync(`${currentPage.route.split("/").pop()}_HSourceBillTypeCache`)
+ if (HBillTypeCache) {
+ this.HMainSourceBillType = HBillTypeCache.HSourceBillTypeName
+ this.hform.HMainSourceBillType = HBillTypeCache.HSourceBillType
+ }
+ },
// 鎵弿妯″叿鏉＄爜
async getHBarCodeData(HBarCode) {
if (!HBarCode) {
--
Gitblit v1.9.1