From cb4a49ccdf19f4be55b96adcdb906dc24ed3860a Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 22 Oct 2024 18:29:31 +0800
Subject: [PATCH] 111

---
 components/applyCard.vue                  |  26 ++-
 pages-order/choosePeople/choosePeople.vue |  14 +-
 pages-order/orderDetail/orderDetail.vue   |  24 ++-
 pages-repair/apply/applyForm.vue          |  13 +-
 pages-repair/applyList/applyList.vue      | 131 ++++++++++--
 pages-repair/applyList/todoDetail.vue     | 246 ++++++++++++++++++++++
 pages-repair/static/daishenhe.png         | Bin 0 -> 1507 bytes
 pages-repair/static/weitongguo.png        | Bin 0 -> 1384 bytes
 pages-repair/static/yitongguo.png         | Bin 0 -> 1400 bytes
 pages.json                                |  16 +-
 utils/utils.js                            |  38 ++--
 11 files changed, 436 insertions(+), 72 deletions(-)
 create mode 100644 pages-repair/applyList/todoDetail.vue
 create mode 100644 pages-repair/static/daishenhe.png
 create mode 100644 pages-repair/static/weitongguo.png
 create mode 100644 pages-repair/static/yitongguo.png

diff --git a/components/applyCard.vue b/components/applyCard.vue
index 74c4d91..c6f2404 100644
--- a/components/applyCard.vue
+++ b/components/applyCard.vue
@@ -1,21 +1,20 @@
 <template>
-  <view class="orderCard">
+  <view class="orderCard" @click="viewDetail">
 	<view class="title">
-	  {{ order.carNo }} 的配件申请
+	  {{ order.licenseNumber }} 的配件申请
 	</view>
 	<view class="desc">
-		申请时间：{{order.createTime}}
+		申请时间：{{formatTimestamp(order.createTime)}}
 	</view>
-
-
-	  <view class="message red">
-		  <view class="remark">  
+	  <view class="message red" v-if="order.status=='05'">
+		  <view class="remark">
 			原因：{{ order.remark }}
 		  </view>
 	  </view>
-	  <image class="stateImg"  src="@/static/images/nothing.png" ></image>
+	  <image v-if="order.status=='05'" class="stateImg"  src="@/pages-repair/static/weitongguo.png" ></image>
+	  <image v-if="order.status=='01'" class="stateImg"  src="@/pages-repair/static/daishenhe.png" ></image>
+	  <image v-if="order.status=='02'" class="stateImg"  src="@/pages-repair/static/yitongguo.png" ></image>
     </view>
-  </view>
 </template>
 
 <script>
@@ -23,6 +22,7 @@ import {
   getUserInfo,
   getStrData
 } from '@/utils/auth';
+import {formatTimestamp,getOrderStatusText,builderOrder,saveTicketsRecords} from "@/utils/utils";
 import request from '@/utils/request';
 export default {
   name: "orderCard",
@@ -57,6 +57,9 @@ export default {
 
   },
   methods: {
+    formatTimestamp(value){
+      return formatTimestamp(value)
+    },
     getFlagColor(flag) {
       if (flag == 1) {
         return '#E8A321'
@@ -64,6 +67,9 @@ export default {
         return '#999'
       }
     },
+    viewDetail(){
+      this.$emit("childEvent",this.order)
+    }
   }
 }
 </script>
@@ -103,7 +109,7 @@ export default {
 	  font-size: 30rpx;
 	  color: #333333;
 	  margin-left: 5px;
-	} 
+	}
 	.desc{
 		font-size: 28rpx;
 		color: #858BA0
diff --git a/pages-order/choosePeople/choosePeople.vue b/pages-order/choosePeople/choosePeople.vue
index 4b4940a..510b266 100644
--- a/pages-order/choosePeople/choosePeople.vue
+++ b/pages-order/choosePeople/choosePeople.vue
@@ -148,7 +148,12 @@ export default {
       }).then(res => {
         this.list = res.data.records
         this.list.map((item) => {
-          item.workTypeText = getDictTextByCodeAndValue('repair_work_type', item.workType)
+          getDictTextByCodeAndValue("repair_work_type",item.workType).then(value => {
+            item.workTypeText = value
+          }).catch(error => {
+            item.workTypeText = "未知"
+            console.error(error);
+          });
         })
       })
     },
@@ -163,7 +168,12 @@ export default {
       }).then((res) => {
         this.list = res.data
         this.list.map((item) => {
-          item.workTypeText = getDictTextByCodeAndValue('repair_work_type', item.workType)
+          getDictTextByCodeAndValue("repair_work_type",item.workType).then(value => {
+            item.workTypeText = value
+          }).catch(error => {
+            item.workTypeText = "未知"
+            console.error(error);
+          });
         })
         if (this.list.length > 0) {
           console.log(this.list[0].userId)
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 20ddbbc..8caa2d1 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -185,7 +185,7 @@
                 <view class="projBaseInfo">
                   <view>售价：{{ item.itemPrice || "" }}</view>
                   <view>数量：{{ item.itemCount || "" }}</view>
-                  <view>单位：{{ getItemUnit(item.itemUnit) || ""}}</view>
+                  <view>单位：{{ item.itemUnit || ""}}</view>
                   <view>折扣：{{ item.itemDiscount || "" }}</view>
                   <view>金额：{{ item.itemMoney || "" }}</view>
                 </view>
@@ -633,10 +633,26 @@ export default {
         //维修记录匹配数据字典
         if (null != resultObj.records){
           resultObj.records.map((item)=>{
-            item.typeStr = getDictTextByCodeAndValue('repair_records_type',item.type)
+            getDictTextByCodeAndValue("repair_records_type",item.type).then(value => {
+              item.typeStr = value
+            }).catch(error => {
+              item.typeStr = "未知"
+              console.error(error);
+            });
             item.createTime = formatTimestamp(item.createTime)
           })
         }
+        //配件翻译字典
+        if (null != resultObj.wares){
+          resultObj.wares.map((item)=>{
+            getDictTextByCodeAndValue("repair_unit",item.itemUnit).then(value => {
+              item.itemUnit = value
+            }).catch(error => {
+              item.itemUnit = "未知"
+              console.error(error);
+            });
+          })
+        }
         this.ticketInfo = resultObj
         //判断当前角色及工单状态显示操作按钮
         this.checkRoleOperate()
@@ -697,10 +713,6 @@ export default {
         // url: `/pages-order/choosePeople/choosePeople?type=${type}&id=${this.ticketId}`
       })
     },
-    //翻译配件单位
-    getItemUnit(unitCode){
-      return getDictTextByCodeAndValue("repair_unit",unitCode);
-    },
     /**
      * 点击配件申请单提醒，查看相关配件
      * @param wareId
diff --git a/pages-repair/apply/applyForm.vue b/pages-repair/apply/applyForm.vue
index 1e78684..50cbd48 100644
--- a/pages-repair/apply/applyForm.vue
+++ b/pages-repair/apply/applyForm.vue
@@ -20,7 +20,7 @@
             <view class="repairName">{{ item.name }}</view>
             <view class="repairBottom">
               <text class="repairDesc">单位：
-                <text class="repairUnit">{{ getItemUnit(item.unit) }}</text>
+                <text class="repairUnit">{{ item.unit }}</text>
               </text>
               <view class="repairBtns">
                 <u-icon name="minus-circle-fill" size="24" @click="delNum(item)"></u-icon>
@@ -175,6 +175,13 @@ export default {
             }else{
               m.num = 0
             }
+            //翻译单位
+            getDictTextByCodeAndValue("repair_unit",m.unit).then(value => {
+              m.unit = value
+            }).catch(error => {
+              m.unit = "未知"
+              console.error(error);
+            });
             return m
           })
           //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
@@ -269,10 +276,6 @@ export default {
       this.activeId = value
       this.onRefresherrefresh()
     },
-    //翻译配件单位
-    getItemUnit(unitCode){
-      return getDictTextByCodeAndValue("repair_unit",unitCode);
-    },
   }
 }
 </script>
diff --git a/pages-repair/applyList/applyList.vue b/pages-repair/applyList/applyList.vue
index ca4059f..4fb155b 100644
--- a/pages-repair/applyList/applyList.vue
+++ b/pages-repair/applyList/applyList.vue
@@ -12,7 +12,7 @@
 		  <view class="orderList">
 		    <scroll-view scroll-y="true" style="height: 100%" class="itemContent" @scrolltolower="onReachBottomCus"
 		                 refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
-		      <order-card v-for="(item, index) in orderList" :key="index" :order="item" @childEvent="onRefresherrefresh" @startWork="startWork"></order-card>
+		      <order-card v-for="(item, index) in orderList"  :key="index" :order="item" @childEvent="viewDetail" ></order-card>
 		      <view style="text-align: center" v-if="orderList.length==0">
 		        <image class=""  src="@/static/images/nothing.png" ></image>
 		      </view>
@@ -27,6 +27,7 @@
 	import tabBarVue from '@/components/tabBar/tabBar.vue'
 	import OrderCard from "@/components/applyCard.vue";
 	import request from '@/utils/request';
+	import {getUserInfo} from '@/utils/auth';
 	export default {
 		components: {
 		  OrderCard,
@@ -52,39 +53,60 @@
 				  },
 				  {
 				    id: 2,
-				    title: '已通过'
+				    title: '待领料'
+				  },
+				  {
+				    id: 3,
+				    title: '待退料'
 				  },
 				],
 				orderList: [
-					{
-						carNo: "川E795C0",
-						createTime: '2024-10-20 12:00',
-						ticketsStatus: '05',
-						remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
-					},
-					{
-						carNo: "川E795C1",
-						createTime: '2024-10-20 12:00',
-						ticketsStatus: '02',
-						remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
-					},
-					{
-						carNo: "川E795C2",
-						createTime: '2024-10-20 12:00',
-						ticketsStatus: '01',
-						remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
-					}
+					// {
+					// 	carNo: "川E795C0",
+					// 	createTime: '2024-10-20 12:00',
+					// 	ticketsStatus: '05',
+					// 	remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
+					// },
+					// {
+					// 	carNo: "川E795C1",
+					// 	createTime: '2024-10-20 12:00',
+					// 	ticketsStatus: '02',
+					// 	remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
+					// },
+					// {
+					// 	carNo: "川E795C2",
+					// 	createTime: '2024-10-20 12:00',
+					// 	ticketsStatus: '01',
+					// 	remark: '大厦预订奴化时间内丢进爱上牛津阿斯顿你'
+					// }
 				],
+        userInfo:null,
 			};
 		},
     onLoad(){
-		  
+      this.userInfo = getUserInfo()
+      console.log(this.userInfo)
+      this.getOrderList()
     },
 		methods:{
 			changeTabFun(id) {
 			  this.activeKey = id
 			  this.onRefresherrefresh()
 			},
+      /**
+       * 上滑加载数据
+       */
+      onReachBottomCus() {
+        //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+        if (this.pageNo * this.pageSize >= this.total) {
+          uni.$u.toast('没有更多数据了')
+          return
+        }
+        //页码+1,调用获取数据的方法获取第二页数据
+        this.pageNo++
+        //此处调用自己获取数据列表的方法
+        this.getOrderList()
+      },
 			/**
 			 * 下拉刷新数据
 			 */
@@ -92,11 +114,74 @@
 			  this.isTriggered = true
 			  this.pageNo = 1
 			  this.total = 0
-			  //this.orderList = []
+			  this.orderList = []
 			  this.getOrderList()
 			},
+      /**
+       * 查看申请单详情
+       */
+      viewDetail(item){
+			  if(0==this.activeKey || 1==this.activeKey){
+			    //配件申请单详情
+          uni.navigateTo({
+            url: '/pages-repair/applyList/todoDetail?viewType=apply&id='+item.id
+          })
+        }else{
+			    //领料单\退料单详情
+          uni.navigateTo({
+            url: '/pages-repair/applyList/todoDetail?viewType=receive&id='+item.id
+          })
+        }
+      },
+      /**
+       * 查数据
+       */
 			getOrderList(){
-
+        let url=""
+        let params = {
+          pageNo:this.pageNo,
+          pageSize:this.pageSize
+        }
+        if(0==this.activeKey){
+          //已提交的配件申请单
+          url = "/admin-api/repair/tw/page"
+          params.type="01"
+        }else if(1==this.activeKey){
+          //未通过的配件申请单
+          url = "/admin-api/repair/tw/page"
+          params.type="01"
+          params.status="05"
+        }else if(2==this.activeKey){
+          //待确认的领料单
+          url = "/admin-api/repair/so/page"
+          params.soType = "02"
+          params.userId = this.userInfo.id
+          params.soStatus = "04"
+        }else if(3==this.activeKey){
+          //待确认的退料单
+          url = "/admin-api/repair/so/page"
+          params.soType = "04"
+          params.userId = this.userInfo.id
+          params.soStatus = "07"
+        }
+        request({
+          url: url,
+          method: 'get',
+          params:params
+        }).then((res) => {
+          if (res.code == 200) {
+            if(res.data.records.length > 0){
+              if (this.pageNo != 1) {
+                this.orderList = this.orderList.concat(res.data.records)
+              } else {
+                this.orderList = res.data.records
+              }
+            }
+            //将获取的总条数赋值
+            this.total = res.data.total
+            this.isTriggered = false
+          }
+        })
 			}
 		}
 	}
diff --git a/pages-repair/applyList/todoDetail.vue b/pages-repair/applyList/todoDetail.vue
new file mode 100644
index 0000000..93c395c
--- /dev/null
+++ b/pages-repair/applyList/todoDetail.vue
@@ -0,0 +1,246 @@
+<template>
+  <view class="container">
+    <VNavigationBar background-color="#fff" title="申请单详情" title-color="#333"></VNavigationBar>
+    <view class="body">
+      <view class="repairInfo">
+        <view class="header">
+          部件信息
+        </view>
+        <view class="repairItem" v-for="(item, index) in repairList" :key="index">
+          <view class="repairName">{{ item.waresName }} <text class="repairNum">×{{item.waresCount}}</text></view>
+          <view class="grid">
+            <view style="grid-area: a" class="girdItem">
+              <text class="label">配件分类</text>
+              <text class="value">{{ item.typeName }}</text>
+            </view>
+            <view style="grid-area: b" class="girdItem">
+              <text class="label">当前库存</text>
+              <text class="value">{{ item.wares.stock }}</text>
+            </view>
+            <view style="grid-area: c" class="girdItem">
+              <text class="label">单位</text>
+              <text class="value">{{ item.wares.unit }}</text>
+            </view>
+            <view style="grid-area: d" class="girdItem">
+              <text class="label">编码</text>
+              <text class="value">{{ item.wares.code || ""}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import VNavigationBar from "@/components/VNavigationBar.vue";
+import request from '@/utils/request';
+import {getDictTextByCodeAndValue} from "@/utils/utils";
+export default {
+  components: {
+    VNavigationBar
+  },
+  data() {
+    return {
+      viewType:"",
+      id:"",
+      repairList: [
+        // {
+        //   name: '7字小钩',
+        //   num: 3,
+        //   type: '机电',
+        //   unit: '桶',
+        //   total: 35,
+        //   code: 'XCQHCJYS7 SPI SP 5W30 4L'
+        // },
+        // {
+        //   name: '7字小钩',
+        //   num: 3,
+        //   type: '机电',
+        //   unit: '桶',
+        //   total: 35,
+        //   code: 'XCQHCJYS7 SPI SP 5W30 4L'
+        // }
+      ]
+    };
+  },
+  onLoad(data){
+    this.viewType = data.viewType
+    this.id = data.id
+    this.getDetail()
+  },
+  methods:{
+    getDetail(){
+      let url;
+      let params={};
+      if("apply"==this.viewType){
+        //配件申请单
+        url = "/admin-api/repair/twi/list"
+        params.twId = this.id
+      }else{
+        //领料单、退料单
+
+      }
+      request({
+        url: url,
+        method: 'get',
+        params:params
+      }).then((res) => {
+        if (res.code == 200 && res.data.length>0) {
+          this.repairList = res.data
+          this.repairList.map((item)=>{
+            getDictTextByCodeAndValue("repair_unit",item.wares.unit).then(value => {
+              item.wares.unit = value
+            }).catch(error => {
+              item.wares.unit = "未知"
+              console.error(error);
+            });
+          })
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.container {
+  height: 100%;
+  background: #F3F5F7;
+  display: flex;
+  flex-direction: column;
+}
+
+.body {
+  flex: 1;
+  height: 0;
+  overflow: auto;
+
+  .todoInfo {
+    margin: 20rpx 32rpx;
+    background-color: #fff;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    padding: 30rpx;
+
+    .todoName {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: #333333;
+      margin-bottom: 16rpx;
+    }
+
+    .todoDate {
+      font-size: 24rpx;
+      color: #858BA0;
+      margin-bottom: 30rpx;
+    }
+
+    .line {
+      height: 1rpx;
+      background-color: #DDDDDD;
+      margin: 30rpx 0;
+    }
+
+    .grid {
+      display: grid;
+      grid-template-areas:
+      'a b'
+      'c c';
+      gap: 20rpx;
+
+      .gridItem {
+        display: flex;
+        flex-direction: column;
+        row-gap: 10rpx;
+        font-size: 28rpx;
+
+        .gridItemLabel {
+          color: #858BA0;
+        }
+
+        .gridItemValue {
+          color: #333333;
+        }
+      }
+    }
+  }
+
+  .repairInfo {
+    margin: 20rpx 32rpx;
+    background-color: #fff;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+
+    .header {
+      padding: 30rpx;
+      border-bottom: 1rpx solid #DDDDDD;
+    }
+    .repairItem {
+      padding: 30rpx;
+      border-bottom: 1rpx solid #DDDDDD;
+      &:last-child {
+        border-bottom: none;
+      }
+    }
+    .repairName {
+      display: flex;
+      align-items: center;
+      column-gap: 20rpx;
+      font-size: 32rpx;
+      color: #333333;
+      margin-bottom: 30rpx;
+      .repairNum {
+        font-size: 28rpx;
+        color: #0174F6;
+      }
+    }
+    .grid {
+      display: grid;
+      grid-template-areas:
+        'a b'
+        'c d';
+      grid-template-columns: 1fr 1fr;
+      gap: 30rpx;
+      .girdItem {
+        display: flex;
+        flex-direction: column;
+        row-gap: 12rpx;
+        font-size: 28rpx;
+        .label {
+          color: #858BA0;
+        }
+        .value {
+          color: #333333;
+        }
+      }
+    }
+  }
+}
+
+.footer {
+  background-color: #fff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 30rpx 32rpx;
+
+  .yes, .no {
+    width: 310rpx;
+    height: 76rpx;
+    border-radius: 38rpx 38rpx 38rpx 38rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    column-gap: 10rpx;
+  }
+
+  .yes {
+    background: #0174F6;
+    color: #FFFFFF;
+  }
+
+  .no {
+    border: 2rpx solid #858BA0;
+    color: #858BA0;
+  }
+}
+</style>
diff --git a/pages-repair/static/daishenhe.png b/pages-repair/static/daishenhe.png
new file mode 100644
index 0000000000000000000000000000000000000000..086c3a74715655a3d74d227cdd24d362cd509827
GIT binary patch
literal 1507
zcmV<91swW`P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px)ok>JNRA@up*jsEARTu~G|Ln}(w|l9yY|&nTS`sCKq%FmU#0Uh%L>~yj`0kSl
z(ZmFUVnHGTF+w5_B<iC;<i!^;NF*RZt+ce25?!j$mKJ*1vbWjm+{`&-*QIQ`XSTa#
z*Ymp5?)mNin{U1|oEEy#1x?$Ba#$R<k8?e{zmTnP<d6Oj7z!x`Mhf_#B<=&M3^{t2
zeutxFC)<x*Kr$Ifu`%)SOHjlyfaAg2mcmrM8oaHB4MMKciFpW8OpK;!P~wx2{MTWr
z-wbJH5Q4J_22)i@FpoeMg3(k7!S4OEq?FhsOf_ri<{iyDkP7%9`o4jueJ_$zJ+Rbu
zg5yp3QH;stge(N3N>K#6_rcoqDy&bvh}iHCknZ1r^Z9p?@(&{1e+)uZJ=|>{vOyTj
zY)(iam~4dE+m6KeW!M_GLiC-461@xFR)?g&pWFa6nPQgNybwK@*-2=cf^gqa@b+bJ
zta_7TV#8-qv+1i$nN@E%0FF23FR%0!^ORX$2rDLX<7)`6m9(75ir)GTf};V6u?r7j
zNHV0%l-M)`yO$l22g3wm!H_P+asT~0(RT`hb2-f3Hku46C(h)A!Dxq)@WZuc7t*O2
ztDk|bX&XB#M>5P17EJa|5)<7J?91qlot(UiV9%$pHogMq>bD?ACukb6k#kVv(@<g)
zSSUspgcT!&Zb1(H18c(;B&T{28T=CN^<9V$pM||;Ck#dhHOrAP@U~jOz|+(Sh7+tX
zdplqdtoaklN=7$?1*0h`ngDNk0;!oncslmer+fC2!ovt%{RF)INx0kgWH71we`3i?
zC%_qu`5{@YxgZEDCN}ybEZz?A)+LW10>AEsyX^zW;vFRKUZF{m6s5plg_Ri_JNH$E
zOwBZjo<lI#bwZAez}>nV;?2{D4V{6f^DvB_mQ0!HX#fQ$lBVgwsL3#9F26&^7LrE%
z&IKgKFF}n>!MtoEO(eU_^fZ74Ls-fzJ5MDUM11r-l*kBd%U?sV=OB1TJv{3_LVWBZ
zEi+f^ZiKFV2BT{weVDSWqCoUw$o1jtClDVwhw9G5kRl^UPISZ3@&<yvhu~@Nf|8hl
zxn^y~ph_`tym8JZP&9}hj1>GEq241f)vkjkiS$V?`c5N0{5?D!AH(QwrT{5?8*=Ct
zZO4J%x@bD)+I2YtDk_8(6YMz*d-Ha>VR7gT?No|54%fQ(G6?#=lq3SbAAlP7!`8eV
zwuUWpR$0*@teEtU)Rc&spLfCCy60hpDkCv=5#r60-~=0ND_)1-sHc+x8FOZ@l0fuh
zBAJmsIo*fky<b3@LTaiPrX_3OZhapq{~rKnKy>H~+~jaJ-3N<z12_XuO(lcq#iV~>
z(z(d686Nlo=DH53u}L_edz*etCWh$Hw{+|wt9s+-nL)LrkU}uzTtjYbYvWcrlPS@A
zbkp(CbKtGD;Hw(wd`1p!Wb{dwS;--KFxd!e{U%yYq_m()2=yO>d1*U6?~o%yYWiBH
z%m`*tAgq|sz;PHot7v!9<OD)}M<I)&5UQGBFuRc$`w4<`#e<{r3kQ+%5746mNodg^
zEEr8y=v^E2or1MtGkBX9<jssMjzddD0E3ZE(Y(d8cwK9*hM#XXBbfM|^Yn;JQXvWO
zmTL0C4oV^bIeZ(|#+T_!jqJ6kiKM?cA13pRkz#a0j@~>C)6!Ntdy)452GfIs*<**W
zlv(yB!vn`*ZQ2H-i`*Z%*JDXUZ!*E&Bd|Zc14ifa@`SJ^L(VOv_2w$6wCu4aqBog2
z<0$orGT#@^{*1K&l;u5AOiWpnRyL^6WXcZ0+5pPtIg;=G(VI+JCQ?W@D{F|JGAnxs
zE2bhKESQRc<ik`HWIjyALFU3#BqSH6Vj;6J6%EP8R6Hb&`4^B!I;<TKnV0|o002ov
JPDHLkV1nm9$#(z%

literal 0
HcmV?d00001

diff --git a/pages-repair/static/weitongguo.png b/pages-repair/static/weitongguo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0d62b92469a5d8e2e5d3b100f7404db8a1415f1
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px)B1uF+RA@up*lkSJRUE+a?>RRsb<R|vRZB?Ma*f2TGLg1aMmb0=OVb`UD{{5c
zdSSf_v3k>7MJ@4x^i`Uf0;Q$lmXYR*nwn2r4>B-e0@|b@%F{ikopa@KFLAHuPxr#T
zosF@vKim17-^2O+|3WvMS&62YL|B4iam%f%2C@}l{^|dKv5<ISbXyzLoI*^_@^;7r
zh)fU?4~&7Rk3K}?<|3!w7gtOeBvu%;u?&&-5MumzLNOvW4SoC=a_&4gl!wUt3la;A
zZm36X*noV#uoqMEK3u$reCcKTH|OPu=@$}f41PZ*N(>)?$jggMnni?o!RU?-^p};8
zk%1UH7NmsMi>RM}f<JzTVZ)G1Uxabv;#M<JA+8wR*@-@U2+p5}%a`rONlgWx54~$A
zbaWt>y&6_CGCv=YHN`o@?1NF#?5Yq~Oy3>p+FF}VBEJBB`xRYxI;>_;3NdOFXpKJC
zj7YoD4HW_71o4XLL6~&Xr|V$!XoN|tkOmOkwbuCGc^luGMQ)G?k#UB&Vsw2yYF(+V
z3DccaWd-7{$%u&)G2Kk>twJt&E^O2Ow~Fx<6=Rx$Nk^yECo-NOE*MiU{B<62)6I52
zYWp@s=48aANxebn=s<1y1i9o{#PAWQ@*T+ekKtdp7MWk*-kw7+o*^!n&=XZVzk-xh
zWOjDgL94@u(0ljdTk$&DL_!E?Z%1udk6f_OGiE>#FBo-TKQuNXA79WLk?w9(*?PpC
znTYIcROuSHb{KMYKI)evP+RLA<CKpP9&(wQwdqdgw9Sv1wEH5~e2mDr4JJ%L@2`fg
zF66>RsI8xQ!VEYfJvJwdxiGhEMz^%sdq(8kABcoOWM-m|A4e2CjIP)L&CQ6r??M0F
zVo|>3uLTbw+M)kvh*O&R{ph+nNJ|UUz_R5wolHwM^&#iXMHLs>L6h`!^uYtj!lejv
zu{y4pK%6jFHsm*ed#6HICvtiYriQd>(Iz5Cjs$*}Z%59VXQO31Uv)JiJspve5s?)$
zh$}{)IDtC&Bfi2H0`;=C6p@;O?(7OgX4Oi>6N`~KIl)b<uXovzC)ztrOd+lqyRnuQ
z#I$MXbLZ?Eq?y&s;3*!NZxQ;;pOBIgxMyq&PeEo+ADoDIX#lFS5-znN@*YHO{uKP(
zh-uS<kua09{(c|wm1W?&2F{)hz($Vj7ZdY{c*0baLt7hS#!UOt6?Xe~b)i<ji<p^f
zFH?2wD0=s93+oRPH;8kZ8BBM#y)%M`U=Zs{5x3ugoIM-e+yv5xZfHR731Bd<4hQzz
zx-u)S5Lb+DZ^w-FG&S0>-qcVJ!gj6Q-@pxH0+Bg-)MB`F2~kiGYyfeGxMI||d(cfy
z(AtU^GY0wOQ^5%NH*G{dFe5NQU$}sJZ*}0UbHy9MG#eC%E5<%oa|(U(WZ0J$weLGS
z4VZdTB_G&GaNYIxo0*xK2PL&aTa42<W50!!*wePFv(uisjl>m1fA`6tMZ{A#`=J_L
zQ-ho}3-!e|<f6r>va+z6=-Yz_9paj1<`Ohf5LsF1&$l8TosTr5O@uWh5NAw9Il8qK
z-_y?oJ~2gELk5X8W=J8<n5rtolqra`w8Tp-uiY$aUJb_0ezgsF>1GLABYijKa?d1O
z*NU{EfntWd*!u$w1e1^u*KQVi2nh@Eib-gQ7fixKTro)jals@F<Z76tf<(h49V8Ma
qDIxt~k`~ezlhlw<OwvPoF#iDQa_$Gq<;_|E0000<MNUMnLSTZEu8NTW

literal 0
HcmV?d00001

diff --git a/pages-repair/static/yitongguo.png b/pages-repair/static/yitongguo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bbaec3448f221c68e41f6ebe2627a963c4bd11c
GIT binary patch
literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px)GD$>1RA@uh*nd#dWgG|a_rTErVPhL3eg>%}ogv^65|?77shC-vV*V)qptCyS
zFYo%R!mj_i?utt@^~$>dCGYYFXQY?}p^^%efq8bEC~gR2Y-5AL#`ewUx!d<(jPZQO
zHn#5_f3bb{yq@>x^E}V@E9&L?J_S(m=r0(qid0eJes2aMB46?+=CZL3c`?r-A}oS+
zd|qKF#Ge=fxjuXoA0+SeD~5;o8sp$N{5jl#{Mc+<9q#ZuW(vet7=ozkKSh(?m9Pb2
zqA>V7nQ4%@Vw{LJQzza_+JVgI#e8r06XO=*EoO2O8{|besHsAUsu)Y77Wo}BBSa|1
zT{-D&dVHh)aT?~#;6*&NYOy!zE!LHce9q%)<`E(U(`xKMySa;&6X^-(<%+pKroqv^
zT9hVkLz*O62*e|1RtPJm+j0*-4g7-gly?vv9yMivPRuH49vTg;QxF`-L2Da=Dnh}E
za+?ejgcb9*`Ct4x)Qqy^-EJ}8X^vx8!fR8KAdt`R9l*!wWvmdl$uL8FfgytyiKhSL
zXFZkpB)uGV&W><VI4fvMGJ+s;!Hn2P`IN>TR(#)g5_=wh6OrK({H#5XH{xHxA$2u2
zDvE^k4v!HG5sG;~X(w)vcH@%%Dn3fv%O}!q>O_P7GWMmG(j-I>Va#F0Va;)DRc#QA
z@e0C<xoN(Qn*Os`5|xhas!e<%6Wj!jXln6H^kNjm=HQ^Z8WAEf)+<)yFY_(jwe$+c
zcnx92xE8!C;()pe8IlxaM5f{o!*$rW32b|`iJs`M6NH%)gcU=2f+S;@7>30$jzVcJ
zO@bhnML&gqM(&_kQG`?43mCBJup(v|j5ZT&oDJnEd)zJ%t`jt82n&YvK+l*ODzO5G
z`%d7)<lVHK6k-|ek5`p1q2lh>SSNo0X_6#dF}9&Ju>|5UG3yEjpFmhJ&Ji6{S0OJZ
zi<Z#y(p<C{Zs7D_1Bw-E&|$tslOd}Z!I8Ac)nvGaCnQNom!!-H^BIH{(`mkgE5q${
zcPIVwt-1#B5pq}^Ryz3oJ(Va?Z9<`R1wZI>x<<r{<#;Z3d0-%{7&0)@FDqlSp|$Ff
zweV@Qo4RmDcM)5ZYbm04OarA@PWPF*!AnqzWhjv51`fiCIjwELsKbJ_afPVvKTCUM
zr8I|6f;=AoZfHeW^4oN`@3Rg-DUO?V^l{33T3VB*i{*s|S*1qo78J?yVRnpSY1EVa
zEo=@OzUV!IHL?N}NOM5;r23&Ix92$WCBH#flOY(=D_d0?ryve#YOo|K1MB6hFkscu
zM+5cvL;g@|b=c5iyg~cQ?+{kZm}49c&VhdGAUJR!J>*1?d(`WiAX^YilX0G~N9`86
z(m59Zzb4|GVwN&HKh#ViCi@8D7D%xpVKbi)Ibg1q<zrD~8uT_JzU)0p_ZV_cb3Xe7
z1j3pO`5bvb>l*nFo0Tu~kVbtgJq?h4`s%?CG>ON;BG7HQPfyJODJ`K302yrMgJam2
z`Yr$tR?bFeoh0EzxZ6(xmWYrtYc^b?v;AUR0ZtCoV|zj|JuOe}3D*rJ;1Jd_s~h|c
z`UxYJM`xl|dk(KF*C8)9E3g~ljK4PNA1n(1S(;6DGyk^I(|zY95g}#9ikVjkYnfdb
zYC-nGOpmXO<{iR{nXO!d0^$oy&_L#j2`b23FhK|L788^ZZ!kd%5sC?Fh!9NBLs&5(
z0b#*}3}iM;NI^VdLJl$$CL|&5Fd++Z#e_6uGA869PR#!SP3LinFev^20000<MNUMn
GLSTY8qkX3U

literal 0
HcmV?d00001

diff --git a/pages.json b/pages.json
index 3b6038f..ecd4f7a 100644
--- a/pages.json
+++ b/pages.json
@@ -152,6 +152,13 @@
 			{
 				"navigationBarTitleText" : ""
 			}
+		},
+		{
+			"path" : "applyList/todoDetail",
+			"style" :
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	  ]
 	},
@@ -161,22 +168,19 @@
         {
           "path": "home/home",
           "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": true
+            "navigationBarTitleText": ""
           }
         },
         {
           "path": "inOutWarehouse/inOutWarehouse",
           "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
+            "navigationBarTitleText": ""
           }
         },
         {
           "path": "todoDetail/todoDetail",
           "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": true
+            "navigationBarTitleText": ""
           }
         }
       ]
diff --git a/utils/utils.js b/utils/utils.js
index d846d64..5c86839 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -126,31 +126,29 @@ export function saveTicketsRecords(id,ticketsWorkStatus,itemId,itemStatus,record
  * 翻译字典
  * @param dictCode
  */
-export function getDictTextByCodeAndValue(dictCode,value){
+export async function getDictTextByCodeAndValue(dictCode, value) {
 	let dictArray = getStorageWithExpiry(dictCode);
-	if(null==dictArray  || undefined==dictArray){
-		request({
+	if (null == dictArray || undefined == dictArray) {
+		let res = await request({
 			url: '/admin-api/system/dict-data/type',
 			method: 'get',
-			params:{type:dictCode}
-		}).then((res) => {
-			console.log(res)
-			if (res.code == 200) {
-				setStorageWithExpiry(dictCode,res.data,3600)
-				dictArray = res.data
-				let dictObj = dictArray.find(item=>item.value==value)
-				if(dictObj){
-					return dictObj.label
-				}else{
-					return "未知数据"
-				}
-			}
+			params: {type: dictCode}
 		})
-	}else{
-		let dictObj = dictArray.find(item=>item.value==value)
-		if(dictObj){
+		if (res.code == 200) {
+			setStorageWithExpiry(dictCode, res.data, 3600)
+			dictArray = res.data
+			let dictObj = dictArray.find(item => item.value == value)
+			if (dictObj) {
+				return dictObj.label
+			} else {
+				return "未知数据"
+			}
+		}
+	} else {
+		let dictObj = dictArray.find(item => item.value == value)
+		if (dictObj) {
 			return dictObj.label
-		}else{
+		} else {
 			return "未知数据"
 		}
 	}