From 2ffc56e71cde3c5149ce1be30fcabcdbd4c9e312 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 三月 2026 17:26:09 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/caigouruku/POStockInBillList.vue | 99 ++-
pages/caigoutuiliao/POStockInBackBillList.vue | 1019 ++++++++++++++++++++++--------------------
pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue | 78 +++
manifest.json | 4
components/ZWDB/HItem.vue | 18
pages/qitaruku_v2/OtherInBill.vue | 6
pages/index/login.vue | 159 +++---
7 files changed, 768 insertions(+), 615 deletions(-)
diff --git a/components/ZWDB/HItem.vue b/components/ZWDB/HItem.vue
index 37eb131..3c8f554 100644
--- a/components/ZWDB/HItem.vue
+++ b/components/ZWDB/HItem.vue
@@ -1,4 +1,5 @@
<template>
+ <transition name="todostyle" appear>
<li class="todo-item">
<checkbox-group v-for="(item, index) in todoItem" :key="item.HID" @change="onCheckboxChange(item.鏄惁閫変腑,item.HID) ">
<label class="radio-option" v-show="item.鏄惁鍚敤">
@@ -8,6 +9,7 @@
</label>
</checkbox-group>
</li>
+ </transition>
</template>
<script>
@@ -101,4 +103,20 @@
button.delete-btn::after {
border: none;
}
+.todostyle-enter-active {
+ transition: all 0.3s linear;
+}
+.todostyle-leave-active{
+ transition: all 0.3s linear reverse;
+}
+@keyframes todostyle-enter {
+ 0% {
+ opacity: 0;
+ transform: translateX(120px);
+ }
+ 100% {
+ opacity: 1;
+ transform: translateX(0);
+ }
+}
</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7963043..6997358 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "2.088",
- "versionCode" : 288,
+ "versionName" : "2.089",
+ "versionCode" : 289,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue b/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue
index 8df3fb2..38e5e4c 100644
--- a/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue
+++ b/pages/ZLGL/Gy_MaterialPrevention/Gy_MaterialPrevention.vue
@@ -25,6 +25,7 @@
<view class="tabs" id="tabs">
<view :class="tabs == 0 ? 'on':''" @tap="tabs = 0">鍩烘湰淇℃伅</view>
<view :class="tabs == 1 ? 'on':''" @tap="tabs = 1">鐗╂枡淇℃伅</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="tabs = 2">鍙姇鏂欑墿鏂�</view>
</view>
<template v-if="tabs == 0">
<view class="form" :style="{
@@ -82,11 +83,11 @@
<uni-card :title="item.HBarCode" style="margin: 10px;"
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-if="item.HMaterNumber">
- <text>鐗╂枡缂栫爜锛�</text>{{item.HMaterNumber}}
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>鐗╂枡缂栫爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
- <view class="detail" v-if="item.HMaterName">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.HMaterName}}
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.HMaterModel">
<text>瑙勫垯鍨嬪彿锛�</text>{{item.HMaterModel}}
@@ -106,7 +107,32 @@
</view>
</view>
</template>
-
+ <template v-if="tabs == 2">
+ <view :style="{
+ height: containerHeight + 'px',
+ overflowY: 'auto'
+ }">
+ <view v-if="HMaterList.length > 0" class="list" v-for="(item,index) in HMaterList"
+ :key="index" @tap.stop="delMater(index)">
+ <uni-card :title="item.宸ヤ綅浠ｇ爜" style="margin: 10px;"
+ @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>鐗╂枡缂栫爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+
+
+ </view>
+ </uni-card>
+ </view>
+ <view v-if="HMaterUpperList.length == 0" class="over">
+ 鏆傛棤鏁版嵁
+ </view>
+ </view>
+ </template>
<view class="buttons" id="buttons">
<button :class="editBill?'btn-c':'btn-a'" :disabled="editBill" size="mini" @tap="submit">鎻愪氦</button>
<view style="flex: 1"></view>
@@ -262,6 +288,7 @@
title: '娓╅Θ鎻愮ず',
message: '鏈壂鎻忓伐浣嶇爜锛屾棤娉曟壂鎻忕墿鏂欑爜锛岃鍏堟壂鎻忓伐浣嶇爜鍚庡啀鎵弿鐗╂枡鐮�...'
})
+ return
}
try {
@@ -284,22 +311,28 @@
let findIndexExist = this.HMaterUpperList.findIndex(item => data[0]["HBarCode"] == item[
"HBarCode"])
if (findIndex == -1) {
+ //鍐欏叆鏃ュ織
+ this.WriteErrlog(this.HMaterCode,'褰曞叆鐗╂枡淇℃伅澶辫触锛屽伐浣嶇粦瀹氱殑鐗╂枡涓病鏈夋墍鎵墿鏂欎俊鎭��')
CommonUtils.playSound(0)
this.refreshHMaterCodeFocus()
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: '褰曞叆鐗╂枡淇℃伅澶辫触锛屽伐浣嶇粦瀹氱殑鐗╂枡涓病鏈夋墍鎵墿鏂欎俊鎭��'
})
+
return
}
if (findIndexExist != -1) {
CommonUtils.playSound(0)
+ //鍐欏叆鏃ュ織
+ this.WriteErrlog(this.HMaterCode,'褰曞叆鐗╂枡淇℃伅澶辫触锛屼笉鍏佽閲嶅褰曞叆鐗╂枡淇℃伅銆�')
this.refreshHMaterCodeFocus()
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: '褰曞叆鐗╂枡淇℃伅澶辫触锛屼笉鍏佽閲嶅褰曞叆鐗╂枡淇℃伅銆�'
})
+
return
}
@@ -310,6 +343,8 @@
this.refreshHMaterCodeFocus()
} else {
CommonUtils.playSound(0)
+ //鍐欏叆鏃ュ織
+ this.WriteErrlog(this.HMaterCode,Message)
this.refreshHMaterCodeFocus()
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -318,6 +353,8 @@
}
} catch (err) {
this.refreshHMaterCodeFocus()
+ //鍐欏叆鏃ュ織
+ this.WriteErrlog(this.HMaterCode,Message)
CommonUtils.playSound(0)
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
@@ -325,6 +362,37 @@
})
}
},
+ async WriteErrlog(HMaterCode,Reason) {
+ let HRemark = "鎵弿宸ヤ綅ID"+this.hform.HWorkStationID+",宸ヤ綅鍚嶇О锛�"+this.hform.HWorkStationName+",鎵弿鏉＄爜缂栧彿锛�"+HMaterCode+",澶辫触鍘熷洜锛�"+Reason
+ try {
+ let res = await CommonUtils.doRequest2Async({
+ url: '/Sc_FeedingErrorProofingController/WriteErrlog',
+ data: {
+ user:getUserInfo()["Czymc"],
+ HRemark:HRemark
+ }
+ })
+
+ let {
+ data,
+ Message,
+ count
+ } = res.data
+ if (count == 1) {
+
+ } else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鏃ュ織涓婁紶澶辫触: ${Message}`
+ })
+ }
+ } catch (err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鏃ュ織涓婁紶澶辫触: ${err}`
+ })
+ }
+ },
delMater(index) {
if (this.editBill) {
return
diff --git a/pages/caigouruku/POStockInBillList.vue b/pages/caigouruku/POStockInBillList.vue
index 86da413..56f05e8 100644
--- a/pages/caigouruku/POStockInBillList.vue
+++ b/pages/caigouruku/POStockInBillList.vue
@@ -1,33 +1,42 @@
<template>
<view class="content">
<view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">
+ {{ $t("POStockInBillList.cacheList") == "POStockInBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("POStockInBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("POStockInBillList.updatedList") == "POStockInBillList.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("POStockInBillList.updatedList") }}
+ </view>
</view>
<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
<view class="form" v-if="tabs == 0">
<view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>
+ {{ $t("POStockInBillList.btnAdd") == "POStockInBillList.btnAdd" ? "鏂板" : $t("POStockInBillList.btnAdd") }}
</view>
</view>
<view class="form" v-if="tabs == 1">
<view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
+ <view class="title">{{ $t("POStockInBillList.billNo") == "POStockInBillList.billNo" ? "鍗曟嵁鍙�:" : $t("POStockInBillList.billNo") }}:</view>
<view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <input v-model="hform.HBillNo" :placeholder="$t('POStockInBillList.billNoPlaceholder') == 'POStockInBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('POStockInBillList.billNoPlaceholder')" />
</view>
</view>
<view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
+ <view class="title">{{ $t("POStockInBillList.sourceBillNo") == "POStockInBillList.sourceBillNo" ? "婧愬崟鍗曞彿:" : $t("POStockInBillList.sourceBillNo") }}:</view>
<view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('POStockInBillList.sourceBillNoPlaceholder') == 'POStockInBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('POStockInBillList.sourceBillNoPlaceholder')" />
</view>
</view>
<view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
+ <button class="btn-a" size="mini" type="default" @tap="clear">
+ {{ $t("POStockInBillList.btn_Reset") == "POStockInBillList.btn_Reset" ? "閲嶇疆" : $t("POStockInBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("POStockInBillList.btn_Query") == "POStockInBillList.btn_Query" ? "鏌ヨ" : $t("POStockInBillList.btn_Query") }}
+ </button>
</view>
</view>
@@ -38,28 +47,30 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("POStockInBillList.table_Maker") == "POStockInBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鍗曟嵁鍐呯爜">
- <text>鍗曟嵁鍐呯爜锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ <text>{{ $t("POStockInBillList.table_BillID") == "POStockInBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("POStockInBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("POStockInBillList.table_Qty") == "POStockInBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("POStockInBillList.table_SourceBillNo") == "POStockInBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("POStockInBillList.table_Org") == "POStockInBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBillList.btn_Edit") == "POStockInBillList.btn_Edit" ? "缂栬緫" : $t("POStockInBillList.btn_Edit") }}
</view>
<view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBillList.btn_Del") == "POStockInBillList.btn_Del" ? "鍒犻櫎" : $t("POStockInBillList.btn_Del") }}
</view>
</view>
</uni-card>
@@ -69,42 +80,50 @@
@tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
<view class="detail" v-if="item.鍒跺崟浜�">
- <text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
+ <text>{{ $t("POStockInBillList.table_Maker") == "POStockInBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
<view class="detail" v-if="item.鏁伴噺">
- <text>鏁伴噺锛�</text>{{item.鏁伴噺}}
+ <text>{{ $t("POStockInBillList.table_Qty") == "POStockInBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
</view>
<view class="detail" v-if="item.婧愬崟鍗曞彿">
- <text>婧愬崟鍗曞彿锛�</text>{{item.婧愬崟鍗曞彿}}
+ <text>{{ $t("POStockInBillList.table_SourceBillNo") == "POStockInBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
</view>
<view class="detail" v-if="item.鐗╂枡浠ｇ爜">
- <text>鐗╂枡浠ｇ爜锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ <text>{{ $t("POStockInBillList.table_MaterNumber") == "POStockInBillList.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("POStockInBillList.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
</view>
<view class="detail" v-if="item.鐗╂枡鍚嶇О">
- <text>鐗╂枡鍚嶇О锛�</text>{{item.鐗╂枡鍚嶇О}}
+ <text>{{ $t("POStockInBillList.table_MaterName") == "POStockInBillList.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("POStockInBillList.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
</view>
<view class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ <text>{{ $t("POStockInBillList.table_MaterModel") == "POStockInBillList.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("POStockInBillList.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
</view>
<view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
+ <text>{{ $t("POStockInBillList.table_Org") == "POStockInBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
</view>
</view>
<view class="more">
<view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBillList.btn_DisplayCode") == "POStockInBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("POStockInBillList.btn_DisplayCode") }}
</view>
<view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBillList.btn_Revoke") == "POStockInBillList.btn_Revoke" ? "鎾ら攢" : $t("POStockInBillList.btn_Revoke") }}
</view>
</view>
</uni-card>
</view>
- <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="over" v-if="listData.length == 0">
+ {{ $t("POStockInBillList.noDate") == "POStockInBillList.noDate" ? "鏆傛棤鏁版嵁" : $t("POStockInBillList.noDate") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("POStockInBillList.Loading") == "POStockInBillList.Loading" ? "鍔犺浇涓�..." : $t("POStockInBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("POStockInBillList.bottom") == "POStockInBillList.bottom" ? "宸插埌搴�" : $t("POStockInBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
@@ -121,7 +140,7 @@
serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
tabs: 0,
urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle: '閲囪喘鍏ュ簱鍗曠紦瀛樺垪琛�',
+ MvarReportTitle: this.$t('POStockInBillList.reportTitle') == 'POStockInBillList.reportTitle' ? '閲囪喘鍏ュ簱鍗曠紦瀛樺垪琛�' : this.$t('POStockInBillList.reportTitle'),
hform: {
HBillNo: '',
HSourceBillNo: '',
@@ -182,7 +201,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('POStockInBillList.requestFailed') == 'POStockInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBillList.requestFailed'),
icon: 'none'
})
},
@@ -209,7 +228,7 @@
},
getList() {
uni.showLoading({
- title: '鍔犺浇涓�...'
+ title: this.$t('POStockInBillList.loadingTitle') == 'POStockInBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('POStockInBillList.loadingTitle')
})
uni.request({
url: this.serverUrl + this.urls,
@@ -235,7 +254,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('POStockInBillList.requestFailed') == 'POStockInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBillList.requestFailed'),
icon: 'none'
})
},
@@ -304,7 +323,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('POStockInBillList.requestFailed') == 'POStockInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBillList.requestFailed'),
icon: 'none'
})
},
@@ -312,10 +331,9 @@
},
//鍒犻櫎
del(item) {
- // console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
+ title: this.$t('POStockInBillList.confirmTitle') == 'POStockInBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBillList.confirmTitle'),
+ content: this.$t('POStockInBillList.delConfirm') == 'POStockInBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('POStockInBillList.delConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -343,7 +361,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('POStockInBillList.requestFailed') == 'POStockInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBillList.requestFailed'),
icon: 'none'
})
},
@@ -356,10 +374,9 @@
},
//鎾ら攢
revoke(item) {
- // console.log(item.hmainid,uni.getStorageSync('HUserName'))
uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
+ title: this.$t('POStockInBillList.confirmTitle') == 'POStockInBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBillList.confirmTitle'),
+ content: this.$t('POStockInBillList.revokeConfirm') == 'POStockInBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('POStockInBillList.revokeConfirm'),
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
@@ -387,7 +404,7 @@
console.log(res);
uni.hideLoading()
uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
+ title: this.$t('POStockInBillList.requestFailed') == 'POStockInBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBillList.requestFailed'),
icon: 'none'
})
},
diff --git a/pages/caigoutuiliao/POStockInBackBillList.vue b/pages/caigoutuiliao/POStockInBackBillList.vue
index 2a59146..80fd83e 100644
--- a/pages/caigoutuiliao/POStockInBackBillList.vue
+++ b/pages/caigoutuiliao/POStockInBackBillList.vue
@@ -1,506 +1,543 @@
<template>
- <view class="content">
- <view class="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">缂撳瓨鍒楄〃</view>
- <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">宸蹭笂浼犲垪琛�</view>
- </view>
-
- <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
- <view class="form" v-if="tabs == 0">
- <view class="buttons" @tap="add">
- <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>鏂板
- </view>
- </view>
- <view class="form" v-if="tabs == 1">
- <view class="form-item">
- <view class="title">鍗曟嵁鍙�:</view>
- <view class="right">
- <input v-model="hform.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
- </view>
- </view>
- <view class="form-item">
- <view class="title">婧愬崟鍗曞彿:</view>
- <view class="right">
- <input v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
- </view>
- </view>
- <view class="buttons">
- <button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
- <button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
- </view>
- </view>
-
- <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
- <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
- <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <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>
+ <view class="content">
+ <view class="tabs">
+ <view :class="tabs == 0 ? 'on':''" @tap="changeTab(0)">
+ {{ $t("POStockInBackBillList.cacheList") == "POStockInBackBillList.cacheList" ? "缂撳瓨鍒楄〃" : $t("POStockInBackBillList.cacheList") }}
+ </view>
+ <view :class="tabs == 1 ? 'on':''" @tap="changeTab(1)">
+ {{ $t("POStockInBackBillList.updatedList") == "POStockInBackBillList.updatedList" ? "宸蹭笂浼犲垪琛�" : $t("POStockInBackBillList.updatedList") }}
+ </view>
+ </view>
- <view class="more">
- <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
- <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>缂栬緫
- </view>
- <view class="part" style="color: #da0000;" @tap.stop="del(item)">
- <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>鍒犻櫎
- </view>
- </view>
- </uni-card>
- </view>
- <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
- <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail">
- <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 class="detail" v-if="item.瑙勬牸鍨嬪彿">
- <text>瑙勬牸鍨嬪彿锛�</text>{{item.瑙勬牸鍨嬪彿}}
- </view>
- <view class="detail" v-if="item.缁勭粐">
- <text>缁勭粐锛�</text>{{item.缁勭粐}}
- </view>
- </view>
-
- <view class="more">
- <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
- <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>鏄剧ず浜岀淮鐮�
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="form" v-if="tabs == 0">
+ <view class="buttons" @tap="add">
+ <uni-icons type="plus" style="margin-right: 10rpx;" size="22"></uni-icons>
+ {{ $t("POStockInBackBillList.btnAdd") == "POStockInBackBillList.btnAdd" ? "鏂板" : $t("POStockInBackBillList.btnAdd") }}
+ </view>
+ </view>
+ <view class="form" v-if="tabs == 1">
+ <view class="form-item">
+ <view class="title">{{ $t("POStockInBackBillList.billNo") == "POStockInBackBillList.billNo" ? "鍗曟嵁鍙�:" : $t("POStockInBackBillList.billNo") }}:</view>
+ <view class="right">
+ <input v-model="hform.HBillNo" :placeholder="$t('POStockInBackBillList.billNoPlaceholder') == 'POStockInBackBillList.billNoPlaceholder' ? '璇疯緭鍏ュ崟鎹彿' : $t('POStockInBackBillList.billNoPlaceholder')" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">{{ $t("POStockInBackBillList.sourceBillNo") == "POStockInBackBillList.sourceBillNo" ? "婧愬崟鍗曞彿:" : $t("POStockInBackBillList.sourceBillNo") }}:</view>
+ <view class="right">
+ <input v-model="hform.HSourceBillNo" :placeholder="$t('POStockInBackBillList.sourceBillNoPlaceholder') == 'POStockInBackBillList.sourceBillNoPlaceholder' ? '璇疯緭鍏ユ簮鍗曞崟鍙�' : $t('POStockInBackBillList.sourceBillNoPlaceholder')" />
+ </view>
+ </view>
+ <view class="buttons">
+ <button class="btn-a" size="mini" type="default" @tap="clear">
+ {{ $t("POStockInBackBillList.btn_Reset") == "POStockInBackBillList.btn_Reset" ? "閲嶇疆" : $t("POStockInBackBillList.btn_Reset") }}
+ </button>
+ <button class="btn-c" size="mini" type="default" @tap="search">
+ {{ $t("POStockInBackBillList.btn_Query") == "POStockInBackBillList.btn_Query" ? "鏌ヨ" : $t("POStockInBackBillList.btn_Query") }}
+ </button>
+ </view>
+ </view>
+
+ <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
+
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
+ <uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>{{ $t("POStockInBackBillList.table_Maker") == "POStockInBackBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
</view>
- <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
- <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>鎾ら攢
- </view>
- </view>
- </uni-card>
- </view>
-
- <view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
- <view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
- <view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
+ <view class="detail" v-if="item.鍗曟嵁鍐呯爜">
+ <text>{{ $t("POStockInBackBillList.table_BillID") == "POStockInBackBillList.table_BillID" ? "鍗曟嵁鍐呯爜锛�" : $t("POStockInBackBillList.table_BillID") }}锛�</text>{{item.鍗曟嵁鍐呯爜}}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("POStockInBackBillList.table_Qty") == "POStockInBackBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("POStockInBackBillList.table_SourceBillNo") == "POStockInBackBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("POStockInBackBillList.table_Org") == "POStockInBackBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
+
+ <view class="more">
+ <view class="part" style="border-right: 1px solid #eee;color: #3a78ff;" @tap.stop="edit(item)">
+ <uni-icons type="compose" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBackBillList.btn_Edit") == "POStockInBackBillList.btn_Edit" ? "缂栬緫" : $t("POStockInBackBillList.btn_Edit") }}
+ </view>
+ <view class="part" style="color: #da0000;" @tap.stop="del(item)">
+ <uni-icons type="trash" style="color: #da0000;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBackBillList.btn_Del") == "POStockInBackBillList.btn_Del" ? "鍒犻櫎" : $t("POStockInBackBillList.btn_Del") }}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+ <view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==1">
+ <uni-card :title="item.鏃ユ湡" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
+ <view class="card-detail">
+ <view class="detail" v-if="item.鍒跺崟浜�">
+ <text>{{ $t("POStockInBackBillList.table_Maker") == "POStockInBackBillList.table_Maker" ? "鍒跺崟浜猴細" : $t("POStockInBackBillList.table_Maker") }}锛�</text>{{item.鍒跺崟浜簘}
+ </view>
+ <view class="detail" v-if="item.鏁伴噺">
+ <text>{{ $t("POStockInBackBillList.table_Qty") == "POStockInBackBillList.table_Qty" ? "鏁伴噺锛�" : $t("POStockInBackBillList.table_Qty") }}锛�</text>{{item.鏁伴噺}}
+ </view>
+ <view class="detail" v-if="item.婧愬崟鍗曞彿">
+ <text>{{ $t("POStockInBackBillList.table_SourceBillNo") == "POStockInBackBillList.table_SourceBillNo" ? "婧愬崟鍗曞彿锛�" : $t("POStockInBackBillList.table_SourceBillNo") }}锛�</text>{{item.婧愬崟鍗曞彿}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡浠ｇ爜">
+ <text>{{ $t("POStockInBackBillList.table_MaterNumber") == "POStockInBackBillList.table_MaterNumber" ? "鐗╂枡浠ｇ爜锛�" : $t("POStockInBackBillList.table_MaterNumber") }}锛�</text>{{item.鐗╂枡浠ｇ爜}}
+ </view>
+ <view class="detail" v-if="item.鐗╂枡鍚嶇О">
+ <text>{{ $t("POStockInBackBillList.table_MaterName") == "POStockInBackBillList.table_MaterName" ? "鐗╂枡鍚嶇О锛�" : $t("POStockInBackBillList.table_MaterName") }}锛�</text>{{item.鐗╂枡鍚嶇О}}
+ </view>
+ <view class="detail" v-if="item.瑙勬牸鍨嬪彿">
+ <text>{{ $t("POStockInBackBillList.table_MaterModel") == "POStockInBackBillList.table_MaterModel" ? "瑙勬牸鍨嬪彿锛�" : $t("POStockInBackBillList.table_MaterModel") }}锛�</text>{{item.瑙勬牸鍨嬪彿}}
+ </view>
+ <view class="detail" v-if="item.缁勭粐">
+ <text>{{ $t("POStockInBackBillList.table_Org") == "POStockInBackBillList.table_Org" ? "缁勭粐锛�" : $t("POStockInBackBillList.table_Org") }}锛�</text>{{item.缁勭粐}}
+ </view>
+ </view>
+
+ <view class="more">
+ <view class="part" style="color: #3a78ff;width: 100%;" @tap.stop="qrCodeDisplay(item)">
+ <uni-icons type="scan" style="color: #3a78ff;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBackBillList.btn_DisplayCode") == "POStockInBackBillList.btn_DisplayCode" ? "鏄剧ず浜岀淮鐮�" : $t("POStockInBackBillList.btn_DisplayCode") }}
+ </view>
+ <view class="part" style="color: #d98d00;width: 100%;" @tap.stop="revoke(item)">
+ <uni-icons type="undo" style="color: #d98d00;margin-right: 10rpx;" size="18"></uni-icons>
+ {{ $t("POStockInBackBillList.btn_Revoke") == "POStockInBackBillList.btn_Revoke" ? "鎾ら攢" : $t("POStockInBackBillList.btn_Revoke") }}
+ </view>
+ </view>
+ </uni-card>
+ </view>
+
+ <view class="over" v-if="listData.length == 0">
+ {{ $t("POStockInBackBillList.noDate") == "POStockInBackBillList.noDate" ? "鏆傛棤鏁版嵁" : $t("POStockInBackBillList.noDate") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length != showList.length">
+ {{ $t("POStockInBackBillList.Loading") == "POStockInBackBillList.Loading" ? "鍔犺浇涓�..." : $t("POStockInBackBillList.Loading") }}
+ </view>
+ <view class="over" v-if="listData.length != 0 && listData.length == showList.length">
+ {{ $t("POStockInBackBillList.bottom") == "POStockInBackBillList.bottom" ? "宸插埌搴�" : $t("POStockInBackBillList.bottom") }}
+ </view>
<BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
</view>
</template>
<script>
- import { getUserInfo } from "@/utils/auth.js";
- import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
+ import { getUserInfo } from "@/utils/auth.js";
+ import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
export default {
- data() {
- return {
- userInfo:getUserInfo(),
- serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
- tabs:0,
- urls:'/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
- MvarReportTitle:'閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃',
- hform:{
- HBillNo:'',
- HSourceBillNo:'',
- HBillType: 1239,
- HMaker: uni.getStorageSync('HUserName'),
- HStockOrgID: uni.getStorageSync('OrganizationID'),
- },
- sWhere:'',
- listData:[],
- showList:[],
- showDetail:-1,
-
- page:1,
- }
- },
- components: {BarCodePopupVue},
- onLoad() {
- //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
- this.CheckModRight()
- this.changeTab(0)
- console.log(this.userInfo,uni.getStorageSync('HUserName'))
- },
- onReachBottom: function() {
- this.page++
- setTimeout(() => {
- this.showList = this.showList.concat(this.getPage(this.page,this.listData))
- }, 100)
- },
- onPullDownRefresh: function() {
- this.clear()
- setTimeout(()=>{
- uni.stopPullDownRefresh();
- }, 1000);
- },
- methods: {
+ data() {
+ return {
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ tabs: 0,
+ urls: '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json',
+ MvarReportTitle: this.$t('POStockInBackBillList.reportTitle') == 'POStockInBackBillList.reportTitle' ? '閲囪喘閫�鏂欏崟缂撳瓨鍒楄〃' : this.$t('POStockInBackBillList.reportTitle'),
+ hform: {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 1239,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ },
+ sWhere: '',
+ listData: [],
+ showList: [],
+ showDetail: -1,
+
+ page: 1,
+ }
+ },
+ components: { BarCodePopupVue },
+ onLoad() {
+ //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+ this.CheckModRight()
+ this.changeTab(0)
+ console.log(this.userInfo, uni.getStorageSync('HUserName'))
+ },
+ onReachBottom: function() {
+ this.page++
+ setTimeout(() => {
+ this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+ }, 100)
+ },
+ onPullDownRefresh: function() {
+ this.clear()
+ setTimeout(() => {
+ uni.stopPullDownRefresh();
+ }, 1000);
+ },
+ methods: {
async qrCodeDisplay(item) {
- this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
- await this.$nextTick()
- this.$refs.barcodePopup.open()
+ this.$refs.barcodePopup.setCodeInfo(item.HBillNo)
+ await this.$nextTick()
+ this.$refs.barcodePopup.open()
},
- CheckModRight(){
- uni.request({
- url: this.serverUrl + '/WEBSController/CheckModRight_Json',
- data:{
- ModRightName: 'CE_POStockInBack',
- HUserName: uni.getStorageSync('HUserName')
- },
- success: (res) => {
- if(res.data.count == 1){}else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- getPage(page,list){
- let sindex = (parseInt(page) - 1) * 20
- let eindex = parseInt(page) * 20
- let newList = list.slice(sindex,eindex)
- return newList
- },
- changeTab(e){
- this.tabs = e
- this.page = 1
- this.showList = []
-
- if(this.tabs == 0){
- this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
- }
- if(this.tabs == 1){
- this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
- }
- this.getList()
- },
- getList(){
- uni.showLoading({
- title:'鍔犺浇涓�...'
- })
- uni.request({
- url: this.serverUrl + this.urls,
- data:this.hform,
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- this.listData = res.data.data
- this.showList = this.getPage(this.page,this.listData)
- setTimeout(()=>{
- uni.hideLoading()
- }, 1000)
- }else{
- uni.hideLoading()
- this.listData = []
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- },
- search(){
- this.sWhere = ''
- this.listData = []
- this.page = 1
- this.showList = []
-
- console.log(this.hform)
- // if (this.hform.HBillNo) {
- // this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
- // }
- // if (this.hform.HSourceBillNo) {
- // this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
- // }
- this.getList()
- },
- clear(){
- this.listData = []
- this.page = 1
- this.showList = []
-
- this.sWhere = ''
- this.hform = {
- HBillNo:'',
- HSourceBillNo:'',
- HBillType: 1239,
- HMaker: uni.getStorageSync('HUserName'),
- HStockOrgID: uni.getStorageSync('OrganizationID'),
- }
- this.getList()
- },
- add(){
- uni.navigateTo({
- url:'./POStockInBackBill?OperationType=1'
- })
- },
- //缂栬緫
- edit(item){
- console.log(item)
- uni.request({
- url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
- data:{ "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- uni.navigateTo({
- url:'./POStockInBackBill?OperationType=2&HInterID=' + item.HInterID
- })
- }else{
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- }
-
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- })
- },
- //鍒犻櫎
- del(item){
- // console.log(item.hmainid,uni.getStorageSync('HUserName'))
- uni.showModal({
- title: '鎻愮ず',
- content: '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.request({
- url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
- data:{
- HInterID: item.HInterID,
- HBillNo: item.鍗曟嵁鍙�,
- HBillType: this.hform.HBillType,
- HMaker: uni.getStorageSync('HUserName'),
- MvarReportTitle:this.MvarReportTitle,
- },
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- this.clear()
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
- },
- //鎾ら攢
- revoke(item){
- // console.log(item.hmainid,uni.getStorageSync('HUserName'))
- uni.showModal({
- title: '鎻愮ず',
- content: '鏄惁纭鎾ら攢',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.request({
- url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_Json',
- data:{
- HInterID: item.HInterID,
- HBillNo: item.鍗曟嵁鍙�,
- HBillType: this.hform.HBillType,
- HMaker: uni.getStorageSync('HUserName'),
- MvarReportTitle:this.MvarReportTitle,
- },
- success: (res) => {
- console.log(1,res);
- if(res.data.count == 1){
- this.clear()
- }
- uni.showToast({
- title:res.data.Message,
- icon:'none'
- })
- },
- fail: (res) => {
- console.log(res);
- uni.hideLoading()
- uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
- icon:'none'
- })
- },
- });
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- }
- }
- });
- },
- }
- }
+ CheckModRight() {
+ uni.request({
+ url: this.serverUrl + '/WEBSController/CheckModRight_Json',
+ data: {
+ ModRightName: 'CE_POStockInBack',
+ HUserName: uni.getStorageSync('HUserName')
+ },
+ success: (res) => {
+ if (res.data.count == 1) {} else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ icon: 'none'
+ })
+ },
+ });
+ },
+ getPage(page, list) {
+ let sindex = (parseInt(page) - 1) * 20
+ let eindex = parseInt(page) * 20
+ let newList = list.slice(sindex, eindex)
+ return newList
+ },
+ changeTab(e) {
+ this.tabs = e
+ this.page = 1
+ this.showList = []
+
+ if (this.tabs == 0) {
+ this.urls = '/WEBSController/GetKf_PonderationBillMain_TempList_New_Json'
+ }
+ if (this.tabs == 1) {
+ this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
+ }
+ this.getList()
+ },
+ getList() {
+ uni.showLoading({
+ title: this.$t('POStockInBackBillList.loadingTitle') == 'POStockInBackBillList.loadingTitle' ? '鍔犺浇涓�...' : this.$t('POStockInBackBillList.loadingTitle')
+ })
+ uni.request({
+ url: this.serverUrl + this.urls,
+ data: this.hform,
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.listData = res.data.data
+ this.showList = this.getPage(this.page, this.listData)
+ setTimeout(() => {
+ uni.hideLoading()
+ }, 1000)
+ } else {
+ uni.hideLoading()
+ this.listData = []
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ icon: 'none'
+ })
+ },
+ });
+ },
+ search() {
+ this.sWhere = ''
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ console.log(this.hform)
+ // if (this.hform.HBillNo) {
+ // this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+ // }
+ // if (this.hform.HSourceBillNo) {
+ // this.sWhere += " and 璁惧绫诲瀷 like '%" + this.hform.HSourceBillNo + "%'";
+ // }
+ this.getList()
+ },
+ clear() {
+ this.listData = []
+ this.page = 1
+ this.showList = []
+
+ this.sWhere = ''
+ this.hform = {
+ HBillNo: '',
+ HSourceBillNo: '',
+ HBillType: 1239,
+ HMaker: uni.getStorageSync('HUserName'),
+ HStockOrgID: uni.getStorageSync('OrganizationID'),
+ }
+ this.getList()
+ },
+ add() {
+ uni.navigateTo({
+ url: './POStockInBackBill?OperationType=1'
+ })
+ },
+ //缂栬緫
+ edit(item) {
+ console.log(item)
+ uni.request({
+ url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
+ data: { "HInterID": item.HInterID, "HBillNo": item.鍗曟嵁鍙�, "HBillType": this.hform.HBillType },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ uni.navigateTo({
+ url: './POStockInBackBill?OperationType=2&HInterID=' + item.HInterID
+ })
+ } else {
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ }
+
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ icon: 'none'
+ })
+ },
+ })
+ },
+ //鍒犻櫎
+ del(item) {
+ uni.showModal({
+ title: this.$t('POStockInBackBillList.confirmTitle') == 'POStockInBackBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList.confirmTitle'),
+ content: this.$t('POStockInBackBillList.delConfirm') == 'POStockInBackBillList.delConfirm' ? '纭瑕佸垹闄よ褰曪紵鍒犻櫎鍚庝笉鑳芥仮澶�' : this.$t('POStockInBackBillList.delConfirm'),
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl + '/WEBSController/set_DelPonderationBillMain_Temp_New_Json',
+ data: {
+ HInterID: item.HInterID,
+ HBillNo: item.鍗曟嵁鍙�,
+ HBillType: this.hform.HBillType,
+ HMaker: uni.getStorageSync('HUserName'),
+ MvarReportTitle: this.MvarReportTitle,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ //鎾ら攢
+ revoke(item) {
+ uni.showModal({
+ title: this.$t('POStockInBackBillList.confirmTitle') == 'POStockInBackBillList.confirmTitle' ? '鎻愮ず' : this.$t('POStockInBackBillList.confirmTitle'),
+ content: this.$t('POStockInBackBillList.revokeConfirm') == 'POStockInBackBillList.revokeConfirm' ? '鏄惁纭鎾ら攢' : this.$t('POStockInBackBillList.revokeConfirm'),
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.request({
+ url: this.serverUrl + '/WEBSController/set_DeleteICStockBillAndWMS_Json',
+ data: {
+ HInterID: item.HInterID,
+ HBillNo: item.鍗曟嵁鍙�,
+ HBillType: this.hform.HBillType,
+ HMaker: uni.getStorageSync('HUserName'),
+ MvarReportTitle: this.MvarReportTitle,
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ this.clear()
+ }
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: this.$t('POStockInBackBillList.requestFailed') == 'POStockInBackBillList.requestFailed' ? '鎺ュ彛璇锋眰澶辫触' : this.$t('POStockInBackBillList.requestFailed'),
+ icon: 'none'
+ })
+ },
+ });
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ }
+ }
+ });
+ },
+ }
+ }
</script>
<style lang="scss" scoped>
- .form{
- width: 640rpx;
- margin: 20rpx auto;
- margin-top: 90rpx;
- }
- .tabs{
- width: 100%;
- position: fixed;
- left: 0;
- z-index: 9;
- display: flex;
- background-color: #e5e5e5;
- view{
- width: 50%;
- font-size: 30rpx;
- color: #333;
- text-align: center;
- padding: 16rpx 0;
- }
- .on{
- color: #3a78ff;
- font-weight: bold;
- border-bottom: 3px solid #3a78ff;
- }
- }
- .buttons{
- width: 100%;
- display: flex;
- justify-content: center;
- margin-top: 20rpx;
- button{
- border-radius: 50rpx;
- width: 180rpx;
- height: 66rpx;
- line-height: 66rpx;
- font-size: 28rpx;
- }
- .btn-a{
- background-color: #acacac;
- color: #fff;
- }
- .btn-b{
- background-color: #41a863;
- color: #fff;
- }
- .btn-c{
- background-color: #3a78ff;
- color: #fff;
- }
- }
- .form-item{
- display: flex;
- align-items: center;
- font-size: 28rpx;
- padding: 6rpx 0;
- .title{
- width: 180rpx;
- text{
- color: red;
- font-weight: bold;
- }
- }
- .right{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #acacac;
- }
- .righton{
- width: 450rpx;
- border-radius: 22rpx;
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
- input{
- width: 100%;
- padding: 8rpx 20rpx;
- font-size: 30rpx;
- }
- }
- .list{
- width: 100%;
- .card-detail{
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- line-height: 120%;
- .detail{
- // width: 50%;
- font-size: 26rpx;
- margin-bottom: 12rpx;
- color: #555;
- margin-right: 20rpx;
- text{
- color: #999;
- font-size: 26rpx;
- }
- }
- }
- .more{
- color: #888;
- font-size: 26rpx;
- display: flex;
- border-top: 1px solid #eee;
- padding-top: 20rpx;
- .part{
- width: 50%;
- display: flex;align-items: center;justify-content: center;
- }
- }
- }
+ .form {
+ width: 640rpx;
+ margin: 20rpx auto;
+ margin-top: 90rpx;
+ }
-</style>
+ .tabs {
+ width: 100%;
+ position: fixed;
+ left: 0;
+ z-index: 9;
+ display: flex;
+ background-color: #e5e5e5;
+
+ view {
+ width: 50%;
+ font-size: 30rpx;
+ color: #333;
+ text-align: center;
+ padding: 16rpx 0;
+ }
+
+ .on {
+ color: #3a78ff;
+ font-weight: bold;
+ border-bottom: 3px solid #3a78ff;
+ }
+ }
+
+ .buttons {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ margin-top: 20rpx;
+
+ button {
+ border-radius: 50rpx;
+ width: 180rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ }
+
+ .btn-a {
+ background-color: #acacac;
+ color: #fff;
+ }
+
+ .btn-b {
+ background-color: #41a863;
+ color: #fff;
+ }
+
+ .btn-c {
+ background-color: #3a78ff;
+ color: #fff;
+ }
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ .righton {
+ width: 450rpx;
+ border-radius: 22rpx;
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ input {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .list {
+ width: 100%;
+
+ .card-detail {
+ width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ line-height: 120%;
+
+ .detail {
+ font-size: 26rpx;
+ margin-bottom: 12rpx;
+ color: #555;
+ margin-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+ }
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 511946b..6c1f3b9 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -106,6 +106,7 @@
"瀹佹尝鎯犲悍宸ヤ笟": 'http://172.16.72.30:6699/API/',
"浣欏鍏磋揪璧峰姩鍣�": 'http://121.37.133.104/API/',
"鏉庢灄淇婃湰鍦版祴璇�": 'http://localhost:8082/LuBaoAPI/',
+ "鏉庢灄淇婃湰鍦版祴璇�2": 'http://192.168.2.91:8082/LuBaoAPI/',
"鏉窞鍑礉濂堢壒": 'http://192.168.50.253:8080/API/',
"鏉窞鍑礉濂堢壒澶栫綉": 'http://erp.hzcabinet.cn:9090/API/',
"缈佹稕娑涙湰鍦版祴璇�": 'http://localhost:81/API/',
@@ -301,21 +302,22 @@
title: '鐧诲綍涓�...',
mask: true
})
- var data = {
- HUserNumber: this.UserName,
- HPassWord: this.PassWord,
- HStockOrgID: this.HOrgName,
- HStockOrgName: this.Organization
- }
-
- // UserName: this.UserName,
- // PassWord: this.PassWord,
- // HOrgName: this.HOrgName,
- // Organization: this.Organization
- // }
- uni.setStorageSync('loginData', JSON.stringify(data));
+ if (this.serverUrlName =="浣欏鍗庤繙"){//鍗庤繙涓嶉渶瑕亀ms楠岃瘉
+ var data = {
+ UserName: this.UserName,
+ PassWord: this.PassWord,
+ HOrgName: this.HOrgName,
+ Organization: this.Organization
+ }
+ var data2 = {//鐢ㄤ簬淇濆瓨鐧诲綍淇℃伅
+ HUserNumber: this.UserName,
+ HPassWord: this.PassWord,
+ HStockOrgID: this.HOrgName,
+ HStockOrgName: this.Organization
+ }
+ uni.setStorageSync('loginData', JSON.stringify(data2));
uni.request({
- url: this.serverUrl + 'WEBSController/GetUser_Json',
+ url: this.serverUrl + '/Web/GetUser',
method: 'GET',
data: data,
success: (res) => {
@@ -326,7 +328,7 @@
icon: 'none'
})
if (res.data.count == 1) {
- setLoginData(data)
+ setLoginData(data2)
setUserInfo(res.data.data[0])
uni.setStorageSync('HUserName', res.data.data[0].Czymc);
uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
@@ -334,29 +336,7 @@
uni.setStorageSync('login', "login");
uni.setStorageSync('Organization', this.Organization);
uni.setStorageSync('OrganizationID', this.HOrgName);
- //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
- uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
- uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
- uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
- uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
- uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
- uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
- uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
- uni.setStorageSync('HWhName', res.data.data[0].HWhName);
- uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
- uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
- uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
- uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
- uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
- uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
- uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
- uni.setStorageSync('HProcName', res.data.data[0].HProcName);
- uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
- uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
this.CommonUtils.setServerUrl(this.serverUrl)
- // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
- // getuiUtils.getClientID()
- getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
uni.reLaunch({
url: '/pages/index/index'
})
@@ -371,42 +351,75 @@
})
},
});
-
- // uni.request({
- // url: this.serverUrl + '/Web/GetUser',
- // method: 'GET',
- // data: data,
- // success: (res) => {
- // console.log(res)
- // uni.hideLoading()
- // uni.showToast({
- // title: res.data.Message,
- // icon: 'none'
- // })
- // if (res.data.count == 1) {
- // setLoginData(data)
- // setUserInfo(res.data.data[0])
- // uni.setStorageSync('HUserName', res.data.data[0].Czymc);
- // uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
- // uni.setStorageSync('SourceFlag', false);
- // uni.setStorageSync('login', "login");
- // uni.setStorageSync('Organization', this.Organization);
- // uni.setStorageSync('OrganizationID', this.HOrgName);
- // this.CommonUtils.setServerUrl(this.serverUrl)
- // uni.reLaunch({
- // url: '/pages/index/index'
- // })
- // }
- // },
- // fail: (res) => {
- // console.log(res);
- // uni.hideLoading()
- // uni.showToast({
- // title: '鎺ュ彛璇锋眰澶辫触',
- // icon: 'none'
- // })
- // },
- // });
+ }else{
+ var data = {
+ HUserNumber: this.UserName,
+ HPassWord: this.PassWord,
+ HStockOrgID: this.HOrgName,
+ HStockOrgName: this.Organization
+ }
+
+
+ uni.setStorageSync('loginData', JSON.stringify(data));
+ uni.request({
+ url: this.serverUrl + 'WEBSController/GetUser_Json',
+ method: 'GET',
+ data: data,
+ success: (res) => {
+ console.log(res)
+ uni.hideLoading()
+ uni.showToast({
+ title: res.data.Message,
+ icon: 'none'
+ })
+ if (res.data.count == 1) {
+ setLoginData(data)
+ setUserInfo(res.data.data[0])
+ uni.setStorageSync('HUserName', res.data.data[0].Czymc);
+ uni.setStorageSync('HBillerID', res.data.data[0].HK3UserID);
+ uni.setStorageSync('SourceFlag', false);
+ uni.setStorageSync('login', "login");
+ uni.setStorageSync('Organization', this.Organization);
+ uni.setStorageSync('OrganizationID', this.HOrgName);
+ //瀛樺偍閮ㄩ棬 鑱屽憳 浠撳簱 绛変俊鎭�
+ uni.setStorageSync('HDeptID', res.data.data[0].HDeptID); //閮ㄩ棬
+ uni.setStorageSync('HDeptName', res.data.data[0].HDeptName);
+ uni.setStorageSync('HEmpID', res.data.data[0].HEmpID); //鑱屽憳
+ uni.setStorageSync('HEmpName', res.data.data[0].HEmpName);
+ uni.setStorageSync('HSCWHID', res.data.data[0].HSCWHID); //璋冨叆浠撳簱
+ uni.setStorageSync('HSCWHName', res.data.data[0].HSCWHName);
+ uni.setStorageSync('HWhID', res.data.data[0].HWhID); //瀵瑰簲浠撳簱
+ uni.setStorageSync('HWhName', res.data.data[0].HWhName);
+ uni.setStorageSync('HWorkCenterID', res.data.data[0].HWorkCenterID); //宸ヤ綔涓績
+ uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
+ uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //瀵瑰簲楠屾敹
+ uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
+ uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //瀵瑰簲鐝粍
+ uni.setStorageSync('HGroupName', res.data.data[0].HGroupName);
+ uni.setStorageSync('HProcID', res.data.data[0].HProcID); //瀵瑰簲宸ュ簭
+ uni.setStorageSync('HProcName', res.data.data[0].HProcName);
+ uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //瀵瑰簲鐢熶骇璧勬簮
+ uni.setStorageSync('HSourceName', res.data.data[0].HSourceName);
+ this.CommonUtils.setServerUrl(this.serverUrl)
+ // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
+ // getuiUtils.getClientID()
+ getuiUtils.getClientID(res.data.data[0].Czybm, res.data.data[0].Czymc)
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.hideLoading()
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
+
}
}
}
diff --git a/pages/qitaruku_v2/OtherInBill.vue b/pages/qitaruku_v2/OtherInBill.vue
index 23f4f14..2f1f286 100644
--- a/pages/qitaruku_v2/OtherInBill.vue
+++ b/pages/qitaruku_v2/OtherInBill.vue
@@ -13,20 +13,20 @@
</view>
</view>
<view class="form-item">
- <view class="title">鏁伴噺:</view>
+ <view class="title">{{ $t("Kf_OtherInBill_PDA.Qty") == "Kf_OtherInBill_PDA.Qty" ? "鏁伴噺" : $t("Kf_OtherInBill_PDA.Qty") }}锛�</view>
<view class="right">
<input v-model="hform.HQty" :placeholder="placeholder_Qty" />
</view>
</view>
<view class="form-item">
- <view class="title">浠撳簱:</view>
+ <view class="title">{{ $t("Kf_OtherInBill_PDA.Warehouse") == "Kf_OtherInBill_PDA.Warehouse" ? "浠撳簱" : $t("Kf_OtherInBill_PDA.Warehouse") }}锛�</view>
<view class="right">
<uni-combox :candidates="arrayHWHName" :placeholder="placeholder_Warehouse" v-model="hform.HWHName"
@input="HWHNameChange" @confirm="HWHNameScan"></uni-combox>
</view>
</view>
<view class="form-item">
- <view class="title">浠撲綅:</view>
+ <view class="title">{{ $t("Kf_OtherInBill_PDA.StockPlace") == "Kf_OtherInBill_PDA.StockPlace" ? "浠撲綅" : $t("Kf_OtherInBill_PDA.StockPlace") }}锛�</view>
<view class="right" v-show="showHStockPlaceName">
<uni-combox :candidates="HStockPlaceNameListComputed" :placeholder="placeholder_StockPlace"
v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"
--
Gitblit v1.9.1