From 74073d164925eff4962188405355debb367aaf06 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 24 十月 2024 18:13:25 +0800
Subject: [PATCH] feat:小问题修改
---
subPages/addDailyPlan/addDailyPlan.vue | 12 ++++++++++--
api/request.js | 2 +-
pages/loadUnload-page/historyOrder/index.vue | 2 +-
pages/loadUnload-page/selectTarget/selectTarget.vue | 12 ++++++------
pages/loadUnload-page/orderPlanList/index.vue | 2 +-
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/api/request.js b/api/request.js
index d57a881..bf4e62f 100644
--- a/api/request.js
+++ b/api/request.js
@@ -105,7 +105,7 @@
}
// const BaseUrl = "http://192.168.0.110:9896"
-// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info"
+// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info"
const BaseUrl = "https://wrzs.czjlchem.com:9090"
// const BaseUrl = 'http://192.168.0.66:9896'
diff --git a/pages/loadUnload-page/historyOrder/index.vue b/pages/loadUnload-page/historyOrder/index.vue
index 6f6444a..6ca2393 100644
--- a/pages/loadUnload-page/historyOrder/index.vue
+++ b/pages/loadUnload-page/historyOrder/index.vue
@@ -118,7 +118,7 @@
<text>璁″垝閲忥細{{ value.planMeasure ?value.planMeasure :'鏆傛棤'}}</text>
</view>
<view class="productName">
- <text>瀹為檯閲忥細{{value.realityMeasure ? value.realityMeasure : '鏆傛棤'}}</text>
+ <text>瀹為檯閲忥細{{value.productQuantity ? value.productQuantity : '鏆傛棤'}}</text>
</view>
</view>
</view>
diff --git a/pages/loadUnload-page/orderPlanList/index.vue b/pages/loadUnload-page/orderPlanList/index.vue
index 8f335fd..e952dd4 100644
--- a/pages/loadUnload-page/orderPlanList/index.vue
+++ b/pages/loadUnload-page/orderPlanList/index.vue
@@ -102,7 +102,7 @@
<uni-td align="center">
<view>{{ subItem.planMeasure }}</view></uni-td>
<uni-td align="center">
- <view>{{ subItem.realityMeasure }}</view></uni-td>
+ <view>{{ subItem.productQuantity }}</view></uni-td>
<uni-td align="center">
{{ subItem.statusView }}</uni-td>
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 32324d7..ed49872 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -208,7 +208,7 @@
<view class=""></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.productNames || item.productName }}</view>
+ <view class="coal-name">{{ item.productNames?limitString(item.productNames,20,'...'):'' || ''}}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -342,7 +342,7 @@
</view>
<view v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
<view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view>
- <view >瀹為檯閲忥細{{ Number(activeObj.realityMeasure)}}</view>
+ <view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
</view>
<view class="queren" v-show="isCleanFlag === '1'">
<text>璇疯緭鍏�</text>锛�
@@ -350,7 +350,7 @@
type='digit'
:disabled="yelvFlag"
border="bottom"
- :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '鏁伴噺' : blend ? '鏁伴噺' : '鎶樺惃'"
+ :placeholder="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName) ? '瀹為檯鍚ㄦ暟' : isNumOk ? '纭鏁伴噺' : blend ? '纭鏁伴噺' : '鎶樺惃'"
v-model="checkNum"
>
</u--input>
@@ -389,7 +389,7 @@
<view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
</view>
- <view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}{{ activeObj.productUnit || '浠�' }}</view>
+ <view v-if="isNumOk && activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
</view>
@@ -895,7 +895,7 @@
this.blend = true;
this.isNumOk = false;
this.isClean = false;
- this.isCleanFlag = '0';
+ // this.isCleanFlag = '0';
this.isFlagNum = false;
}
else {
@@ -936,7 +936,7 @@
this.isNumOk = true;
this.isClean = false;
this.yelvFlag = true;
- this.checkNum = item.planMeasure;
+ this.checkNum = item.productQuantity;
this.blend = false;
this.isCleanFlag = '1';
this.isFlagNum = false;
diff --git a/subPages/addDailyPlan/addDailyPlan.vue b/subPages/addDailyPlan/addDailyPlan.vue
index e416afa..8cd2ed2 100644
--- a/subPages/addDailyPlan/addDailyPlan.vue
+++ b/subPages/addDailyPlan/addDailyPlan.vue
@@ -75,13 +75,15 @@
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
<uni-th align="center">浜у搧鍚嶇О</uni-th>
+ <uni-th align="center">瑙勬牸</uni-th>
<uni-th align="center">浠撳簱</uni-th>
<uni-th align="center" v-if="isNumOk">鏁伴噺</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in subDataList" :key="index">
<uni-td align="center">
<view>{{ item.productName}}</view></uni-td>
-
+ <uni-td align="center">
+ <view>{{ item.productSpecs}}</view></uni-td>
聽 <uni-td align="center">
<view>{{ item.bunkerName }}</view></uni-td>
聽 <uni-td align="center" v-if="isNumOk">
@@ -315,7 +317,13 @@
confirmBuild() {
let tempArr = [];
this.subDataList.forEach(item=>{
- tempArr.push(item.productId + ':' + item.surplusQuant);
+ this.checkList.forEach(val=>{
+ if(item.id === val){
+ tempArr.push(item.productId + ':' + item.surplusQuant);
+ }
+
+ })
+
})
this.mapProductNum = tempArr.join(",")
let form = {
--
Gitblit v1.9.1