From 289531285327406622554b65f1155c6321bc7842 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Fri, 25 Aug 2023 09:33:57 +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/api/mine.js                         |  11 +-
 src/router/index.js                     |   8 ++
 src/views/documentView/docmentList.vue  | 156 ++++++++++++++++++++++++
 src/views/documentView/trainDocment.vue |  57 +++++++--
 src/views/workOrder/accounting.vue      |  29 ++---
 5 files changed, 234 insertions(+), 27 deletions(-)
 create mode 100644 src/views/documentView/docmentList.vue

diff --git a/src/api/mine.js b/src/api/mine.js
index b9c5ee05..8c4bb37a 100644
--- a/src/api/mine.js
+++ b/src/api/mine.js
@@ -109,7 +109,7 @@ export function updateAccountRecordInfo(data){
     return request({
         url:'/supplierAppV2/dispatchApp/accountRecord/updateAccountRecordInfo',
         method:'POST',
-        contentType:'application/json',
+        contentType:'multipart/form-data',
         data
     })
 }
@@ -161,4 +161,13 @@ export function notifyInvoiceDetail(data){
         contentType:'application/json',
         data
     })
+}
+// /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
+export function pageList(data){
+    return request({
+        url:'/supplier/supplierTrainingMaterials/pageList',
+        method:'POST',
+        contentType:'application/json',
+        data
+    })
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index ae82a755..338fb65d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -119,6 +119,14 @@ const routes = [
         meta: {
             title:'培训文档'
         }
+    },
+    {
+        path: '/docmentList',
+        name: 'docmentList',
+        component:()=>import('@/views/documentView/docmentList.vue'),
+        meta: {
+            title:'文档资料'
+        }
     }
   ]
 
diff --git a/src/views/documentView/docmentList.vue b/src/views/documentView/docmentList.vue
new file mode 100644
index 00000000..67aca40e
--- /dev/null
+++ b/src/views/documentView/docmentList.vue
@@ -0,0 +1,156 @@
+<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="tab_wrap">
+    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
+         @click="changeTab(index)">
+      {{ item.name }}
+    </div>
+  </div>
+  <div class="contentWrap">
+        <div class="itemWrap">
+            <div class="info flexBetween common">
+              <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 common">111</div>
+            <div class="doc flexBetween common">
+              <div class="left">培训材料</div>
+              <div class="right">
+                <span style="color: red;font-size: 14px;margin-right: 8px">未处理</span>
+                <span style="opacity: .9;color: #ccc">阅读8</span>
+              </div>
+            </div>
+        </div>
+  </div>
+</div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+export default {
+  name: "trainDocment",
+  mixins:[myMixins],
+  data(){
+    return{
+      tabArr: [{name: '中道制度', status: 1}, {name: '技术参数', status: 2},],
+      activeIndex: 0,
+      orderList: [],
+    }
+  },
+  methods:{
+   changeTab(index) {
+    this.activeIndex = index
+    // this.total = 0;
+    this.pageNum = 1
+    this.orderList = [];
+  },
+}
+}
+</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)
+  }
+}
+.tab_wrap {
+  @include fontWeightSize(bolder, 15px);
+  display: flex;
+  justify-content: space-around;
+  padding: 5px 0 5px 0;
+  color: #737373;
+  opacity: .7;
+  div {
+    padding-top: 8px;
+  }
+  .active {
+    color: #3678FF;
+    position: relative;
+  }
+
+  .active:after {
+    content: '';
+    display: block;
+    width: 50px;
+    height: 3px;
+    background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
+    border-radius: 2px;
+    position: absolute;
+    margin-top: 3px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+
+.contentWrap{
+  padding: 0 8px;
+  width: 100%;
+  box-sizing: border-box;
+  .itemWrap{
+    margin-top: 16px;
+    @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;
+    @include flexColumn;
+    justify-content: space-around;
+    padding: 6px 0;
+    @include fontWeightSize(400, 12px);
+    .flexBetween{
+      @include flexColBet;
+    }
+    .common{
+      margin: 0 15px ;
+    }
+    .imgWrap{
+      width: 100%;
+      height: 200px;
+      //background-color: #6C81CD;
+      img{
+        width: 100%;
+        height: 200px;
+      }
+    }
+    .left{
+      color: red;
+      font-size: 15px;
+      font-weight: 500;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/documentView/trainDocment.vue b/src/views/documentView/trainDocment.vue
index 2ebd2b64..6690e35f 100644
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@@ -19,19 +19,19 @@
   </div>
   <div class="contentWrap">
         <div class="itemWrap">
-            <div class="info">
+            <div class="info flexBetween common">
               <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="num common">111</div>
+            <div class="doc flexBetween common">
               <div class="left">培训材料</div>
               <div class="right">
-                <span>未处理</span>
-                <span>阅读 8</span>
+                <span style="color: red;font-size: 14px;margin-right: 8px">未处理</span>
+                <span style="opacity: .9;color: #ccc">阅读8</span>
               </div>
             </div>
         </div>
@@ -41,9 +41,31 @@
 
 <script>
 import {myMixins} from "@/utils/myMixins"
+import {pageList} from  "@/api/mine"
 export default {
   name: "trainDocment",
   mixins:[myMixins],
+  data(){
+    return{
+      pageNum:1,
+      pageSize:10
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods:{
+    async getList(){
+      let res= await pageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        userId:54585,
+        docType:2
+      })
+      console.log(res)
+
+    }
+  }
 }
 </script>
 
@@ -76,9 +98,30 @@ export default {
     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 flexColumn;
+    justify-content: space-around;
+    padding: 6px 0;
     @include fontWeightSize(400, 12px);
-    @include flexBetween;
+    .flexBetween{
+      @include flexColBet;
+    }
+    .common{
+      margin: 0 15px ;
+    }
+    .imgWrap{
+      width: 100%;
+      height: 200px;
+      //background-color: #6C81CD;
+      img{
+        width: 100%;
+        height: 200px;
+      }
+    }
+    .left{
+      color: red;
+      font-size: 15px;
+      font-weight: 500;
+    }
   }
 
 }
diff --git a/src/views/workOrder/accounting.vue b/src/views/workOrder/accounting.vue
index 70800247..c60960d2 100644
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@@ -226,7 +226,7 @@ import {myMixins} from '@/utils/myMixins'
 import {leftCopy} from '@/utils/common'
 import {
   getAccountRecordDetail, accountRecordCompute,
-  updateAccountRecordInfo, insertRecordPicture,
+  updateAccountRecordInfo,
   selectRecordPictureList,deleteImage
 } from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
@@ -336,6 +336,7 @@ export default {
         exceptionApprovalStatus:'',
         exceptionApprovalRemark:'',
         auditSuccessRemark:'',
+        accountStatus: ''
       },
     }
   },
@@ -465,12 +466,10 @@ export default {
       await this.pictureList()
       if(this.accountStatus == 1 || this.accountStatus == 0){//没有记录，等待审核
         leftCopy(this.form, {...res.data})
-        // console.log("form",this.form)
       }
       if(this.accountStatus == 2 || this.accountStatus == 3){//审核失败，再次审核
         leftCopy(this.form, {...res.data})
         this.auditFormShow = true;//是否显示审核数据
-        // this.confirmAuditState = true //确定审核状态
       }
       if(this.settleType == '实拖'  && this.basePriceDisabled){
         this.bcState = true
@@ -493,7 +492,6 @@ export default {
         this.bcState = true
         this.caState = true
       }
-      // console.log(this.orderInfo.refBridgeAmountAB,this.orderInfo.refBridgeAmountBC,this.orderInfo.refBridgeAmountCA,"1212")
       if(this.orderInfo.refBridgeAmountAB > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeAbState = true
       if(this.orderInfo.refBridgeAmountBC > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeBcState = true
       if(this.orderInfo.refBridgeAmountCA > 0 && !this.isCPICDrag && !this.isBasement) this.bridgeCaState = true
@@ -517,12 +515,7 @@ export default {
           return;
         }
       }
-      let data= await getAccountRecordDetail({
-        id:this.id,
-        postfix:this.postfix
-      })
-      this.accountStatus = data.data.accountStatus?.code
-      if(data.data.accountStatus?.code >= 4){
+      if(this.accountStatus >= 4){
         this.$alert('已进入后续流程，不允许操作');
         this.commitLoading = false;
         return;
@@ -532,6 +525,7 @@ export default {
       if(this.accountStatus == 1) accountStatus = 1
       if(this.accountStatus == 2) accountStatus = 3
       if(this.accountStatus == 3) accountStatus = 3
+      this.form.accountStatus = accountStatus;
       this.form.supplierSettleMileageAb = parseInt(this.form.supplierSettleMileageAb) || 0
       this.form.supplierSettleMileageBc = parseInt(this.form.supplierSettleMileageBc) || 0
       this.form.supplierSettleMileageCa = parseInt(this.form.supplierSettleMileageCa) || 0
@@ -546,27 +540,24 @@ export default {
       this.form.supplierWaitAmount = parseInt(this.form.supplierWaitAmount) || 0
       this.form.supplierBasementFee = parseInt(this.form.supplierBasementFee) || 0
       await this.compute();
-      let res = await updateAccountRecordInfo( {
-        ...this.form,
-        accountStatus: accountStatus,
-        postfix:this.postfix,
-        supplierBridgeAmount:parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0)
-      });
       const formData = new FormData();
+      let obj = this.form;
+      Object.keys(obj).forEach((key) => {
+        formData.append(key, obj[key]);
+      });
       this.files.forEach((file) => {
         formData.append('file', file.file);
       });
-      formData.append('taskOrderCostRecordId', this.id);
       formData.append('state', 0);
       formData.append('postfix', this.postfix);
-      await insertRecordPicture(formData);
+      formData.append('supplierBridgeAmount', parseInt(this.form.supplierBridgeAmountAb || 0) + parseInt(this.form.supplierBridgeAmountBc || 0) + parseInt(this.form.supplierBridgeAmountCa || 0));
+      let res = await updateAccountRecordInfo( formData);
       if(res.code === 200){
         this.$toast('操作成功')
         setTimeout(()=>{
           this.$router.back()
         },2000)
       }
-      this.$emit('success');
       this.commitLoading = false;
     },
     async delSupplierPhoto(item){