yangan
2024-10-24 74073d164925eff4962188405355debb367aaf06
feat:小问题修改
5个文件已修改
30 ■■■■■ 已修改文件
api/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/historyOrder/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/orderPlanList/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/selectTarget/selectTarget.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
subPages/addDailyPlan/addDailyPlan.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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'
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>
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>
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;
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 = {