1.待领取列表增加字段 矿、煤场、煤种、客户名称、发运日期、日计划编号（完成） 2.多次抢单弹框再次确认是否抢单（完成） 3.待预约提煤单列表显示样式...

付延余

2023-03-23 8903e1a476fd1140acbc1a91e187de6d771e4664

1.待领取列表增加字段 矿、煤场、煤种、客户名称、发运日期、日计划编号（完成）
2.多次抢单弹框再次确认是否抢单（完成）
3.待预约提煤单列表显示样式（完成）

 .idea/workspace.xml

@@ -1,44 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="de4a16e8-9e0d-4a5f-a487-524789ad4ed2" name="默认变更列表" comment="" />
    <list default="true" id="641a060a-77a0-4abc-beee-5799e0a69a90" name="变更" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="GitSEFilterConfiguration">
    <file-type-list>
      <filtered-out-file-type name="LOCAL_BRANCH" />
      <filtered-out-file-type name="REMOTE_BRANCH" />
      <filtered-out-file-type name="TAG" />
      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
    </file-type-list>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="ProjectId" id="2E4JLmXtgrFUphOPAFgD9ndYnBT" />
  <component name="MarkdownSettingsMigration">
    <option name="stateVersion" value="1" />
  </component>
  <component name="ProjectId" id="2NPMklVf3ymYfA1eAr6YaQnPv6S" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../platform-ui4.2" />
    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
    <property name="vue.rearranger.settings.migration" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RunOnceActivity.OpenProjectViewOnStart": "true",
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "WebServerToolWindowFactoryState": "false",
    "vue.rearranger.settings.migration": "true"
  }
}]]></component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
  <component name="TaskManager">
    <task active="true" id="Default" summary="默认任务">
      <changelist id="de4a16e8-9e0d-4a5f-a487-524789ad4ed2" name="默认变更列表" comment="" />
      <created>1661848870235</created>
      <changelist id="641a060a-77a0-4abc-beee-5799e0a69a90" name="变更" comment="" />
      <created>1679561411159</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1661848870235</updated>
      <workItem from="1661848871437" duration="23404000" />
      <workItem from="1661996980387" duration="10044000" />
      <workItem from="1663810576690" duration="41000" />
      <updated>1679561411159</updated>
      <workItem from="1679561415887" duration="70000" />
    </task>
    <servers />
  </component>

 api/publicInterface.js

@@ -4,7 +4,7 @@
// const BaseUrl = "http://192.168.3.159:9999/";
import {BaseUrl as wrBaseUrl} from '@/api/request.js'
// const BaseUrl = "http://192.168.0.120:9999"
const BaseUrl = "http://192.168.110.101:9999"
const BaseUrl = "http://192.168.3.109:9999"

// 登录
// function apiLogin({

 api/request.js

@@ -80,8 +80,8 @@

// const BaseUrl = "http://192.168.0.120:9997"
// const webSocketUrl = "ws://192.168.0.120:9997/wrzs/ws/info"
const BaseUrl = "http://192.168.110.101:9997";
const webSocketUrl = "ws://192.168.110.101:9997/wrzs/ws/info"
const BaseUrl = "http://192.168.3.109:9997";
const webSocketUrl = "ws://192.168.3.109:9997/wrzs/ws/info"

// 请求拦截
const fetch = (url, opt) => {

 manifest.json

@@ -1,75 +1,75 @@
{
    "name": "unattended-app",
    "appid": "__UNI__103882A",
    "description": "",
    "versionName": "1.0.0",
    "versionCode": "100",
    "transformPx": false,
    /* 5+App特有相关 */
    "app-plus": {
        "usingComponents": true,
        "nvueStyleCompiler": "uni-app",
        "compilerVersion": 3,
        "splashscreen": {
            "alwaysShowBeforeRender": true,
            "waiting": true,
            "autoclose": true,
            "delay": 0
        },
        /* 模块配置 */
        "modules": {},
        /* 应用发布信息 */
        "distribute": {
            /* android打包配置 */
            "android": {
                "permissions": [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                ]
            },
            /* ios打包配置 */
            "ios": {},
            /* SDK配置 */
            "sdkConfigs": {}
        }
    },
    /* 快应用特有相关 */
    "quickapp": {},
    /* 小程序特有相关 */
    "mp-weixin": {
        "appid": "wx2463f9b1ba3b9651",
        "setting": {
            "urlCheck": false,
            "es6": true,
            "minified": true,
            "postcss": false
        },
        "usingComponents": true
    },
    "mp-alipay": {
        "usingComponents": true
    },
    "mp-baidu": {
        "usingComponents": true
    },
    "mp-toutiao": {
        "usingComponents": true
    },
    "uniStatistics": {
        "enable": false
    },
    "vueVersion": "2"
    "name" : "unattended-app",
    "appid" : "__UNI__103882A",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
        "usingComponents" : true,
        "nvueStyleCompiler" : "uni-app",
        "compilerVersion" : 3,
        "splashscreen" : {
            "alwaysShowBeforeRender" : true,
            "waiting" : true,
            "autoclose" : true,
            "delay" : 0
        },
        /* 模块配置 */
        "modules" : {},
        /* 应用发布信息 */
        "distribute" : {
            /* android打包配置 */
            "android" : {
                "permissions" : [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                ]
            },
            /* ios打包配置 */
            "ios" : {},
            /* SDK配置 */
            "sdkConfigs" : {}
        }
    },
    /* 快应用特有相关 */
    "quickapp" : {},
    /* 小程序特有相关 */
    "mp-weixin" : {
        "appid" : "wx4a62fc1684c429a9",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,
            "minified" : true,
            "postcss" : false
        },
        "usingComponents" : true
    },
    "mp-alipay" : {
        "usingComponents" : true
    },
    "mp-baidu" : {
        "usingComponents" : true
    },
    "mp-toutiao" : {
        "usingComponents" : true
    },
    "uniStatistics" : {
        "enable" : false
    },
    "vueVersion" : "2"
}

 pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue

@@ -3,26 +3,25 @@
        <view class="fayunPlanBody">
            <combined-title title="领取情况"></combined-title>
            <view class="compDetails">
                <!-- <view class="comp">{{ orderPlanDetail.compName }}</view> -->
                <uni-table border stripe emptyText="暂无更多数据">
                    <uni-tr>
                        <uni-th align="left" width="200">转发总量</uni-th>
                        <uni-th align="left" width="120">转发总量</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fowardSum || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left" width="200">领取总量</uni-th>
                        <uni-th align="left">领取总量</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.fleetOrHuodaiNub || 0 }}张</uni-td>
                    </uni-tr>
                    <uni-tr v-for="(item, index) in orderPlanDetail.huodaiList" :key="index">
                        <uni-th align="left" width="200">{{ item.huoDaiName }}</uni-th>
                        <uni-th align="left">{{ item.huoDaiName }}</uni-th>
                        <uni-td align="left">{{ item.fleetOrHuodaiNub }}张</uni-td>
                    </uni-tr>
                    <uni-tr v-for="(item, index) in orderPlanDetail.cheduiList" :key="index">
                        <uni-th align="left" width="200">{{ item.cheduiName }}</uni-th>
                        <uni-th align="left">{{ item.cheduiName }}</uni-th>
                        <uni-td align="left">{{ item.fleetOrHuodaiNub }}张</uni-td>
                    </uni-tr>
                    <uni-tr>
                        <uni-th align="left" width="200">司机总领取</uni-th>
                        <uni-th align="left">司机总领取</uni-th>
                        <uni-td align="left">{{ orderPlanDetail.sijiSum || 0 }}张</uni-td>
                    </uni-tr>
                </uni-table>
@@ -148,7 +147,7 @@
        .uni-table {
            .uni-table-tr {
                padding: 0;
                border:vww(1) solid #c6c6c6;
                border: vww(1) solid #c6c6c6;
                .uni-table-th {
                    font-size: vww(14);
                    height: vww(30);

 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue

@@ -2,23 +2,23 @@
    <view class="bill-of-lading-details">
        <view class="bangDanMessage">
            <view class="">
                <text>客户：{{ coalDetailsData.customerName }}</text>
                <text>矿厂：{{ coalDetailsData.deptName }}</text>
                <text>客户：{{ coalDetailsData.customerName || '' }}</text>
                <text>矿厂：{{ coalDetailsData.deptName || '' }}</text>
            </view>
            <view class="">
                <text>皮重：{{ coalDetailsData.skin }}</text>
                <text>毛重：{{ coalDetailsData.hair }}</text>
                <text>净重：{{ coalDetailsData.clean }}</text>
                <text>皮重：{{ coalDetailsData.skin || '' }}</text>
                <text>毛重：{{ coalDetailsData.hair || '' }}</text>
                <text>净重：{{ coalDetailsData.clean || '' }}</text>
            </view>
            <view class="">
                <text>磅单类型：{{ coalDetailsData.orderTye }}</text>
                <text>磅单类型：{{ coalDetailsData.orderTye || '' }}</text>
                <text>状态：{{ coalStatus[coalDetailsData.status] }}</text>
            </view>
            <view class="">
                <text>煤场：{{ coalDetailsData.filedName }}</text>
                <text>发运时间：{{ coalDetailsData.sendDate }}</text>
                <text>提煤单编号：{{ coalDetailsData.code }}</text>
                <text>订单编号：{{ coalDetailsData.orderCode }}</text>
                <text>煤场：{{ coalDetailsData.filedName || '' }}</text>
                <text>发运时间：{{ coalDetailsData.sendDate || '' }}</text>
                <text>提煤单编号：{{ coalDetailsData.code || '' }}</text>
                <text>订单编号：{{ coalDetailsData.orderCode || '' }}</text>
            </view>
        </view>
        <view class="timeLine" style="font-size: 16rpx;">
@@ -238,35 +238,39 @@
        margin: vww(20);
        margin-bottom: vww(10);
        height: 40%;
        font-size:vww(16);
        font-weight: 500;
        .u-text {
            margin-bottom: vww(5) !important;
        }
        font-size: vww(16);
        font-weight: 600;
        view {
            margin-bottom: vww(5);
            margin-bottom: vww(10);
        }
        view:nth-of-type(1) {
            display: flex;
            text{
                width:50%;
            text {
                width: 50%;
                text-align: center;
            }
        }
        view:nth-of-type(2) {
            display: flex;
            text{
                width:33%;
            text {
                width: 33%;
                text-align: center;
            }
        }
        view:nth-of-type(3) {
            display: flex;
            text{
                width:50%;
            text {
                width: 50%;
                text-align: center;
            }
        }
        view:nth-of-type(4){
            display:flex;
        view:nth-of-type(4) {
            display: flex;
            flex-direction: column;
            text {
                margin-bottom: vww(10);
                text-align: center;
            }
        }
    }
    .timeLine {
@@ -284,7 +288,7 @@
        }
    }
    .utilsBox {
        padding: vww(20);
        padding: vww(10) vww(20);
        flex: 1;
        display: flex;
        flex-direction: column;

 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue

@@ -259,7 +259,7 @@
    flex-direction: column;
    .one {
        flex: 2;
        border: vww(1) solid #dddddd;
        border: vww(2) solid #dddddd;
        margin: vww(20) vww(20) 0 vww(20);
        border-radius: vww(15);
        .top {
@@ -288,7 +288,7 @@
    }
    .two {
        flex: 4;
        border: vww(1) solid #dddddd;
        border: vww(2) solid #dddddd;
        margin: vww(20);
        border-radius: vww(10);
        padding: vww(20);

 pages/driver-page/driver-index/driver-index.vue

@@ -16,21 +16,31 @@
                        <text>{{ item.carNum }}</text>
                        张
                    </view>
                    <view class="card-left__utils"><u-button @tap.stop="qiangDan(item.orderPlanId)" text="抢单" type="primary" shape="circle"></u-button></view>
                    <view class="card-left__utils"><u-button @tap.stop="qiangDanBtn(item)" text="抢单" type="primary" shape="circle"></u-button></view>
                </template>
                <template v-slot:right-top>
                    <view class="right-top">
                        <view class="card-right-top-row">
                            <view>
                                <text>{{ item.compName }}</text>
                                <text>{{ item.deptName ||''}}</text>
                            </view>
                            <view>
                                <text>{{ item.coalName }}</text>
                                <text>{{ item.coalName ||''}}</text>
                            </view>
                        </view>
                        <view class="card-right-top-row">
                            <view>
                                <text>剩余{{ item.carNum - item.taskNum }}张</text>
                            </view>
                        </view>
                        <view class="card-right-top-row">
                            <view>
                                <text>{{item.filedName||''}}</text>
                            </view>
                        </view>
                        <view class="card-right-top-row">
                            <view>
                                <text>{{item.orderCode||''}}</text>
                            </view>
                        </view>
                    </view>
@@ -127,7 +137,7 @@
            qiangDanShow: false,
            qiangDanTitle: '抢单提示',
            qiangDanContent: '',
            qiangDanOrderPlanId:null
            qiangDanOrderPlanId: null
        };
    },
    onShow() {
@@ -149,17 +159,17 @@
        },
        // 抢单按钮
        qiangDanBtn(value) {
            if (value.tmcCount == 0) {
            if (value.tmcCount == '0') {
                this.qiangDan(value.orderPlanId);
            } else {
                this.qiangDanOrderPlanId = value.orderPlanId
                this.qiangDanShow = true
                this.qiangDanContent = `已抢${value.tmcCount}单，确定抢单？`
                this.qiangDanOrderPlanId = value.orderPlanId;
                this.qiangDanShow = true;
                this.qiangDanContent = `已抢${value.tmcCount}单，确定抢单？`;
            }
        },
        // 抢单模态框
        qiangDanConfirm() {
            this.qiangDanContent = ''
            this.qiangDanContent = '';
            this.qiangDan(this.qiangDanOrderPlanId);
        },
        qiangDanCancel() {
@@ -257,14 +267,16 @@
            }
            &Table {
                .uni-table {
                    min-width: 94%!important;
                    .uni-table-tr {
                        padding: 0;
                        .uni-table-th {
                            width:33.3%;
                            line-height: 58rpx;
                            padding: vww(5) vww(10);
                            color: #111111;
                            font-weight: 400;
                            background: #e5e5e5;
                            background: #f5f5f5;
                        }
                        .uni-table-td {
                            font-weight: 400;