From b9c8410f6d5c7efa7b7b2b374adb21649dd2f886 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 25 六月 2023 10:49:38 +0800
Subject: [PATCH] 返回加减吨增加字段
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 7 +++++--
api/globalApi.js | 41 ++++++++++++++++++++++-------------------
pages/login/login.vue | 2 +-
3 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 79af198..3ab8f3f 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -75,14 +75,8 @@
url: '/wrzs/userOperation/huoDaiList ',
method: 'GET'
},
-
- //鍙告満棣栭〉鍒楄〃
- // qiangDanList: {
- // url: "/wrzs/wx/qiangDanList",
- // method: "GET"
- // },
/**
- * @鍙告満棣栭〉鍒楄〃淇敼
+ * @description 鍙告満棣栭〉鍒楄〃淇敼 娌抽挗
*/
qiangDanList: {
url: '/wrzs/userOperation/qiangDanList',
@@ -132,20 +126,20 @@
url: '/wrzs/userOperation/yuYue',
method: 'POST'
},
-
- //鑾峰彇鎻愮叅鍗曡鎯�
- // getTakeCoal: {
- // url: "/wrzs/wx/getTakeCoal",
- // method: "GET"
- // },
/**
- * @鑾峰彇鎻愮叅鍗曡鎯呬慨鏀瑰悗
+ * @description 鑾峰彇鎻愮叅鍗曡鎯� 娌抽挗
*/
getTakeCoal: {
url: '/wrzs/userOperation/getTakeCoal',
method: 'GET'
},
-
+ /**
+ * @description 鏌ヨ浜у搧 娌抽挗
+ */
+ getJcProductList: {
+ url: '/wrzs/jcproduct/getJcProductList',
+ method: 'GET'
+ },
// 鐢ㄦ埛
// 鑾峰彇鐢ㄦ埛淇℃伅
getUserEntity: {
@@ -217,14 +211,14 @@
},
/**
- * @绛惧埌
+ * @description 绛惧埌
*/
arrive: {
url: '/wrzs/userOperation/arrive',
method: 'POST'
},
/**
- * @鍏ュ満鐢宠
+ * @description 鍏ュ満鐢宠
*/
// 鏂板
saveRCSQ: {
@@ -257,13 +251,22 @@
method: 'POST'
},
/**
- * @绉伴噸
+ * @description 绉伴噸 娌抽挗
*/
saveWeigh: {
url: '/wrzs/userOperation/saveWeigh',
method: 'POST'
},
- // 鑾峰彇绉伴噸淇℃伅
+ /**
+ * @description 澶嶇О 娌抽挗
+ */
+ repeatCheck: {
+ url: '/wrzs/jcgatestate/repeatCheck',
+ method: 'POST'
+ },
+ /**
+ * @description 鑾峰彇绉伴噸淇℃伅 娌抽挗
+ */
weighList: {
url: '/wrzs/userOperation/weighList',
method: 'GET'
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index ffe5e41..75b1b71 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -124,7 +124,7 @@
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
<view class="prefix">瀹㈡埛:</view>
- <view class="suffix">{{ weighList.customerName }}</view>
+ <view class="suffix">{{ weighList.customerName|| '' }}</view>
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
@@ -446,7 +446,10 @@
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
- carNo: this.weighData.carNo
+ carNo: this.weighData.carNo,
+ tmId: this.weighData.tmId,
+ filedId: this.weighData.filedId,
+ weigh: this.realTimeWeigh
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5d31eb0..adac256 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -20,7 +20,7 @@
<view class="register"
@click="registerClick"><text>娉ㄥ唽</text></view>
<view class="login-bottom-box">
- <view class="copyright">鍐�涓兘婧愭棤浜哄�煎畧寰俊灏忕▼搴�</view>
+ <view class="copyright">鏃犱汉鍊煎畧寰俊灏忕▼搴�</view>
<view class="copyright">灏忕▼搴忎粎渚涘凡鎷ユ湁绯荤粺璐﹀彿鐗瑰畾鍐呴儴浜哄憳浣跨敤</view>
</view>
<!-- 寰俊鎺堟潈鍓嶇殑寮规 -->
--
Gitblit v1.9.1