From ed9302d78043c177dc4804b39cd3d1352a675c73 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Thu, 24 Aug 2023 16:02:13 +0800
Subject: [PATCH] =?UTF-8?q?ios=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/commonBtn.vue                  |  2 +-
 src/router/index.js                           | 13 +--
 src/views/docmentView                         |  0
 src/views/documentView/trainDocment.vue       | 85 +++++++++++++++++++
 src/views/index/supplySettlement.vue          | 58 ++++++-------
 src/views/index/vehicleAdd.vue                |  2 +-
 src/views/trainDocment.vue                    | 16 ----
 src/views/workOrder/accounting.vue            | 29 +++++--
 .../workOrder/workOrderReconciliation.vue     | 66 +++++++-------
 9 files changed, 182 insertions(+), 89 deletions(-)
 delete mode 100644 src/views/docmentView
 create mode 100644 src/views/documentView/trainDocment.vue
 delete mode 100644 src/views/trainDocment.vue

diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue
index 23fefad3..4b70520c 100644
--- a/src/components/commonBtn.vue
+++ b/src/components/commonBtn.vue
@@ -31,7 +31,7 @@ import {myMixins} from "@/utils/myMixins"
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 .button {
-  position: fixed;
+  position: absolute;
   bottom: 30px;
   border-radius: 5px;
   text-align: center;
diff --git a/src/router/index.js b/src/router/index.js
index f1b37e65..ae82a755 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -112,11 +112,14 @@ const routes = [
             title:'司机新增或修改'
         }
     },
-    // {
-    //     path: '/trainDocment',
-    //     name: 'trainDocment',
-    //     component:()=>import('@/views/docmentView')
-    // }
+    {
+        path: '/trainDocment',
+        name: 'trainDocment',
+        component:()=>import('@/views/documentView/trainDocment.vue'),
+        meta: {
+            title:'培训文档'
+        }
+    }
   ]
 
 const router = new VueRouter({
diff --git a/src/views/docmentView b/src/views/docmentView
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
new file mode 100644
index 00000000..2ebd2b64
--- /dev/null
+++ b/src/views/documentView/trainDocment.vue
@@ -0,0 +1,85 @@
+<template>
+<div class="wrap">
+  <div class="navBar">
+    <van-nav-bar
+        title="培训文档 "
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goBack"
+    >
+      <template slot="right">
+        <div class="rightWrap">
+          <img src="@/assets/serach.png" class="img2"/>
+        </div>
+      </template>
+    </van-nav-bar>
+  </div>
+  <div class="contentWrap">
+        <div class="itemWrap">
+            <div class="info">
+              <div class="title">会记回家和</div>
+              <div class="time">2023-08-24 13:14:00</div>
+            </div>
+           <div class="imgWrap">
+             <img src="@/assets/empty.png">
+           </div>
+           <div class="num">111</div>
+            <div class="doc">
+              <div class="left">培训材料</div>
+              <div class="right">
+                <span>未处理</span>
+                <span>阅读 8</span>
+              </div>
+            </div>
+        </div>
+  </div>
+</div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+export default {
+  name: "trainDocment",
+  mixins:[myMixins],
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/common.scss";
+@import "@/styles/mixin.scss";
+.wrap{
+  width: 100%;
+  height: 100%;
+  background-color: #F4F5F7;
+  overflow-y: auto;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.rightWrap {
+  @include flexCenter;
+  .img2 {
+    @include wh(17px, 17px)
+  }
+}
+.contentWrap{
+  padding: 0 8px;
+  width: 100%;
+  box-sizing: border-box;
+  .itemWrap{
+    margin-top: 56px;
+    @include wh(100%, 300px);
+    background: #FFFFFF;
+    box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+    border-radius: 3px;
+    box-sizing: border-box;
+    //padding: 11px 13px 9px 15px;
+    @include fontWeightSize(400, 12px);
+    @include flexBetween;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue
index ca1f2e99..4dd45f8d 100644
--- a/src/views/index/supplySettlement.vue
+++ b/src/views/index/supplySettlement.vue
@@ -40,24 +40,27 @@
           <div>小轮个数</div>
           <div>等候费</div>
           <div>困境费</div>
-          <div class="blueColor">已收取客户金额</div>
+          <div class="blueColor" style="font-weight: 500;font-size: 14px">已收取客户金额</div>
         </div>
         <div class="rightInputMeters" style="opacity: 1">
           <div class="alignRight"><input type="number" v-model="form.tyreNumber"/>个</div>
           <div  class="alignRight"><input type="number" v-model="form.waitAmount"/>元</div>
           <div class="alignRight"><input type="number" v-model="form.dilemmaFee"/>元</div>
-          <div class="blueColor"><input type="number" v-model="form.customerAmount"/>元</div>
+          <div class="blueColor" style="font-weight: 500;font-size: 14px ;"><input  class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
         </div>
       </div>
     </div>
-    <div class="fixed-bottom">
-      <common-btn class="btn" @submitClick="submit" />
+    <div class="btn">
+      <button>提交</button>
     </div>
+<!--    <div class="fixed-bottom">-->
+<!--      <common-btn class="btn" @submitClick="submit" />-->
+<!--    </div>-->
   </div>
 </template>
 
 <script>
-import CommonBtn  from "@/components/commonBtn.vue"
+// import CommonBtn  from "@/components/commonBtn.vue"
 import {leftCopy} from  "@/utils/common"
 import {getOrderSettlement, updateOrderSettlement} from "@/api/order"
 export default {
@@ -127,7 +130,7 @@ export default {
     }
   },
   components:{
-    CommonBtn
+    // CommonBtn
   }
 }
 </script>
@@ -135,10 +138,9 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 .wrap {
-  @include wh(100%,100vh);
+  @include wh(100%,100%);
   background-color: #F4F5F7;
-  overflow-y: auto;
-  position: relative;
+  overflow-y: scroll;
 }
 .common {
   @include wh(100%, 161px);
@@ -150,7 +152,7 @@ export default {
 }
 .otherFee {
   @include wh(100%, 198px);
-  margin-bottom: 20px;
+  //margin-bottom: 20px;
 }
 .title {
   @include fontWeightSize(bold, 14px);
@@ -170,9 +172,6 @@ export default {
   justify-content: space-between;
   line-height: 37px;
   .blueColor{
-    display: flex;
-    flex-wrap: nowrap;
-    @include fontWeightSize(bold,14px);
     color: #4682FE;
   }
   .alignRight{
@@ -188,6 +187,7 @@ export default {
     color: #323643;
     opacity: .5;
     input {
+      height: 30px;
       border: none;
       text-align: right;
       color: #323643;
@@ -195,22 +195,20 @@ export default {
     }
   }
 }
-.fixed-bottom {
-
-  position: fixed;   /* 设置按钮容器为固定定位 */
-  left: 0;
-  right: 0;
-  bottom: 0;
-  //padding: 10px;  /* 可根据需要调整按钮容器的内边距 */
-  //background-color: #f0f0f0; /* 可根据需要设置按钮容器的背景颜色 */
-  //box-shadow: 0 -2px 4px rgba(0, 0, 0, 0.2); /* 可根据需要添加按钮容器的阴影效果 */
-}
-/* 如果需要调整按钮在底部容器内的位置，可以使用更具体的选择器进行样式调整 */
-.fixed-bottom .btn {
-
-  position: absolute; /* 将按钮设置为绝对定位 */
-  bottom: 30px; /* 可根据需要调整按钮距离底部的距离 */
-  left: 50%; /* 可根据需要调整按钮在容器中的水平位置 */
-  transform: translateX(-50%); /* 将按钮向左偏移自身宽度的一半，使其居中 */
+.btn {
+margin-top: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  button {
+    border: none;
+    border-radius: 5px;
+    text-align: center;
+    @include bgFontColor(#FFFFFF,#354D93);
+    @include fontWeightSize(bold,15px);
+    @include whLin(88%,48px);
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index eb9b9bc6..eec260fc 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -152,7 +152,7 @@ export default {
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
           vehicleType:this.selectedOption ? this.selectedOption : '',
-          hasPolymerization:Number(this.isJoin ? this.isJoin : '') ,
+          hasPolymerization:this.isJoin ? this.isJoin : '',
           serviceIds:this.serviceIds ? this.serviceIds : []
         })
         if(this.id){
diff --git a/src/views/trainDocment.vue b/src/views/trainDocment.vue
deleted file mode 100644
index 5fcfe7fd..00000000
--- a/src/views/trainDocment.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-<div class="wrap">
-  培训文档
-</div>
-</template>
-
-<script>
-export default {
-  name: "trainDocment",
-}
-</script>
-
-<style scoped lang="scss">
-@import "@/styles/common.scss";
-@import "@/styles/mixin.scss";
-</style>
\ No newline at end of file
diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue
index 5d6e4b4b..70800247 100644
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@@ -59,7 +59,7 @@
     <div class="inpInfo">
       <div class="titleContent">
         <div  class="flex-between" v-show="abState">
-          <div>  到达事发地距离:</div>
+          <div>  到事发地距离:</div>
           <div  class="halfOpcity"><input type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
         </div>
         <div  class="flex-between" v-show="bcState" >
@@ -131,8 +131,8 @@
         <td  class="col2 supplierShuju">供应商数据</td>
       </tr>
       <tr v-show="abState">
-        <td class="col1">到达事发地距离:{{orderInfo.settleMileageAb + '公里'}}</td>
-        <td  class="col2 halfOpc"><input placeholder="输入到达事发地距离"  v-model="form.supplierSettleMileageAb"/></td>
+        <td class="col1">到事发地距离:{{orderInfo.settleMileageAb + '公里'}}</td>
+        <td  class="col2 halfOpc"><input placeholder="输入到事发地距离"  v-model="form.supplierSettleMileageAb"/></td>
       </tr>
       <tr v-show="bcState">
         <td class="col1">拖车里程:{{orderInfo.settleMileageBc + '公里'}}</td>
@@ -267,6 +267,7 @@ export default {
       auditPhotoList:[],
       supplierPhotoList:[],
       index:'',//记录工单对账属于哪个状态
+      uploadedImage: null,
       form:{
         id:'',
         taskOrderCostHisId:'',
@@ -360,6 +361,19 @@ export default {
     },
   },
   methods:{
+    // openFileSelector() {
+    //   this.$refs.fileInput.click();
+    // },
+    // handleFileUpload(event) {
+    //   const file = event.target.files[0];
+    //   if (file) {
+    //     const reader = new FileReader();
+    //     reader.onload = (e) => {
+    //       this.uploadedImage = e.target.result;
+    //     };
+    //     reader.readAsDataURL(file);
+    //   }
+    // },
      handleFileRead(file) {
       console.log("file",file)
      },
@@ -620,7 +634,10 @@ img{
 
 }
 .supplierData{
-  @include wh(100%,438px);
+  width: 100%;
+  margin-bottom: 0;
+
+  //@include wh(100%,438px);
   .inpInfo{
     //display: flex;
     //justify-content: space-between;
@@ -663,7 +680,7 @@ img{
     box-sizing: border-box;
   }
   .btn{
-    margin-top: 8px;
+    margin-top: 28px;
   }
 }
 .dataType{
@@ -755,7 +772,7 @@ img{
   display: flex;
   justify-content: space-around;
   box-sizing: border-box;
-  padding: 0 8px;
+  //padding: 0 8px;
   button{
     @include wh(105px,39px);
     line-height: 39px;
diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue
index 071ac5d7..a9ff6f72 100644
--- a/src/views/workOrder/workOrderReconciliation.vue
+++ b/src/views/workOrder/workOrderReconciliation.vue
@@ -33,41 +33,40 @@
         {{ item.name }}
       </div>
     </div>
-    <div >
-      <div  class="content_wrap" v-for="(item,index) in orderList" :key="index">
-        <div class="codeTxt common">
-          <div class="leftStatus ">
-            <span style="margin-right: 20px" class="orderCode">{{item.orderCode}}</span>
-            <span class="carCode">{{ item.plateNumber }}</span>
+
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+     <div >
+        <div  class="content_wrap" v-for="(item,index) in orderList" :key="index">
+          <div class="codeTxt common">
+            <div class="leftStatus ">
+              <span style="margin-right: 20px" class="orderCode">{{item.orderCode}}</span>
+              <span class="carCode">{{ item.plateNumber }}</span>
+            </div>
+            <div class="rightBtn">
+              <span class="serviceStatus">{{ item.taskStatus?.label }}</span>
+            </div>
           </div>
-          <div class="rightBtn">
-            <span class="serviceStatus">{{ item.taskStatus?.label }}</span>
+          <div class="line"></div>
+          <div class="supplier">
+            <span class="halfTxt">服务商:</span>
+            <span class="allTxt">{{ item.supplierName }}</span>
           </div>
-        </div>
-        <div class="line"></div>
-        <div class="supplier">
-          <span class="halfTxt">服务商:</span>
-          <span class="allTxt">{{ item.supplierName }}</span>
-        </div>
-        <div class="status common">
-          <div class="leftStatus" >
-            <span class="halfTxt">审核状态:</span>
-            <span class="allTxt">{{ item.accountStatus?.label }}</span>
-          </div>
-          <div class="rightBtn">
-            <button class="btn"  v-if="queryType == 1"  @click="handleAccounting(item)">记账</button>
-            <button class="btn" v-if="queryType == 3"  @click="handleAccounting(item)">{{item.accountStatus.code == 3 ? '重新记账'  : '记账'}}</button>
-            <button class="btn"  v-if="queryType == 5"  @click="handleAccounting(item)">重新记账</button>
-            <button class="btn"  v-if="queryType == 7" @click="goPageDetail(item)">查看详情</button>
+          <div class="status common">
+            <div class="leftStatus" >
+              <span class="halfTxt">审核状态:</span>
+              <span class="allTxt">{{ item.accountStatus?.label }}</span>
+            </div>
+            <div class="rightBtn">
+              <button class="btn"  v-if="queryType == 1"  @click="handleAccounting(item)">记账</button>
+              <button class="btn" v-if="queryType == 3"  @click="handleAccounting(item)">{{item.accountStatus.code == 3 ? '重新记账'  : '记账'}}</button>
+              <button class="btn"  v-if="queryType == 5"  @click="handleAccounting(item)">重新记账</button>
+              <button class="btn"  v-if="queryType == 7" @click="goPageDetail(item)">查看详情</button>
+            </div>
           </div>
         </div>
       </div>
+    </van-pull-refresh>
 
-    </div>
-<!--    <div v-show="show" style="display: flex;justify-content: center;align-items: center; width: 100%; height: 80%;">-->
-<!--      <img src="@/assets/empty.png">-->
-
-<!--    </div>-->
   </div>
 </template>
 
@@ -91,7 +90,7 @@ export default {
       showDatetime: false,
       currentDate: new Date(),
       ymTime: '',
-      recordIndex:'',
+      isLoading:"",
     }
   },
   mounted() {
@@ -102,6 +101,13 @@ export default {
     this.getList();
   },
   methods: {
+    onRefresh() {
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
     initIndex(){
       if(this.activeIndex === 0){
         this.queryType = 1