From 00573ced1f083d45dbeea58aad6bf4dced03903c Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期五, 20 三月 2026 10:03:57 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue | 144 ++++++++++++++++++++++-------------
locale/zh-Hans.json | 3
pages/shengchanlingliao/PPickingCheckBill.vue | 29 ++++++
pages/qitachuku_v2/OtherOutBill.vue | 13 +-
pages/tiaomachaima/tiaomachaima2.vue | 4
5 files changed, 128 insertions(+), 65 deletions(-)
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 56a693c..39c651c 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -17,7 +17,8 @@
"Kf_OtherOutBill_PDA": {
"title": "鍏朵粬鍑哄簱鍗�",
"disabledPlaceholder": "",
- "placeholder_FIFOWarehouse": ""
+ "placeholder_FIFOWarehouse": "",
+ "stockOutStyleList": "鍑哄簱绫诲瀷"
},
"SellOutBill_PDA": {
"title": "閿�鍞嚭搴撳崟"
diff --git a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
index 7483baa..857cdc1 100644
--- a/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
+++ b/pages/MJGL/Sc_EquipTechParamQuery/Sc_EquipTechParamQuery.vue
@@ -1,30 +1,34 @@
<template>
<view style="padding: 20rpx 40rpx;">
<view>
- <view v-for="item in HTechParams">
- {{ item["鍒嗙粍鍚嶇О"] }}
- <uni-row :gutter="3">
- <uni-col :span="8" v-for="unit in item['鍙傛暟鍒楄〃']">
- <view>
- <uni-tag :text="`${unit.HTechParamName}:${unit.HResult}`" type="primary" />
- </view>
- </uni-col>
- </uni-row>
+ <view v-for="item in HTechParams" style="padding-bottom: 20rpx;">
+ <view class="row-head">{{ item["鍒嗙粍鍚嶇О"] }}</view>
+ <uni-row :gutter="3" class="row-content">
+ <uni-col class="equal-height-col" :span="8" v-for="unit in item['鍙傛暟鍒楄〃']">
+ <view style="font-size: 28rpx;">
+ {{ unit.HTechParamName }}:{{unit.HResult}}
+ </view>
+ </uni-col>
+ </uni-row>
- </view>
+ </view>
</view>
</view>
</template>
<script>
- import { CommonUtils } from '@/utils/common';
- import { getUserInfo } from '@/utils/auth';
+ import {
+ CommonUtils
+ } from '@/utils/common';
+ import {
+ getUserInfo
+ } from '@/utils/auth';
export default {
data() {
return {
HTechParams: []
};
- },
+ },
methods: {
async loadBillMain(HEquipID) {
try {
@@ -34,51 +38,51 @@
HEquipID: HEquipID,
}
})
-
+
let {
data,
count,
Message,
code
} = res.data
-
+
if (code == 1) {
- // Object.assign(this.hform, {
- // "HMaterID": data[0].HMaterID,
- // "HMaterNumber": data[0].浜у搧浠ｇ爜,
- // "HMaterName": data[0].浜у搧鍚嶇О,
- // "HMaterModel": data[0].瑙勬牸鍨嬪彿,
- // "HProcID": data[0].HProcID,
- // "HProcName": data[0].宸ュ簭鍚嶇О,
- // "HProcNo": data[0].宸ュ簭鍙�,
- // //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
- // //"HGroupName": data[0].鐝粍,
- // "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
- // "HDeptName": data[0].鍔犲伐杞﹂棿,
-
- // "HSourceID": data[0].HSourceID,
- // "HSourceName": data[0].鐢熶骇璧勬簮,
-
- // "HEquipID": data[0].HEquipID,
- // "HEquipName": data[0].璁惧鍚嶇О,
-
- // "HICMOInterID": data[0].hicmointerid,
- // "HICMOEntryID": data[0].HICMOEntryID,
- // "HICMOBillNo": data[0].浠诲姟鍗曞彿,
-
- // "HProcExchInterID": data[0].hmainid,
- // "HProcExchEntryID": data[0].HEntryID,
- // "HProcExchBillNo": data[0].鍗曟嵁鍙�,
-
- // "HMainSourceInterID": data[0].hmainid,
- // "HMainSourceEntryID": data[0].HEntryID,
- // "HMainSourceBillNo": data[0].鍗曟嵁鍙�,
- // "HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
-
- // "HMouldName": data[0].妯″叿鍚嶇О,
- // "HMouldID": data[0].HMouldID
- // })
-
+ // Object.assign(this.hform, {
+ // "HMaterID": data[0].HMaterID,
+ // "HMaterNumber": data[0].浜у搧浠ｇ爜,
+ // "HMaterName": data[0].浜у搧鍚嶇О,
+ // "HMaterModel": data[0].瑙勬牸鍨嬪彿,
+ // "HProcID": data[0].HProcID,
+ // "HProcName": data[0].宸ュ簭鍚嶇О,
+ // "HProcNo": data[0].宸ュ簭鍙�,
+ // //"HGroupID": data[0].HGroupID == undefined ? 0 : data[0].HGroupID,
+ // //"HGroupName": data[0].鐝粍,
+ // "HDeptID": data[0].HDeptID == undefined ? 0 : data[0].HDeptID,
+ // "HDeptName": data[0].鍔犲伐杞﹂棿,
+
+ // "HSourceID": data[0].HSourceID,
+ // "HSourceName": data[0].鐢熶骇璧勬簮,
+
+ // "HEquipID": data[0].HEquipID,
+ // "HEquipName": data[0].璁惧鍚嶇О,
+
+ // "HICMOInterID": data[0].hicmointerid,
+ // "HICMOEntryID": data[0].HICMOEntryID,
+ // "HICMOBillNo": data[0].浠诲姟鍗曞彿,
+
+ // "HProcExchInterID": data[0].hmainid,
+ // "HProcExchEntryID": data[0].HEntryID,
+ // "HProcExchBillNo": data[0].鍗曟嵁鍙�,
+
+ // "HMainSourceInterID": data[0].hmainid,
+ // "HMainSourceEntryID": data[0].HEntryID,
+ // "HMainSourceBillNo": data[0].鍗曟嵁鍙�,
+ // "HMainSourceBillType": data[0].鍗曟嵁绫诲瀷,
+
+ // "HMouldName": data[0].妯″叿鍚嶇О,
+ // "HMouldID": data[0].HMouldID
+ // })
+
this.HTechParams = data
} else {
CommonUtils.showTips({
@@ -86,7 +90,7 @@
message: `鑾峰彇婧愬崟淇℃伅澶辫触: ${Message}`
})
}
-
+
} catch (err) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -96,12 +100,44 @@
},
},
onLoad(e) {
- let {HEquipID} = e
+ let {
+ HEquipID
+ } = e
this.loadBillMain(HEquipID)
}
}
</script>
<style lang="scss">
+ .row-head {
+ border-radius: 10rpx 10rpx 0 0;
+ background-color: rgb(229, 236, 243);
+ padding: 0 12rpx;
+ font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
+ }
-</style>
+ .row-content {
+ width: 100%;
+ padding: 15rpx;
+ background: #f5f5f5;
+ word-break: break-all;
+ display: flex;
+ align-items: stretch;
+ flex-wrap: wrap;
+ border-collapse: collapse;
+ border: #f0f0f0 2px solid;
+ }
+
+ .row-content:last-child {
+ border-radius: 0 0 10rpx 10rpx;
+ }
+
+ .equal-height-col {
+ display: flex;
+ height: inherit;
+ padding: 1rpx;
+ justify-content: center;
+ color: rgba(124, 124, 124, 1.0);
+ font-family: "PingFang SC", "Microsoft YaHei", sans-serifs;
+ }
+</style>
\ No newline at end of file
diff --git a/pages/qitachuku_v2/OtherOutBill.vue b/pages/qitachuku_v2/OtherOutBill.vue
index 5c3579a..923b27f 100644
--- a/pages/qitachuku_v2/OtherOutBill.vue
+++ b/pages/qitachuku_v2/OtherOutBill.vue
@@ -127,13 +127,13 @@
</view>
</view>
<view class="form-item">
- <view class="title">鍑哄簱绫诲瀷:</view>
- <zxz-uni-data-select v-if="showHSupName" required class="right" :localdata="stockOutStyleList"
+ <view class="title">{{$t('Kf_OtherOutBill_PDA.stockOutStyleList')}}:</view>
+ <zxz-uni-data-select required class="right" :localdata="stockOutStyleList"
dataKey="HName" dataValue="HName" v-model="hform.HStockStyle">
</zxz-uni-data-select>
- <view class="righton" v-if="!showHSupName">
- <input name="HSupName" disabled v-model="hform.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" />
- </view>
+ <!-- <view class="righton" v-if="!showHSupName">
+ <input name="stockOutSty" disabled v-model="hform.HStockStyle" placeholder="璇烽�夋嫨鍑哄簱绫诲瀷" />
+ </view> -->
</view>
<view class="form-item">
<view class="title">
@@ -1771,7 +1771,8 @@
this.hform.HBillNo = data.HBillNo
this.hform.HMainSourceBillType = data.HSourceBillType
this.hform.HSourceBillNo = data.HSourceBillNo
-
+ this.hform.HStockStyle = data.HStockStyle
+
let index = this.arrayHMainSourceBillValue.findIndex(e => e == data
.HSourceBillType)
if (index != -1) {
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index 6bf57ab..e860169 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -157,9 +157,14 @@
</view>
<view class="form-item">
<view class="title">鏁伴噺:</view>
- <view class="righton">
- <input disabled v-model="hform.HQty_B" />
+ <view class="right">
+ <input v-model="hform.HQty_B" placeholder="璇疯緭鍏ユ暟閲�" />
</view>
+ <view style="width: 12rpx;"></view>
+ <button class="btn-a" size="mini" @tap="changeQty">纭畾</button>
+ <!-- <view class="righton">
+ <input disabled v-model="hform.HQty_B" />
+ </view> -->
</view>
<view class="form-item">
<view class="title">瀹归噺:</view>
@@ -325,6 +330,19 @@
uni.$off('BillSelectComplete')
},
methods: {
+ async changeQty() {
+ let HBarCodeOld = this.hform.HBarCode_B
+ let HQtyOld = this.hform.HQty_B
+ this.hform.HBarCode = `*${this.hform.HBarCode_B}`
+ // 鍏堝垹闄�
+ await this.getCode(`*${this.hform.HBarCode_B}`)
+ // 鍐嶅綍鍏�
+ this.hform.HBarCode = HBarCodeOld
+ this.hform.HQty = HQtyOld
+ await this.getCode(this.hform.HBarCode_B)
+ this.hform.HQty = ''
+ this.hform.HBarCode = ''
+ },
// 鑾峰彇浠撲綅
async getStockPlaceRemote(HSPGroupID) {
try {
@@ -696,6 +714,8 @@
if (!this.hform.HStockPlaceName) {
this.hform.HStockPlaceID = 0
}
+
+ console.log('HBarCode: ',HBarCode);
var sOldBarCode = HBarCode
var HDeleteFlag = sOldBarCode.substring(0, 1);
var sBarCode = sOldBarCode.slice(1);
@@ -1534,4 +1554,9 @@
margin-top: 30rpx;
float: right;
}
+ .btn-a {
+ background-color: #3A78FF;
+ color: #fff;
+ font-size: 28rpx;
+ }
</style>
\ No newline at end of file
diff --git a/pages/tiaomachaima/tiaomachaima2.vue b/pages/tiaomachaima/tiaomachaima2.vue
index fe3f7ad..48319d4 100644
--- a/pages/tiaomachaima/tiaomachaima2.vue
+++ b/pages/tiaomachaima/tiaomachaima2.vue
@@ -260,7 +260,7 @@
}
},
(err) => {
- console.err(err)
+ console.error(err)
this.barCodeCall = false
}
)
@@ -368,7 +368,7 @@
}
},
(err) => {
- console.err(err)
+ console.error(err)
},
"POST"
)
--
Gitblit v1.9.1