From d1618cf5619134d4f4f0f231cafe395104523aab Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 15 九月 2025 10:39:52 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/shengchanlingliao/form.vue | 170 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 53 deletions(-)
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index 0385bc8..a19f4d0 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -1,32 +1,37 @@
<template>
<view>
<view class="form">
- <!-- <view class="form-item">
- <view class="title">鏉＄爜:</view>
- <view class="right" style="width: 380rpx;">
- <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)"/>
- </view>
- <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
- </view> -->
- <!-- <view class="form-item">
- <view class="title">鏁伴噺:</view>
- <view class="right">
- <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�"/>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撳簱:</view>
- <view class="right">
- <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName" @input="HWHNameChange"></uni-combox>
- </view>
- </view>
- <view class="form-item">
- <view class="title">浠撲綅:</view>
- <view class="right" v-show="showHStockPlaceName">
- <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅" v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
- </view>
- <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName" placeholder="涓嶅彲鎿嶄綔"/></view>
- </view> -->
+ <view class="form-item">
+ <view class="title">鏉＄爜:</view>
+ <view class="right" style="width: 380rpx;">
+ <input v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉＄爜" @confirm="getCode(hform.HBarCode)" />
+ </view>
+ <uni-icons type="scan"
+ style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
+ size="20" @click="toScanCode2"></uni-icons>
+ </view>
+ <view class="form-item">
+ <view class="title">鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HQty" placeholder="璇疯緭鍏ユ暟閲�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撳簱:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHWHName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撳簱" v-model="hform.HWHName"
+ @input="HWHNameChange"></uni-combox>
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">浠撲綅:</view>
+ <view class="right" v-show="showHStockPlaceName">
+ <uni-combox :candidates="arrayHStockPlaceName" placeholder="璇疯緭鍏�(鎴栨壂鎻�)浠撲綅"
+ v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
+ </view>
+ <view class="righton" v-show="!showHStockPlaceName"><input v-model="hform.HStockPlaceName"
+ placeholder="涓嶅彲鎿嶄綔" /></view>
+ </view>
<view class="tabs">
<!-- <view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">閫夋嫨婧愬崟</view> -->
@@ -75,15 +80,15 @@
</label>
</view>
<view v-if="tabs == 2">
- <view class="list" v-for="(item,index) in Materlist" :key="index">
+ <view class="list" v-for="(item,index) in Materlist" :key="index" @tap.stop="cmdDelete(item)">
<uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
<view class="card-detail">
<view class="detail">
<text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
- <view class="detail" v-if="item.鎬绘暟閲�">
- <text>鎬绘暟閲忥細</text>{{item.鎬绘暟閲弣}
- </view>
+ <view class="detail" v-if="item.鎬绘暟閲�">
+ <text>鎬绘暟閲忥細</text>{{item.鎬绘暟閲弣}
+ </view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
<text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
@@ -93,13 +98,13 @@
<view class="detail" v-if="item.杈呭姪灞炴��">
<text>杈呭姪灞炴�э細</text>{{item.杈呭姪灞炴�}
</view>
- <view class="detail" v-if="item.娆惧彿">
- <text>娆惧彿锛�</text>{{item.娆惧彿}}
- </view>
- <view class="detail" v-if="item.鐢熶骇璁㈠崟鍙�">
- <text>鐢熶骇璁㈠崟鍙凤細</text>{{item.鐢熶骇璁㈠崟鍙穧}
- </view>
-
+ <view class="detail" v-if="item.娆惧彿">
+ <text>娆惧彿锛�</text>{{item.娆惧彿}}
+ </view>
+ <view class="detail" v-if="item.鐢熶骇璁㈠崟鍙�">
+ <text>鐢熶骇璁㈠崟鍙凤細</text>{{item.鐢熶骇璁㈠崟鍙穧}
+ </view>
+
</view>
</uni-card>
</view>
@@ -177,6 +182,9 @@
import {
getUserInfo
} from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
export default {
data() {
return {
@@ -191,6 +199,7 @@
tabs: 1,
linterid: '',
HBillNo: '',
+ showHStockPlaceName: false,
arrayHWHName: [], //浠撳簱
HWHNameList: [],
@@ -218,6 +227,8 @@
HSourceBarCodeCtl: "N", //鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
chkHBarflag: false,
HBarflag: '',
+ HSourceInterID: '',
+ HSourceEntryID: '',
HBarCode_B: '',
HMaterName_B: '',
@@ -241,9 +252,57 @@
// this.getNewData()
this.refreshHBillNoFocus()
}
- // this.getHBaseList()
+ this.getHBaseList()
},
methods: {
+ toScanCode2() {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ 'hideAlbum': true,
+ 'timeoutInterval': '10', //瓒呮椂鏃堕棿
+ 'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
+ }, (ret) => {
+ console.log(ret.resp_result)
+ if(this.hform.HBarCode == '*'){
+ this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
+ }else{
+ this.hform.HBarCode = ret.resp_result
+ }
+ // this.hform.HBillNo = ret.resp_result
+ this.getCode(ret.resp_result)
+ })
+ },
+ cmdDelete(item) {
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '纭瑕佸垹闄� " ' + item.鐗╂枡鍚嶇О + ' " 鎵�鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�',
+ success: (res) => {
+ if (res.confirm) {
+ CommonUtils.doRequest2({
+ url: "/WEBSController/set_DeleteBarCodeByEntryID_BillCheck_New_Json",
+ data: {
+ HInterID: this.hform.HInterID,
+ HBillType: this.hform.HBillType,
+ HSourceInterID: item.HSourceInterID,
+ HSourceEntryID: item.HSourceEntryID,
+ HSourceBarCodeCtl: this.hform.HSourceBarCodeCtl
+ },
+ resFunction: (res) => {
+ if (res.data.count == 1) {
+ this.DisBillEntryList()
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ }
+ })
+ }
+ }
+ })
+
+ },
async refreshHBillNoFocus() {
this.HBillNoFocus = false
await this.$nextTick(() => {
@@ -392,6 +451,11 @@
if (this.HWHNameList[i].浠撳簱鍚嶇О == e) {
this.hform.HWHName = this.HWHNameList[i].浠撳簱鍚嶇О
this.hform.HWHID = this.HWHNameList[i].HItemID
+ if (this.HWHNameList[i].鍚敤浠撲綅 == 'Y') {
+ this.showHStockPlaceName = true
+ } else {
+ this.showHStockPlaceName = false
+ }
}
}
},
@@ -467,24 +531,24 @@
sHQty = 0;
}
uni.request({
- url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+ url: this.serverUrl + '/WEBSController/get_CheckTypeByBarCode_BillCheck_Json',
data: {
sBarCode: sBarCode,
- HInterID: this.hform.HInterID,
+ HBillID: this.hform.HInterID || 0,
HBillType: this.hform.HBillType,
HBillNo: this.hform.HBillNo,
HMaker: this.hform.HMaker,
HWhID: sHWHID,
HSPID: sHSPID,
HQty: sHQty,
- HRedBlueFlag: this.hform.HRedBlueFlag,
- SourceFlag: HSourceFlag,
- HSourceBillNo: sSourceBillNo,
- HSourceBillType: sSourceBillType,
+ // HRedBlueFlag: this.hform.HRedBlueFlag,
+ // SourceFlag: HSourceFlag,
+ // HSourceBillNo: sSourceBillNo,
+ // HSourceBillType: sSourceBillType,
HStockOrgID: this.hform.HStockOrgID,
- HScanStyle: "",
- HCustom1: "",
- HCustom2: ""
+ // HScanStyle: "",
+ // HCustom1: "",
+ // HCustom2: ""
},
success: (res) => {
console.log('鎵爜杩斿洖', res.data);
@@ -540,6 +604,7 @@
this.tabs = 2
} else { //鐗╂枡鏉＄爜
this.tabs = 2
+ console.log('data', data)
if (!this.hform.HSourceBillNo) {
this.hform.HSupName = data.hSupNameField
this.hform.HSupID = data.hSupIDField
@@ -548,7 +613,6 @@
this.hform.HDeptID = data.hDeptIDField
this.hform.HDeptName = data.hDeptNameField
}
- console.log(data)
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
this.hform.HMainSourceBillType = data.hSourceBillTypeField
if (data.hSourceBillTypeField == "1103") {
@@ -608,6 +672,7 @@
var data = res.data.data
this.Materlist = data.Materlist
if (!data.BarCodeDetailslist[0].HBarCode) {
+ this.hform.HBarCode_B = ''
this.hform.HMaterName_B = ''
this.hform.HMaterModel_B = ''
this.hform.HBatchNo_B = ''
@@ -617,6 +682,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
@@ -697,14 +763,12 @@
title: '鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�',
icon: 'none'
})
- }
- else if (!this.Materlist || this.Materlist.length == 0) {
+ } else if (!this.Materlist || this.Materlist.length == 0) {
uni.showToast({
title: '娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�',
icon: 'none'
})
- }
- else {
+ } else {
var s = 0;
for (var i = 0; i < this.Materlist.length; i++) {
if (this.Materlist[i].鏁伴噺 > 0) {
@@ -717,7 +781,7 @@
// icon: 'none'
// })
// } else
- {
+ {
uni.showLoading({
title: '璇风◢鍊�'
})
--
Gitblit v1.9.1