qingyiay
2023-09-19 01f3801b895fa50387ba6ac7c28130053bf5e19a
修改合卡显示,修改司机首页
3个文件已修改
82 ■■■■ 已修改文件
pages/customer-page/customer-index/customer-index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/customer-page/customer-index/customer-index.vue
@@ -21,6 +21,8 @@
                        @click="cardBodyClick(item)">
                        <view class="first-line">
                            <view class="dispatch-receive">
                                <view class="dispatch-dept">{{ item.deptName }}</view>
                                <view class="black-bar"></view>
                                <view class="dispatch">{{ item.filedName }}</view>
                            </view>
                            <view class="point-number">
@@ -495,8 +497,27 @@
                        .dispatch-receive {
                            width: 70%;
                            display: flex;
                            justify-content: space-between;
                            justify-content: flex-start;
                            align-items: center;
                            .dispatch-dept {
                                display: flex;
                                align-items: center;
                            }
                            .black-bar {
                                width: 2rpx;
                                height: 30rpx;
                                background: #515151;
                                margin-left: vww(12);
                            }
                            .dispatch {
                                margin-left: vww(12);
                                min-width: vww(50);
                            }
                        }
                        .point-number {
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -211,22 +211,23 @@
                </view>
            </view>
        </view>
        <view class="mergeState"
            v-show="mergeStateShow">
            <view class="merge-wrap">
                <view>是否确认合并</view>
                <view class="merge-checkbox">
                    <u-checkbox-group v-model="checkboxValue1"
                        placement="column"
                        @change="mergeStateChange">
                        <u-checkbox :customStyle="{marginBottom: '8px'}"
                            :label="mergeState?'确认':'取消'"
                            name="confirm"
                            label-size="30"
                            size="30"
                            activeColor="#48a2ff">
                        </u-checkbox>
                    </u-checkbox-group>
        <view v-show="mergeStateShow">
            <view class="mergeState">
                <view class="merge-wrap">
                    <view>是否确认合并</view>
                    <view class="merge-checkbox">
                        <u-checkbox-group v-model="checkboxValue1"
                            placement="column"
                            @change="mergeStateChange">
                            <u-checkbox :customStyle="{marginBottom: '8px'}"
                                :label="mergeState?'确认':'取消'"
                                name="confirm"
                                label-size="30"
                                size="30"
                                activeColor="#48a2ff">
                            </u-checkbox>
                        </u-checkbox-group>
                    </view>
                </view>
            </view>
        </view>
@@ -248,7 +249,7 @@
                @click="confirmWeigh"
                throttleTime="800"></u-button>
            <u-button type="primary"
                text="返回加减吨"
                text="返回装卸"
                :disabled="addAndSubtractCoalDisabled"
                @click="addAndSubtractCoal"
                class="jiajian"
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -30,17 +30,18 @@
                </view>
                <view class="info-container">
                    <view class="info-block">
                        <view class="car-num info">
                            <text class="label-text">车牌号:</text>{{item.carNo}}
                        </view>
                        <view class="order-margin info">
                            <text class="label-text">煤种名称:</text>
                            {{item.coalName}}
                        </view>
                        <view class="order-type info">
                            订单类型:{{item.orderType}}
                        </view>
                        <view class="car-num info">
                            车牌号:{{item.carNo}}
                        </view>
                        <view class="file-name info">
                            状态:{{coalStatus[item.status]}}
                        </view>
                        <view class="order-margin info">
                            煤种名称:{{item.coalName}}
                        </view>
                    </view>
                </view>
@@ -186,6 +187,17 @@
                    display: flex;
                    justify-content: center;
                    flex-wrap: wrap;
                    .car-num,
                    .order-margin {
                        color: #FF0000;
                        font-weight: 600;
                        .label-text {
                            color: #409eff;
                        }
                    }
                }
                .info {