From 44095eec404a9a1e0a45f0b8daeee1b5b1c2b017 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 24 三月 2026 10:21:53 +0800
Subject: [PATCH] app出战汇报，委外接入发出报工优化
---
pages/weiwaigxIn/Cj_StationEntrustInBillList.vue | 51 +++
manifest.json | 4
components/ProcListPopup/ProcListPopup.vue | 4
pages/gongxuOut/Cj_StationOutBill.vue | 8
components/StationOutBillPopup/StationOutBillListPopup.vue | 392 ++++++++++++++++++++++++++++++++
pages/weiwaigxOut/Cj_StationEntrustOutBill.vue | 8
pages/gongxuOut/Cj_StationOutBillList.vue | 33 +-
pages/weiwaigxIn/Cj_StationEntrustInBill.vue | 59 ++--
components/StationOutBillPopup/StationEntrustOutBillListPopup.vue | 85 +------
pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue | 34 +-
10 files changed, 525 insertions(+), 153 deletions(-)
diff --git a/components/ProcListPopup/ProcListPopup.vue b/components/ProcListPopup/ProcListPopup.vue
index 5d52f06..5db11e0 100644
--- a/components/ProcListPopup/ProcListPopup.vue
+++ b/components/ProcListPopup/ProcListPopup.vue
@@ -19,6 +19,10 @@
<view class="left">宸ュ簭搴忓垪: </view>
<view class="right">{{bill['宸ュ簭搴忓垪']}}</view>
</view>
+ <view class="item">
+ <view class="left">鍙眹鎶ユ暟閲�: </view>
+ <view class="right">{{bill['鍙眹鎶ユ暟閲�']}}</view>
+ </view>
</uni-card>
</view>
<view class="over" v-show="HBillList.length == 0">鏆傛棤鏁版嵁</view>
diff --git a/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue b/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
index 5ce9358..9a2c703 100644
--- a/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
+++ b/components/StationOutBillPopup/StationEntrustOutBillListPopup.vue
@@ -110,12 +110,10 @@
},
mounted() {
- this.getNewData(); // 鑾峰彇鏂板崟鍙�
this.getHSourceList(); // 鐢熶骇璧勬簮
this.getHGroupList(); // 鐢熶骇鐝粍
this.getHEmpList(); // 鎿嶄綔鍛�
this.getHCenterList(); // 宸ヤ綔涓績
- this.getDefValByUser(); // 鐢ㄦ埛榛樿鍊�
},
methods: {
@@ -126,7 +124,6 @@
this.hform.HQty = '';
this.hform.HBadCount = 0;
this.hform.HWasterQty = 0;
- this.getNewData();
}
},
@@ -139,13 +136,13 @@
}
else
{
- this.hform.HInterID=item.HInterID
- console.log(this.hform.HInterID)
+ this.hform.HInterID=item.HInterID
+ console.log(this.hform.HInterID)
}
this.hform.HQty=item.鎺ユ敹鍚堟牸鏁伴噺
this.hform.HWasterQty=item.鎶ュ簾鏁伴噺
this.hform.HBadCount=item.涓嶈壇鏁伴噺
- this.hform.HSourceID=item.HSourceID
+
this.hform.HSourceID=item.HSourceID
this.hform.HSourceName=item.鐢熶骇璧勬簮
@@ -158,42 +155,7 @@
this.$refs.popup.open();
},
- // 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
- getDefValByUser() {
- uni.request({
- url: this.serverUrl + '/Cj_StationInBill/GetDefValByUser',
- method: "GET",
- async: false,
- data: {
- "Czybm": this.userInfo.Czybm,
- "Czymc": this.userInfo.Czymc
- },
- success: (res) => {
- if (res.data.count == 1) {
- var data = res.data.data[0];
- this.hform.HGroupID = data.HGroupID;
- this.hform.HGroupName = data.鐢熶骇鐝粍鍚嶇О;
- this.hform.HEmpID = data.HEmpID;
- this.hform.HEmpName = data.鎿嶄綔鍛樺悕绉�;
- this.hform.HSourceID = data.HSourceID;
- this.hform.HSourceName = data.鐢熶骇璧勬簮鍚嶇О;
- this.hform.HCenterID = data.HWorkCenterID;
- this.hform.HCenterName = data.宸ヤ綔涓績鍚嶇О;
- } else {
- uni.showToast({
- title: '鑾峰彇榛樿鍊煎け璐�',
- icon: 'none'
- });
- }
- },
- fail: () => {
- uni.showToast({
- title: '鎺ュ彛璇锋眰澶辫触',
- icon: 'none'
- });
- },
- });
- },
+
// 鐢熶骇璧勬簮鍒楄〃
getHSourceList() {
@@ -205,9 +167,7 @@
this.HSourceNameList = res.data.data.Gy_Source;
this.arrayHSourceName = this.HSourceNameList.map(item => item.鐢熶骇璧勬簮);
this.$forceUpdate();
- } else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
- }
+ }
},
fail: () => {
uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
@@ -229,9 +189,7 @@
this.HGroupNameList = res.data.data;
this.arrayHGroupName = this.HGroupNameList.map(item => item.鐝粍);
this.$forceUpdate();
- } else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
- }
+ }
},
fail: () => {
uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
@@ -257,9 +215,7 @@
this.HEmpNameList = res.data.data;
this.arrayHEmpName = this.HEmpNameList.map(item => item.HName);
this.$forceUpdate();
- } else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
- }
+ }
},
fail: () => {
uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
@@ -281,9 +237,7 @@
this.HCenterNameList = res.data.data.Gy_Source;
this.arrayHCenterName = this.HCenterNameList.map(item => item.宸ヤ綔涓績);
this.$forceUpdate();
- } else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
- }
+ }
},
fail: () => {
uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
@@ -295,24 +249,6 @@
if (found) this.hform.HCenterID = found.HItemID;
},
- // 鑾峰彇鏂板崟鎹彿锛堝唴閮ㄤ娇鐢級
- getNewData() {
- uni.request({
- url: this.serverUrl + '/Web/GetMAXNum',
- data: { HBillType: '3791' },
- success: (res) => {
- if (res.data.count == 1) {
- this.hform.HInterID = res.data.data[0].HInterID;
- this.hform.HBillNo = res.data.data[0].HBillNo;
- } else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
- }
- },
- fail: () => {
- uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
- },
- });
- },
// 鎻愪氦鍓嶆牎楠�
preSubmitCheck() {
@@ -373,7 +309,10 @@
this.$refs.popup.close();
}, 1500);
} else {
- uni.showToast({ title: res.data.Message, icon: 'none' });
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `${res.data.Message}`,
+ });
}
},
fail: () => {
diff --git a/components/StationOutBillPopup/StationOutBillListPopup.vue b/components/StationOutBillPopup/StationOutBillListPopup.vue
new file mode 100644
index 0000000..eb57062
--- /dev/null
+++ b/components/StationOutBillPopup/StationOutBillListPopup.vue
@@ -0,0 +1,392 @@
+<template>
+ <view>
+ <uni-popup ref="popup" type="bottom" @change="popupChangeHandler">
+ <view class="form">
+ <!-- 鍚堟牸鏁伴噺 -->
+ <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">
+ <input v-model="hform.HBadCount" placeholder="璇疯緭鍏ヤ笉鑹暟閲�" />
+ </view>
+ </view>
+ <!-- 鎶ュ簾鏁伴噺 -->
+ <view class="form-item">
+ <view class="title">鎶ュ簾鏁伴噺:</view>
+ <view class="right">
+ <input v-model="hform.HWasterQty" placeholder="璇疯緭鍏ユ姤搴熸暟閲�" />
+ </view>
+ </view>
+ <!-- 鐢熶骇璧勬簮 -->
+ <view class="form-item">
+ <view class="title">鐢熶骇璧勬簮:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHSourceName" placeholder="璇烽�夋嫨鐢熶骇璧勬簮" v-model="hform.HSourceName"
+ @input="HSourceNameChange"></uni-combox>
+ </view>
+ </view>
+ <!-- 宸ヤ綔涓績
+ <view class="form-item">
+ <view class="title">宸ヤ綔涓績:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHCenterName" placeholder="璇烽�夋嫨宸ヤ綔涓績" v-model="hform.HCenterName"
+ @input="HCenterNameChange"></uni-combox>
+ </view>
+ </view> -->
+ <!-- 鐢熶骇鐝粍 -->
+ <view class="form-item">
+ <view class="title">鐢熶骇鐝粍:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHGroupName" placeholder="璇烽�夋嫨鐢熶骇鐝粍" v-model="hform.HGroupName"
+ @input="HGroupNameChange"></uni-combox>
+ </view>
+ </view>
+ <!-- 鎿嶄綔鍛� -->
+ <view class="form-item">
+ <view class="title"><text>*</text>鎿嶄綔鍛�:</view>
+ <view class="right">
+ <uni-combox :candidates="arrayHEmpName" placeholder="璇烽�夋嫨鎿嶄綔鍛�" v-model="hform.HEmpName"
+ @input="HEmpNameChange"></uni-combox>
+ </view>
+ </view>
+
+ <!-- 搴曢儴鎻愪氦鎸夐挳 -->
+ <view class="bottom-btn">
+ <button class="btn-a" size="mini" @tap="submit">鎻愪氦</button>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+</template>
+
+<script>
+ import getDateTime from '@/utils/getdateTime.js';
+ import {
+ getUserInfo
+ } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
+
+ export default {
+ name: "BillListPopup_gongxuOut",
+ data() {
+ return {
+
+ userInfo: getUserInfo(),
+ serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+ // 涓嬫媺妗嗗�欓�夋暟缁�
+ arrayHSourceName: [],
+ HSourceNameList: [],
+ arrayHGroupName: [],
+ HGroupNameList: [],
+ arrayHEmpName: [],
+ HEmpNameList: [],
+ arrayHCenterName: [],
+ HCenterNameList: [],
+
+ hform: {
+ HInterID: '', // 鍐呴儴浣跨敤锛屼笉灞曠ず
+ HBillNo: '', // 鍐呴儴浣跨敤锛屼笉灞曠ず
+ HQty: '',
+ HBadCount: 0,
+ HWasterQty: 0,
+ HSourceName: '',
+ HSourceID: 0,
+ HCenterName: '',
+ HCenterID: 0,
+ HGroupName: '',
+ HGroupID: 0,
+ HEmpName: '',
+ HEmpID: 0,
+ }
+ }
+ },
+
+ mounted() {
+ this.getHSourceList(); // 鐢熶骇璧勬簮
+ this.getHGroupList(); // 鐢熶骇鐝粍
+ this.getHEmpList(); // 鎿嶄綔鍛�
+ this.getHCenterList(); // 宸ヤ綔涓績
+ },
+
+ methods: {
+ // 寮圭獥寮�鍏冲鐞�
+ popupChangeHandler(e) {
+ if (e.show === false) {
+ // 鍏抽棴鏃堕噸缃暟閲�
+ this.hform.HQty = '';
+ this.hform.HBadCount = 0;
+ this.hform.HWasterQty = 0;
+ }
+ },
+
+ // 鎵撳紑寮圭獥
+ showPopup(item) {
+ if(item.hmainid!="0")
+ {
+ this.hform.HInterID=item.hmainid
+ console.log(this.hform.HInterID)
+ }
+ else
+ {
+ this.hform.HInterID=item.HInterID
+ console.log(this.hform.HInterID)
+ }
+ this.hform.HQty=item.鍑虹珯鏁伴噺
+ this.hform.HWasterQty=item.鎶ュ簾鏁伴噺
+ this.hform.HBadCount=item.涓嶈壇鏁伴噺
+
+ this.hform.HSourceID=item.HSourceID
+ this.hform.HSourceName=item.鐢熶骇璧勬簮
+ // this.hform.HCenterID=item.HCenterID
+ // this.hform.HCenterName=item.宸ヤ綔涓績
+ this.hform.HGroupID=item.HGroupID
+ this.hform.HGroupName=item.鐢熶骇鐝粍
+ this.hform.HEmpID=item.HEmpID
+ this.hform.HEmpName=item.鎿嶄綔鍛�
+ this.$refs.popup.open();
+ },
+
+
+
+ // 鐢熶骇璧勬簮鍒楄〃
+ getHSourceList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getSourceList',
+ data: { sWhere: '' },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HSourceNameList = res.data.data.Gy_Source;
+ this.arrayHSourceName = this.HSourceNameList.map(item => item.鐢熶骇璧勬簮);
+ this.$forceUpdate();
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HSourceNameChange(e) {
+ const found = this.HSourceNameList.find(item => item.鐢熶骇璧勬簮 == e);
+ if (found) this.hform.HSourceID = found.HItemID;
+ },
+
+ // 鐢熶骇鐝粍鍒楄〃
+ getHGroupList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetProductionTeamList_Json',
+ data: { sWhere: "and HUSEORGID = " + uni.getStorageSync('OrganizationID') },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HGroupNameList = res.data.data;
+ this.arrayHGroupName = this.HGroupNameList.map(item => item.鐝粍);
+ this.$forceUpdate();
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HGroupNameChange(e) {
+ const found = this.HGroupNameList.find(item => item.鐝粍 == e);
+ if (found) this.hform.HGroupID = found.HItemID;
+ },
+
+ // 鎿嶄綔鍛樺垪琛�
+ getHEmpList() {
+ uni.request({
+ url: this.serverUrl + '/Web/GetEmployeeList_Json',
+ data: {
+ Employee: '',
+ HGroupID: 0,
+ HDeptID: uni.getStorageSync("HDeptID")
+ },
+ success: (res) => {
+ if (res.data.count == 1) {
+ this.HEmpNameList = res.data.data;
+ this.arrayHEmpName = this.HEmpNameList.map(item => item.HName);
+ this.$forceUpdate();
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HEmpNameChange(e) {
+ const found = this.HEmpNameList.find(item => item.HName == e);
+ if (found) this.hform.HEmpID = found.HItemID;
+ },
+
+ // 宸ヤ綔涓績鍒楄〃
+ getHCenterList() {
+ uni.request({
+ url: this.serverUrl + '/api/newBill/getWorkCenterList',
+ data: { sWhere: '' },
+ success: (res) => {
+ if (res.data.code == 1) {
+ this.HCenterNameList = res.data.data.Gy_Source;
+ this.arrayHCenterName = this.HCenterNameList.map(item => item.宸ヤ綔涓績);
+ this.$forceUpdate();
+ }
+ },
+ fail: () => {
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ },
+ HCenterNameChange(e) {
+ const found = this.HCenterNameList.find(item => item.宸ヤ綔涓績 == e);
+ if (found) this.hform.HCenterID = found.HItemID;
+ },
+
+
+ // 鎻愪氦鍓嶆牎楠�
+ preSubmitCheck() {
+ if (CommonUtils.isEmpty(this.hform.HQty)) {
+ return { pass: false, message: '鍚堟牸鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (CommonUtils.isEmpty(this.hform.HBadCount)) {
+ return { pass: false, message: '涓嶈壇鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (CommonUtils.isEmpty(this.hform.HWasterQty)) {
+ return { pass: false, message: '鎶ュ簾鏁伴噺涓嶈兘涓虹┖' };
+ }
+ if (!this.hform.HEmpName) {
+ return { pass: false, message: '璇烽�夋嫨鎿嶄綔鍛�' };
+ }
+ return { pass: true, message: '' };
+ },
+
+ // 鎻愪氦
+ submit() {
+ const { pass, message } = this.preSubmitCheck();
+ if (!pass) {
+ return uni.showToast({ icon: 'none', title: message });
+ }
+
+ uni.showLoading({ title: '鎻愪氦涓�...' });
+
+
+ const submitData = {
+ HInterID: this.hform.HInterID,
+ HBillNo: this.hform.HBillNo,
+ HQty: this.hform.HQty,
+ HBadCount: this.hform.HBadCount,
+ HWasterQty: this.hform.HWasterQty,
+ HSourceID: this.hform.HSourceID,
+ HSourceName: this.hform.HSourceName,
+ HCenterID: 0,
+ HCenterName: '',
+ HGroupID: this.hform.HGroupID,
+ HGroupName: this.hform.HGroupName,
+ HEmpID: this.hform.HEmpID,
+ HEmpName: this.hform.HEmpName,
+
+ };
+
+ uni.request({
+ url: this.serverUrl + '/Cj_StationOutBill/setOtherProperty',
+ method: 'POST',
+ data: {
+ oMain: JSON.stringify(submitData)+ ";" + uni.getStorageSync('HUserName'),
+
+ },
+ success: (res) => {
+ uni.hideLoading();
+ if (res.data.count == 1) {
+ uni.showToast({ title: '鎻愪氦鎴愬姛', icon: 'none' });
+ setTimeout(() => {
+ this.$refs.popup.close();
+ }, 1500);
+ } else {
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `${res.data.Message}`,
+ });
+ }
+ },
+ fail: () => {
+ uni.hideLoading();
+ uni.showToast({ title: '鎺ュ彛璇锋眰澶辫触', icon: 'none' });
+ },
+ });
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .form {
+ box-sizing: border-box;
+ border-radius: 15rpx 15rpx 0 0;
+ padding: 20rpx 20rpx 160rpx 20rpx;
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ gap: 10rpx;
+ overflow-y: auto;
+ // max-height: 70vh;
+ max-height: calc(80vh - 120px);
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ font-size: 30rpx;
+ padding: 6rpx 0;
+
+ .title {
+ width: 180rpx;
+ flex-shrink: 0;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+ }
+
+ input, .uni-combox {
+ width: 100%;
+ padding: 8rpx 20rpx;
+ font-size: 30rpx;
+ }
+ }
+
+ .bottom-btn {
+ width: 100%;
+ box-sizing: border-box;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ box-shadow: 0 2rpx 10rpx 2rpx rgba(0, 0, 0, 0.4);
+ padding: 30rpx 40rpx 40rpx 40rpx;
+ display: flex;
+ justify-content: center;
+
+ button {
+ border-radius: 50rpx;
+ width: 300rpx;
+ height: 66rpx;
+ line-height: 66rpx;
+ font-size: 28rpx;
+ background-color: #3A78FF;
+ color: #fff;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 77888b6..a164114 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "3.000",
- "versionCode" : 300,
+ "versionName" : "3.004",
+ "versionCode" : 304,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuOut/Cj_StationOutBill.vue b/pages/gongxuOut/Cj_StationOutBill.vue
index eea99dd..07cc2a9 100644
--- a/pages/gongxuOut/Cj_StationOutBill.vue
+++ b/pages/gongxuOut/Cj_StationOutBill.vue
@@ -1815,10 +1815,10 @@
});
}
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `${res.data.Message}`,
+ });
}
},
fail: (res) => {
diff --git a/pages/gongxuOut/Cj_StationOutBillList.vue b/pages/gongxuOut/Cj_StationOutBillList.vue
index 0729de6..65bd444 100644
--- a/pages/gongxuOut/Cj_StationOutBillList.vue
+++ b/pages/gongxuOut/Cj_StationOutBillList.vue
@@ -239,7 +239,10 @@
<script>
import { getUserInfo } from "@/utils/auth.js";
- import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
+ import StationOutBillPopup from "../../components/StationOutBillPopup/StationOutBillListPopup.vue";
+ import {
+ MpaasScan
+ } from "../../utils/mpaasScan";
export default {
components:{StationOutBillPopup},
data() {
@@ -251,7 +254,7 @@
arrayColName:['浠诲姟鍗�','鍗曟嵁鍙�','娴佽浆鍗″彿','浜у搧鍚嶇О','浜у搧浠ｇ爜','褰撳墠宸ュ簭','褰撳墠宸ュ簭浠ｇ爜','鏃ユ湡','瑙勬牸鍨嬪彿','娴佹按鍙�','鍑虹珯鏁伴噺','涓嶈壇鏁伴噺','鎶ュ簾鏁伴噺','鍖呰鏍囪瘑','鍖呰鏍囪瘑浠ｇ爜','鍑虹珯鏃堕棿','鎿嶄綔鍛�','鎿嶄綔鍛樹唬鐮�','鐢熶骇璧勬簮','鐢熶骇璧勬簮浠ｇ爜','鐢熶骇鐝粍','鐢熶骇鐝粍浠ｇ爜','LOT鏁伴噺','鍒跺崟浜�'],
arrayComparator:['=','>=','>','<=','<','<>','鍖呭惈','宸﹀寘鍚�','鍙冲寘鍚�','涓嶅寘鍚�'],
hform:{
- HStatus:'鍏ㄩ儴',
+ HStatus:'鏈鏍�',
HBeginDate: new Date().toISOString().split('T')[0],
HEndDate:'',
HWorkBillNo:'',
@@ -275,7 +278,7 @@
}
},
onLoad() {
- this.getList()
+ this.search()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
@@ -297,23 +300,17 @@
let newList = list.slice(sindex,eindex)
return newList
},
- async toScanCode() {
- var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
- mpaasScanModule.mpaasScan({
- 'hideAlbum': true,
- 'timeoutInterval':'10', //瓒呮椂鏃堕棿
- 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
- },(ret) => {
- console.log(ret.resp_result)
- if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
- console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
- this.hform.HProcExchBillNo = ret.resp_result
- this.search()
- }
- })
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.hform.HProcExchBillNo = res
+ this.search()
+ }
+ });
},
+
getList(){
- this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
+ //this.sWhere += ` and 鍒跺崟浜� like N'%${this.userInfo.Czymc}'`
uni.showLoading({
title:'鍔犺浇涓�...'
})
diff --git a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
index 284152e..d98b7b5 100644
--- a/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustInBill.vue
@@ -380,7 +380,7 @@
HSEQNumber:0,
// HICMOInterID:'',
// HICMOQty:'',
- // HProcExchHinteID:'',
+ HProcExchHinteID:0,
// HPlanQty:'',
// HPieceQty:'',
// HTaxRate:'',
@@ -1087,23 +1087,30 @@
})
},1000)
}else{
- uni.showModal({
- title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
- success: (res) => {
- if (res.confirm) {
- console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
- })
- } else if (res.cancel) {
- console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(()=>{
- uni.navigateBack();
- },50)
- }
- }
- });
+ //鑷姩瀹℃牳
+ //this.check()
+ if(res.data.Verify=="Y"){
+ this.check()
+ }else{
+ uni.showModal({
+ title: '鎻愮ず',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('鐢ㄦ埛鐐瑰嚮纭畾');
+ uni.redirectTo({
+ url:'/pages/weiwaigxIn/Cj_StationEntrustInBill?OperationType=1'
+ })
+ } else if (res.cancel) {
+ console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+ setTimeout(()=>{
+ uni.navigateBack();
+ },50)
+ }
+ }
+ });
+ }
+
}
}else{
uni.showToast({
@@ -1130,18 +1137,16 @@
dataType:"json",
data:{
CurUserName: uni.getStorageSync('HUserName'),
- HInterID: this.linterid,
+ HInterID: this.hform.HInterID,
},
success: (res) => {
console.log(1,res);
uni.hideLoading()
if(res.data.count == 1){
this.btnType = 3
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+
uni.showModal({
- title: '鎿嶄綔鎴愬姛',
+ title: '瀹℃牳鎴愬姛',
content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜鍙嶅鏍革紝鈥樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
confirmText:'鏄�',
cancelText:'鍚�',
@@ -1164,7 +1169,7 @@
fail: (res) => {
console.log(res);
uni.showToast({
- title:'鎺ュ彛璇锋眰澶辫触',
+ title:'瀹℃牳澶辫触鎺ュ彛璇锋眰澶辫触',
icon:'none'
})
},
@@ -1184,12 +1189,10 @@
console.log(1,res);
uni.hideLoading()
if(res.data.count == 1){
- let pages = getCurrentPages();
- let prePage = pages[pages.length - 2];
- prePage.$vm.getList()
+
this.btnType = 2
uni.showModal({
- title: '鎿嶄綔鎴愬姛',
+ title: '鑷姩瀹℃牳鎴愬姛',
content: '鏄惁缁х画鍋滅暀鍦ㄥ綋鍓嶉〉闈紵鈥樻槸鈥欏彲杩涜瀹℃牳锛屸�樺惁鈥欏垯鍥炲埌涓婁竴绾у垪琛�',
confirmText:'鏄�',
cancelText:'鍚�',
diff --git a/pages/weiwaigxIn/Cj_StationEntrustInBillList.vue b/pages/weiwaigxIn/Cj_StationEntrustInBillList.vue
index abd8ad7..d0fd7e4 100644
--- a/pages/weiwaigxIn/Cj_StationEntrustInBillList.vue
+++ b/pages/weiwaigxIn/Cj_StationEntrustInBillList.vue
@@ -186,6 +186,9 @@
<script>
import { getUserInfo } from "@/utils/auth.js";
+ import {
+ CommonUtils
+ } from '../../utils/common';
export default {
data() {
return {
@@ -408,14 +411,46 @@
});
},
// //瀹℃牳
- // check(item){
- // console.log(item)
- // if (item.HBillStatus > 0) {
- // uni.showToast({
- // title:'鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒'
- // })
- // }
- // },
+ async check(item, mode) {
+ console.log('瀹℃牳鍗曟嵁: ',item);
+
+ try{
+ let res = await CommonUtils.doRequest2Sync({
+ method: 'GET',
+ url: '/Cj_StationEntrustInBill/set_CheckBill',
+ data: {
+ HInterID: item["hmainid"],
+ CurUserName: getUserInfo()["Czymc"]
+ }
+ })
+
+ if(!res) {
+ return
+ }
+
+ let {count, data, Message} = res.data
+
+ if(count == 1) {
+ CommonUtils.showTips({
+ message: `${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}鎴愬姛`
+ })
+ this.$forceUpdate()
+ setTimeout(() => {
+ this.cmdSearch()
+ }, 2000)
+ }else {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}澶辫触: ${Message}`
+ })
+ }
+ }catch(err) {
+ CommonUtils.showTips({
+ title: '娓╅Θ鎻愮ず',
+ message: `鍗曟嵁${item["瀹℃牳浜�"]?'鍙嶅鏍�':'瀹℃牳'}閿欒: ${err}`
+ })
+ }
+ },
// //鍙嶅鏍�
// antiCheck(item){
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
index c82f849..867c254 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBill.vue
@@ -1299,10 +1299,10 @@
});
}
} else {
- uni.showToast({
- title: res.data.Message,
- icon: 'none'
- })
+ CommonUtils.showTips({
+ title: "娓╅Θ鎻愮ず",
+ message: `${res.data.Message}`,
+ });
}
},
fail: (res) => {
diff --git a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
index 3706336..7c91833 100644
--- a/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
+++ b/pages/weiwaigxOut/Cj_StationEntrustOutBillList.vue
@@ -6,8 +6,11 @@
<view class="right">
<input v-model="hform.HProcExchBillNo" placeholder="璇疯緭鍏ュ伐搴忔祦杞崱鍙�" />
</view>
+ <uni-icons type="scan"
+ style="background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;font-weight: 500;"
+ size="20" @click="toScanCode"></uni-icons>
- </view>
+ </view>
<view class="form-item">
<view class="title">鐘舵��:</view>
<view class="right">
@@ -145,6 +148,9 @@
<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>
@@ -232,6 +238,9 @@
<script>
import { getUserInfo } from "@/utils/auth.js";
import StationOutBillPopup from "../../components/StationOutBillPopup/StationEntrustOutBillListPopup.vue"
+ import {
+ MpaasScan
+ } from "../../utils/mpaasScan";
export default {
components:{StationOutBillPopup},
data() {
@@ -271,7 +280,7 @@
},
onLoad() {
- this.getList()
+ this.search()
// console.log(this.userInfo,uni.getStorageSync('HUserName'))
},
onReachBottom: function() {
@@ -293,20 +302,13 @@
let newList = list.slice(sindex,eindex)
return newList
},
- async toScanCode() {
- var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
- mpaasScanModule.mpaasScan({
- 'hideAlbum': true,
- 'timeoutInterval':'10', //瓒呮椂鏃堕棿
- 'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋
- },(ret) => {
- console.log(ret.resp_result)
- if (this.CommonUtils.isEmpty(ret.resp_result) === false) {
- console.log('鏉＄爜鍐呭锛�' + ret.resp_result);
- this.hform.HProcExchBillNo = ret.resp_result
- this.search()
- }
- })
+ toScanCode() {
+ MpaasScan.scanCode((res) => {
+ if (res) {
+ this.hform.HProcExchBillNo = res
+ this.search()
+ }
+ });
},
getList(){
// this.sWhere += ` and 鍒跺崟浜� like '%${this.userInfo.Czymc}'`
--
Gitblit v1.9.1