From c886330bd7576e065633f96048b4c0e10a150d0d Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 14 Nov 2024 19:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                  |  32 +-
 api/api.js                               |   9 +-
 common/betone_components/betone-list.vue |  73 +++-
 common/betone_components/betone-pop.vue  | 107 +++++
 pages.json                               |  14 +
 pages/register/index.vue                 |   2 +-
 pages/submission/materialSelect.vue      |  78 ++++
 pages/submission/recordsdetails.vue      | 520 ++++++++++++++---------
 store/index.js                           |   1 +
 9 files changed, 596 insertions(+), 240 deletions(-)
 create mode 100644 common/betone_components/betone-pop.vue
 create mode 100644 pages/submission/materialSelect.vue

diff --git a/App.vue b/App.vue
index c02357a..a26b517 100644
--- a/App.vue
+++ b/App.vue
@@ -1,18 +1,8 @@
 <script>
 export default {
-  onLaunch: function () {
+  onReady() {
+
     
-    const value = uni.getStorageSync("token");
-    if (!value) {
-		
-      uni.navigateTo({
-        url: "/pages/login/login",
-      });
-    }
-    console.log("App Launch",value);
-    const userInfo = uni.getStorageSync("userinfo");
-    // 处理用户数据
-    this.$store.dispatch("changeTabbar", userInfo.role_id);
     // this.$common.getStorage("user").then((res) => {
     // 	if (res == null || res == "") {
     // 		uni.redirectTo({
@@ -32,6 +22,22 @@ export default {
   },
   onShow: function () {
     console.log("App Show");
+    const value = uni.getStorageSync("token");
+    console.log("App Launch", !value);
+    if (!value) {
+      uni.redirectTo({
+        url: "/pages/login/login",
+      });
+      return false
+    }
+
+    const userInfo = uni.getStorageSync("userinfo");
+    if (userInfo) {
+      // 处理用户数据
+      this.$store.dispatch("changeTabbar", userInfo.role_id);
+
+    }
+
   },
   onHide: function () {
     console.log("App Hide");
@@ -42,9 +48,9 @@ export default {
 <style lang="scss">
 @import "@/uni_modules/uview-ui/index.scss";
 @import "@/static/scss/index.scss";
+
 /*每个页面公共css */
 page {
   background: #fff;
 }
 </style>
-
diff --git a/api/api.js b/api/api.js
index a7c150b..bb63a76 100644
--- a/api/api.js
+++ b/api/api.js
@@ -59,8 +59,15 @@ const install = (Vue, vm) => {
         authorization: false,
         isparams: false
     })
+
+    // 获取维修人员 /
+    let getRepairPersons = (params) => http.get('/blade-system/user/repairPersons', {...params }, {
+        authorization: false,
+        isparams: false
+    })
+    
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-    vm.$u.api = { getTenantInfo, login, logout, register, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList,workOrderSave,getWorkOrderRecords,getBreakdownInfo,workOrderupdate,evaluateSign };
+    vm.$u.api = { getTenantInfo, login, logout, register, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList,workOrderSave,getWorkOrderRecords,getBreakdownInfo,workOrderupdate,evaluateSign,getRepairPersons };
 }
 
 export default {
diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue
index a77eda0..0961249 100644
--- a/common/betone_components/betone-list.vue
+++ b/common/betone_components/betone-list.vue
@@ -4,7 +4,7 @@
         <scroll-view class="wxaSortPickerList" scroll-y="true"> </scroll-view>
         <view class="page-search-top">
             <betone-new-input v-model="searchInfo.requirementCode"
-                :placeholder="dataType == 1 ? '搜索维修单单号' : '搜索维修单单号或单位名称'" icon="search" style="margin-bottom: 32rpx"
+                :placeholder="dataTypes == 1 ? '搜索维修单单号' : '搜索维修单单号或单位名称'" icon="search" style="margin-bottom: 32rpx"
                 @changevalue="searchData()" />
             <u-tabs :list="tabList" :is-scroll="false" :current="current" @change="changeTab"
                 bg-color="rgba(248, 248, 248, 1)"></u-tabs>
@@ -12,7 +12,7 @@
         <view class="order-box">
             <view class="order-item" v-for="(item, index) in orderData" :key="index" @click="goPage(item, 'details')">
                 <view class="item-top">
-                    <view class="item-left" v-if="dataType == 1">
+                    <view class="item-left" v-if="dataTypes == 1">
                         <text class="item-orderNo">单号：{{ item.requirementCode }}</text>
                         <text class="item-time"> {{ item.fillingTime }}</text>
                     </view>
@@ -38,6 +38,20 @@
                             <!-- 所有状态都有 -->
                             <u-button size="mini" plain style="margin-right: 32rpx"
                                 @click.stop="goPage(item, 'breakdownView')">查看</u-button>
+
+                            <!-- 接单 -->
+                            <block v-if="item.status == 0">
+                                <u-button size="mini" :plain="true" style="margin-right: 32rpx"
+                                    @click.stop="sendOrders()" type="primary">派单</u-button>
+                            </block>
+                            <block v-if="item.status == 0 && dataTypes == 4">
+                                <u-button size="mini" :plain="true" style="margin-right: 32rpx"
+                                    type="primary">接单确认</u-button>
+                            </block>
+                            <block v-if="item.status == 2&&dataTypes==4">
+                                <u-button size="mini" :plain="true" style="margin-right: 32rpx"
+                                    type="primary" @click="goPage(item, 'details')">维修</u-button>
+                            </block>
                             <!-- 待提报 --提报 修改-->
                             <block v-if="item.status == -1">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx" :hair-line="true"
@@ -46,12 +60,12 @@
                                     type="primary" @click="goPage(item, 'breakdownUpdate')">修改</u-button>
                             </block>
                             <!-- 待维修 -- 查看位置-->
-                            <block v-if="(item.status == 1 || item.status == 2 || item.status == 3)">
+                            <block v-if="dataTypes==1&&(item.status == 1 || item.status == 2 || item.status == 3)">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx" :hair-line="true"
                                     type="primary">查看位置</u-button>
                             </block>
 
-                            <block v-if="item.status == 5">
+                            <block v-if="item.status == 5&& dataTypes == 1">
                                 <u-button size="mini" :plain="true" style="margin-right: 32rpx" :hair-line="true"
                                     type="primary" @click="goPage(item, 'evaluate')">评价</u-button>
 
@@ -64,6 +78,12 @@
         <u-loadmore margin-top="10" margin-bottom="40" :status="loadingState" />
 
         <betone-loading ref="BetLoading" />
+
+
+        <!-- 派单弹框  -- 接单按钮 -->
+
+        <u-select v-model="sendOrdersShow" :list="sendOrdersList" @confirm="sendOrdersConfirm"
+            :isShowsearch="true"  value-name="id" title="选择维修人员"></u-select>
     </view>
 </template>
 
@@ -99,21 +119,26 @@ export default {
             orderData: [],
             page: {
                 currentPage: 1,
-                pageSize: 3,
+                pageSize: 10,
             },
 
-            dataType: this.$store.state.dataType
+            sendOrdersShow: false,//派单弹框
+            sendOrdersList: []
         };
     },
     computed: {
         noData() {
             return this.orderData && this.orderData.length == 0;
         },
+        dataTypes() {
+            return this.$store.state.dataType
+        },
     },
 
     mounted() {
         this.$nextTick(() => {
             this.getRecordsList()
+            this.getRepairPersons()//获取维修人员列表
             // 触底触发
             uni.$on('onReachBottom', () => {
                 if (this.isNomore) {
@@ -132,13 +157,14 @@ export default {
         });
     },
     methods: {
+        // 获取列表
         getRecordsList() {
             this.$refs.BetLoading.show();
             this.loadingState = "loading";
             let query = {
                 current: this.page.currentPage,				          //页数
                 size: this.page.pageSize,				            //条数
-                dataType: this.dataType,//数据权限
+                dataType: this.dataTypes,//数据权限
                 // ...this.searchInfo
                 reportUnit: this.searchInfo.reportUnit
             }
@@ -169,7 +195,7 @@ export default {
         },
         // 搜索 单号
         searchData() {
-            if (this.dataType != 1) {
+            if (this.dataTypes != 1) {
                 // 非管理员和客户    不传提报单位
                 this.searchInfo.reportUnit = this.searchInfo.requirementCode
             } else {
@@ -202,12 +228,7 @@ export default {
                 return '已完成'
             }
         },
-        refreshData() {
-            this.page.currentPage = 1;
-            this.orderData = [];
-            this.loadingState = "loading";
-            this.getRecordsList();
-        },
+
         // 提报按钮
         subOrder(row) {
             let query_ = [row]
@@ -222,6 +243,30 @@ export default {
                 this.$refs.BetLoading.hide();
             })
         },
+
+        // 派单弹框
+        sendOrders() {
+            this.sendOrdersShow = true
+        },
+        // 确认派单
+        sendOrdersConfirm(e) {
+            console.log(44444,e);
+            // 确定派单
+
+        },
+        // 获取维修人员列表
+        getRepairPersons(){
+            this.$u.api.getRepairPersons().then(res=>{
+                if(res.code == 200){
+                    let data_ = res.data
+                    data_.forEach(i=>{
+                        this.sendOrdersList.push({...i,label:i.name})
+                    })
+                     
+                }
+               
+            })
+        },
         //   跳转详情
         goPage(item, type) {
             if (type == 'details') {
diff --git a/common/betone_components/betone-pop.vue b/common/betone_components/betone-pop.vue
new file mode 100644
index 0000000..c288150
--- /dev/null
+++ b/common/betone_components/betone-pop.vue
@@ -0,0 +1,107 @@
+<template>
+  <view class="sp-pop">
+    <u-popup
+      :mode="mode"
+      border-radius="10"
+      :mask-close-able="false"
+      v-model="show"
+      :closeable="!hideClose"
+      @close="closePop"
+    >
+      <view class="pop-content" :style="{width: width}">
+        <view class="pop-title" v-if="title">{{ title }}</view>
+        <view class="pop-icon" v-if="icon">
+          <u-image
+            :width="iconSize"
+            mode="widthFix"
+            :src="`/static/img/betone-sp-component/pop/${icon}.svg`"
+          ></u-image>
+        </view>
+        <slot></slot>
+      </view>
+    </u-popup>
+  </view>
+</template>
+<script>
+export default {
+  name: "spPop",
+  model: {
+    prop: "value",
+    event: "changeShow",
+  },
+  props: {
+    value: {
+      type: Boolean,
+      default: false,
+    },
+    icon: {
+      type: String,
+      default: "",
+    },
+    iconSize: {
+      type: String | Number,
+      default: 120,
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    hideClose: {
+      type: Boolean,
+      default: false,
+    },
+    mode: {
+      type: String,
+      default: 'bottom',
+    },
+    width: {
+      type: String,
+      default: '',
+    }
+  },
+  watch: {
+    value(show) {
+      this.show = show;
+    },
+  },
+  data() {
+    return {
+      show: false,
+    };
+  },
+  created() {
+    // this.show = true;
+  },
+  methods: {
+    closePop() {
+      this.show = false;
+      this.$emit("changeShow", false);
+      this.$emit("close");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.sp-pop {
+  .pop-content {
+    padding: 20rpx 32rpx;
+    min-height: 300rpx;
+    box-sizing: border-box;
+    max-height: 88vh;
+    .pop-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 48rpx 0;
+    }
+    .pop-title {
+      color: #333;
+      text-align: center;
+      font-size: 32rpx;
+      font-style: normal;
+      font-weight: 500;
+      line-height: 1.5; /* 150% */
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c9602cf..6f5f95a 100644
--- a/pages.json
+++ b/pages.json
@@ -81,6 +81,20 @@
 				}
             }
         },
+        {
+            "path": "pages/submission/materialSelect",
+            "style": {
+                "navigationBarTitleText": "物料选择",
+                "enablePullDownRefresh": false,
+                "navigationBarTextStyle": "black",
+                "navigationBarBackgroundColor": "rgba(248,248,248,1)",
+                "app-plus": {
+					"titleNView": {
+                        
+                    } 
+				}
+            }
+        },
         {
             "path": "pages/submission/evaluate",
             "style": {
diff --git a/pages/register/index.vue b/pages/register/index.vue
index bb61af6..5f7887c 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -41,7 +41,7 @@
         注册
       </u-button>
     </view>
-    <betone-dialog v-model="mapInfo.showMapSelect" :maskClose="true">
+    <betone-dialog v-model="mapInfo.showMapSelect" :maskClose="true" :mode="'bottom'">
       <map-Point @commitCheck="commitCheck" :mapKey='mapInfo.mapKey' :Radius='mapInfo.Radius'
         :showResetting='mapInfo.showResetting' :listIco='mapInfo.listIco' :orientationIco='mapInfo.orientationIco'
         :resettingIco='mapInfo.resettingIco'></map-Point>
diff --git a/pages/submission/materialSelect.vue b/pages/submission/materialSelect.vue
new file mode 100644
index 0000000..3db47c7
--- /dev/null
+++ b/pages/submission/materialSelect.vue
@@ -0,0 +1,78 @@
+<template>
+    <view class="page-css">
+        <view class="search-box">
+            <betone-new-input v-model="searchInfo.name" placeholder="搜索物品名称" icon="search" style="margin-bottom: 32rpx"
+                @changevalue="searchData()" />
+        </view>
+        <view class="material-box">
+
+        </view>
+        <view class="evaluate_box">
+            <!-- <view class="evaluate_btn">
+                确定
+            </view> -->
+            <u-button class="evaluate_btn" size="medium" type="primary">确定</u-button>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            searchInfo: {
+                name: '',
+            }
+        }
+    },
+    methods: {
+        searchData() {
+            // 搜索物品名称
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.page-css {
+    padding: 0;
+    display: flex;
+    flex-direction: column;
+    .search-box {
+        background: rgba(248, 248, 248, 1);
+        height: 140rpx;
+        padding: 0 32rpx 0;
+    }
+    .material-box{
+        flex: 1;
+        background: #fff;
+        margin: 24rpx 24rpx 178rpx 24rpx;
+        border-radius: 20rpx;
+        overflow: auto;
+    }
+    .evaluate_box {
+        width: 100%;
+        height: 154rpx;
+        bottom: 0;
+        position: fixed;
+        background: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .evaluate_btn {
+            width: 160rpx;
+            height: 60rpx;
+            border-radius: 8rpx;
+            background-color: rgba(255, 255, 255, 1);
+            color: rgba(58, 98, 215, 1);
+            font-size: 24rpx;
+            text-align: center;
+            font-family: PingFangSC-regular;
+            border: 2rpx solid rgba(58, 98, 215, 1);
+            margin-right: 26rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/submission/recordsdetails.vue b/pages/submission/recordsdetails.vue
index bf0264f..32e398b 100644
--- a/pages/submission/recordsdetails.vue
+++ b/pages/submission/recordsdetails.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="pages-css">
 		<view class="">
-			<view class="status_box">
+			<view class="status_box" v-if="detailForm.status != 2">
 				<view class="status_top">
-					<text class="status_txt">{{detailForm.status == 0 ? '待接单' : '维修完成'}}</text>
+					<text class="status_txt">{{ detailForm.status == 0 ? '待接单' : '维修完成' }}</text>
 					<view class="load_more">
 						<text class="load_more_txt">查看更多</text>
 						<img style="transform: rotate(90deg)" src="../../static/images/loadmore.png" alt="" />
@@ -11,7 +11,7 @@
 				</view>
 				<view class="status_bottom">
 					<text class="status_tip">
-						{{detailForm.status == 0 ? '【待接单】当前工单等待接单中' : '【维修完成】维修完成，请尽快完成评价'}}
+						{{ detailForm.status == 0 ? '【待接单】当前工单等待接单中' : '【维修完成】维修完成，请尽快完成评价' }}
 					</text>
 					<!-- <text class="status_date">{{detailForm.createTime.substring(0,10)}}</text> -->
 				</view>
@@ -21,26 +21,26 @@
 				<view class="repair_title">故障详情</view>
 				<view class="detail_item">
 					<text class="item_left_txt">故障描述：</text>
-					<text class="item_right_txt reason">{{detailForm.faultDescribe}}</text>
+					<text class="item_right_txt reason">{{ detailForm.faultDescribe }}</text>
 				</view>
 				<view class="detail_item">
 					<text class="item_left_txt">故障位置：</text>
-					<text class="item_right_txt">{{detailForm.faultLocation}}</text>
+					<text class="item_right_txt">{{ detailForm.faultLocation }}</text>
 				</view>
 				<view class="detail_item">
 					<text class="item_left_txt">设备名称：</text>
-					<text class="item_right_txt">{{detailForm.deviceName}}</text>
+					<text class="item_right_txt">{{ detailForm.deviceName }}</text>
 				</view>
 				<view class="detail_item">
 					<text class="item_left_txt">故障类别：</text>
-					<text class="item_right_txt">{{detailForm.faultType}}</text>
+					<text class="item_right_txt">{{ detailForm.faultType }}</text>
 				</view>
 				<view class="detail_item">
 					<text class="item_left_txt">故障视频：</text>
 					<view class="item_right_txt video">
-						<!-- http://124.221.142.15:9000/laboratory/upload/20241112/45fb049735d6225f7efdcf0faece6477.mp4 -->
-						<video v-show="detailForm.videoAttaches && detailForm.videoAttaches.length > 0" :src="detailForm.videoAttaches[0].link" style="width: 148px; height: 148px"
-						              controls></video>
+						<video v-if="detailForm.videoAttaches && detailForm.videoAttaches.length > 0"
+							:src="detailForm.videoAttaches[0].link" style="width: 148px; height: 148px"
+							controls></video>
 					</view>
 				</view>
 				<view class="detail_item">
@@ -48,7 +48,7 @@
 					<text class="item_right_txt imgs">故障描述故障描述故障描述故障描述故障描述故障描述故障描述故障描述故障描述故障描述故障描述故障描述</text>
 				</view>
 			</view>
-			<view class="repair_detail">
+			<view class="repair_detail" v-if="detailForm.status != 2">
 				<view class="repair_title">维修详情</view>
 				<view class="detail_item">
 					<text class="item_left_txt">维修人：</text>
@@ -74,25 +74,25 @@
 							<view class="table_txt right">金额</view>
 						</view>
 						<view class="table_box table_item" v-for="item in tableList" :key="item.id">
-							<view class="table_txt left">{{item.goodsName}}</view>
-							<view class="table_txt right">{{item.goodsPrice}}</view>
+							<view class="table_txt left">{{ item.goodsName }}</view>
+							<view class="table_txt right">{{ item.goodsPrice }}</view>
 						</view>
 						<view class="table_box table_sub">
 							<view class="table_txt left">合计</view>
-							<view class="table_txt right">{{totalPrice}}</view>
+							<view class="table_txt right">{{ totalPrice }}</view>
 						</view>
 						<view class="table_box table_sub">
 							<view class="table_txt left">折扣</view>
-							<view class="table_txt right">{{discount}}折</view>
+							<view class="table_txt right">{{ discount }}折</view>
 						</view>
 						<view class="table_box table_sub">
 							<view class="table_txt left">折后价格</view>
-							<view class="table_txt right">{{discountPrice}}</view>
+							<view class="table_txt right">{{ discountPrice }}</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="repair_detail">
+			<view class="repair_detail" v-if="detailForm.status != 2">
 				<view class="repair_title">其他信息</view>
 				<view class="detail_item">
 					<text class="item_left_txt">提报人：</text>
@@ -115,8 +115,50 @@
 					<text class="item_right_txt">2024-10-12 08:45</text>
 				</view>
 			</view>
+
+			<!-- 维修按钮  并且是维修人员角色   进来显示 -->
+			<view class="repair_detail" v-if="detailForm.status == 2 && dataTypes == 4">
+				<view class="repair_title">处理情况</view>
+				<view class="detail_item">
+					<text class="item_left_txt">接单时间：</text>
+					<text class="item_right_txt reason">2024/8/20 9:25:30</text>
+				</view>
+			</view>
+			<view class="repair_detail" v-if="detailForm.status == 2 && dataTypes == 4">
+				<view class="repair_title">维修详情</view>
+				<u-form labelPosition="left" :rules="rules" :ref="`repairDetailsForm`" :model="repairDetails"
+					:label-width="140" class="repair_form">
+					<u-form-item label="填报人:" prop="reportPeople" :border-bottom="false">
+						<betone-new-input label="" v-model="repairDetails.reportPeople" placeholder="请输入" />
+					</u-form-item>
+					<u-form-item label="设备名称:" prop="deviceName" :border-bottom="false">
+						<betone-new-input label="" v-model="repairDetails.deviceName" placeholder="请输入" />
+					</u-form-item>
+					<u-form-item label="故障原因:" prop="faultReason" :border-bottom="false">
+						<betone-new-input label="" v-model="repairDetails.faultReason" placeholder="请输入"
+							type="textarea" />
+					</u-form-item>
+					<u-form-item label="处理方法:" prop="dealMethods" :border-bottom="false">
+						<betone-new-input label="" v-model="repairDetails.dealMethods" placeholder="请输入"
+							type="textarea" />
+					</u-form-item>
+					<u-form-item label="是否申领物料:" prop="isMaterial" :border-bottom="false" :label-width="200">
+						<uni-data-checkbox v-model="repairDetails.isMaterial"
+							:localdata="isMaterialList"></uni-data-checkbox>
+					</u-form-item>
+					<u-form-item label="维修材料:" prop="materialTable" :border-bottom="false"
+						v-if="repairDetails.isMaterial == 1">
+						<u-button size="medium" :plain="true" style="margin-right: 32rpx;width:100%" type="primary"
+							@click="goPage('/pages/submission/materialSelect')">添加</u-button>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view class="repair-btn" style="margin-right: 32rpx;width:100%">
+				<!-- <u-button size="medium">保存</u-button> -->
+				<u-button size="medium" type="primary" @clcik="repairSubmit()">提交</u-button>
+			</view>
 		</view>
-		<view class="evaluate_box">
+		<view class="evaluate_box" v-if="detailForm.status == 5">
 			<view class="evaluate_btn">
 				评价
 			</view>
@@ -124,239 +166,295 @@
 	</view>
 </template>
 <script>
-	export default {
-		data() {
-			return {
-				tableList: [
-					{
-						id:'001',
-						goodsName: '物料1',
-						goodsPrice: '1000.00'
-					},
-					{
-						id:'002',
-						goodsName: '物料2',
-						goodsPrice: '59.00'
-					},
-					{
-						id:'003',
-						goodsName: '物料3',
-						goodsPrice: '25.00'
-					},
-				],
-				totalPrice:'1084.00',
-				discount:'9',
-				discountPrice:'975.60',
-				detailId:'',
-				detailForm:{}
-			}
+export default {
+	computed: {
+		dataTypes() {
+			return this.$store.state.dataType
 		},
-		onLoad(options){
-			console.log('options==========>',options)
-			this.detailId = options.id
-			this.getDetail()
-		},
-		mounted() {
-			
-		},
-		methods:{
-			getDetail(){
-				let query_ = {
-				    id: this.detailId
+	},
+	data() {
+		return {
+			tableList: [
+				{
+					id: '001',
+					goodsName: '物料1',
+					goodsPrice: '1000.00'
+				},
+				{
+					id: '002',
+					goodsName: '物料2',
+					goodsPrice: '59.00'
+				},
+				{
+					id: '003',
+					goodsName: '物料3',
+					goodsPrice: '25.00'
+				},
+			],
+			totalPrice: '1084.00',
+			discount: '9',
+			discountPrice: '975.60',
+			detailId: '',
+			detailForm: {},
+
+			isMaterialList: [
+				{
+					text: '是',
+					value: 1
+				},
+				{
+					text: '否',
+					value: 0
 				}
-				this.$u.api.getBreakdownInfo(query_).then(res => {
-					this.detailForm = res.data
-					console.log('detailForm----------->',this.detailForm)
-				})
+			],
+			repairDetails: {
+				reportPeople: '',//填报人
+				deviceName: '',//设备名称
+				faultReason: '',//故障原因
+				dealMethods: '',//处理方法
+				isMaterial: '',//是否申领物料
+				materialTable: [],//物料数据
 			},
+			rules: [
+
+			]
+		}
+	},
+	onLoad(options) {
+		this.detailId = options.id
+		this.getDetail()
+	},
+	mounted() {
+
+	},
+	methods: {
+		// 获取详情信息
+		getDetail() {
+			let query_ = {
+				id: this.detailId
+			}
+			this.$u.api.getBreakdownInfo(query_).then(res => {
+				if (res.code == 200) {
+					this.detailForm = res.data
+				}
+			})
+		},
+
+		// 维修提交
+		repairSubmit() {
+
+		},
+		goPage(path) {
+			uni.navigateTo({
+				url: path,
+			});
 		}
 	}
+}
 </script>
 <style lang="scss" scoped>
-	.pages-css {
-		
-		width: 100%;
-		padding: 0;
-		background: rgba(239, 239, 239, 1);
-		padding-top: 26rpx;
-		padding-bottom: 180rpx;
-
-		.status_box {
-			margin: 0 24rpx 20rpx;
-			height: 180rpx;
-			border-radius: 20rpx;
-			background-color: rgba(255, 255, 255, 1);
-			color: rgba(16, 16, 16, 1);
-			font-size: 36rpx;
-			text-align: left;
-			font-family: -bold;
+.pages-css {
 
-			.status_top {
-				width: 100%;
-				padding: 40rpx 20rpx 30rpx 30rpx;
-				// background-color: red;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
+	width: 100%;
+	padding: 0;
+	background: rgba(239, 239, 239, 1);
+	padding-top: 26rpx;
+	padding-bottom: 180rpx;
 
-				.status_txt {
-					color: rgba(0, 0, 0, 1);
-					font-size: 36rpx;
-					text-align: left;
-					font-family: SourceHanSansSC-bold;
-					font-weight: bold;
-				}
+	.status_box {
+		margin: 0 24rpx 20rpx;
+		height: 180rpx;
+		border-radius: 20rpx;
+		background-color: rgba(255, 255, 255, 1);
+		color: rgba(16, 16, 16, 1);
+		font-size: 36rpx;
+		text-align: left;
+		font-family: -bold;
 
-				.load_more {
-					color: rgba(108, 108, 108, 1);
-					font-size: 28rpx;
-					text-align: left;
-					font-family: SourceHanSansSC-regular;
-					display: flex;
-					align-items: center;
-				}
+		.status_top {
+			width: 100%;
+			padding: 40rpx 20rpx 30rpx 30rpx;
+			// background-color: red;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.status_txt {
+				color: rgba(0, 0, 0, 1);
+				font-size: 36rpx;
+				text-align: left;
+				font-family: SourceHanSansSC-bold;
+				font-weight: bold;
 			}
 
-			.status_bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				color: rgba(190, 190, 190, 1);
+			.load_more {
+				color: rgba(108, 108, 108, 1);
 				font-size: 28rpx;
 				text-align: left;
 				font-family: SourceHanSansSC-regular;
+				display: flex;
+				align-items: center;
+			}
+		}
 
-				.status_date {
-					margin-right: 22rpx;
-				}
+		.status_bottom {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: rgba(190, 190, 190, 1);
+			font-size: 28rpx;
+			text-align: left;
+			font-family: SourceHanSansSC-regular;
+
+			.status_date {
+				margin-right: 22rpx;
 			}
 		}
+	}
 
-		.fault_detail {
-			margin: 0 24rpx 20rpx;
-			height: 180rpx;
-			border-radius: 20rpx;
-			background-color: rgba(255, 255, 255, 1);
+	.fault_detail {
+		margin: 0 24rpx 20rpx;
+		height: 180rpx;
+		border-radius: 20rpx;
+		background-color: rgba(255, 255, 255, 1);
+	}
+
+	.repair_detail {
+		margin: 0 24rpx 20rpx;
+		border-radius: 20rpx;
+		background-color: rgba(255, 255, 255, 1);
+		padding: 6rpx 0 34rpx;
+
+		.repair_title {
+			line-height: 60rpx;
+			color: rgba(0, 0, 0, 1);
+			font-size: 32rpx;
+			text-align: left;
+			font-family: SourceHanSansSC-bold;
+			margin: 18rpx 0 0rpx 20rpx;
+			font-weight: bold;
 		}
 
-		.repair_detail {
-			margin: 0 24rpx 20rpx;
-			border-radius: 20rpx;
-			background-color: rgba(255, 255, 255, 1);
-			padding:6rpx 0  34rpx;
+		.detail_item {
+			padding: 4rpx 20rpx 0;
 
-			.repair_title {
-				line-height: 60rpx;
-				color: rgba(0, 0, 0, 1);
-				font-size: 32rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+			.item_left_txt {
+				color: rgba(108, 108, 108, 1);
+				font-size: 14px;
 				text-align: left;
-				font-family: SourceHanSansSC-bold;
-				margin: 18rpx 0 0rpx 20rpx;
-				font-weight: bold;
+				font-family: SourceHanSansSC-regular;
+				width: 200rpx;
+				margin-right: 20rpx;
+				line-height: 60rpx;
 			}
 
-			.detail_item {
-				padding: 4rpx 20rpx 0;
+			.item_right_txt {
+				max-width: calc(100% - 220rpx);
+				color: rgba(0, 0, 0, 1);
+				font-size: 28rpx;
+				// text-align: left;
+				text-align: justify;
+				font-family: SourceHanSansSC-regular;
+			}
 
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
+			.item_right_table {
+				width: calc(100% - 220rpx);
+				margin-top: 10rpx;
 
-				.item_left_txt {
-					color: rgba(108, 108, 108, 1);
+				.table_box {
+					width: 100%;
+					height: 60rpx;
+					background-color: #e8e8e8;
+					border: 1px solid #bbbbbb;
 					font-size: 14px;
-					text-align: left;
-					font-family: SourceHanSansSC-regular;
-					width: 200rpx;
-					margin-right: 20rpx;
+					color: #101010;
 					line-height: 60rpx;
-				}
-
-				.item_right_txt {
-					max-width: calc(100% - 220rpx);
-					color: rgba(0, 0, 0, 1);
-					font-size: 28rpx;
-					// text-align: left;
-					text-align: justify;
-					font-family: SourceHanSansSC-regular;
-				}
+					display: flex;
 
-				.item_right_table {
-					width: calc(100% - 220rpx);
-					margin-top: 10rpx;
-
-					.table_box {
-						width: 100%;
-						height: 60rpx;
-						background-color: #e8e8e8;
-						border: 1px solid #bbbbbb;
-						font-size: 14px;
-						color: #101010;
-						line-height: 60rpx;
-						display: flex;
-
-						.left {
-							width: 72%;
-							height: 100%;
-							text-align: center;
-							border-right: 2rpx solid #bbbbbb;
-						}
-
-						.right {
-							width: 28%;
-							height: 100%;
-							text-align: center;
-						}
-					}
-					
-					.table_item{
-						background-color: #fff;
-						border-top: none;
+					.left {
+						width: 72%;
+						height: 100%;
+						text-align: center;
+						border-right: 2rpx solid #bbbbbb;
 					}
-					.table_sub{
-						border-top: none;
-						background-color: #fff;
+
+					.right {
+						width: 28%;
+						height: 100%;
+						text-align: center;
 					}
 				}
 
-				.reason {
-					word-wrap: warp;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 3;
-					/* 定义显示的行数 */
-					overflow: hidden;
-					text-overflow: ellipsis;
+				.table_item {
+					background-color: #fff;
+					border-top: none;
+				}
+
+				.table_sub {
+					border-top: none;
+					background-color: #fff;
 				}
 			}
+
+			.reason {
+				word-wrap: warp;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 3;
+				/* 定义显示的行数 */
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
 		}
+	}
 
-		.evaluate_box {
-			width: 100%;
-			height: 154rpx;
-			bottom: 0;
-			position: fixed;
-			background: #fff;
+	.evaluate_box {
+		width: 100%;
+		height: 154rpx;
+		bottom: 0;
+		position: fixed;
+		background: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+
+		.evaluate_btn {
+			width: 160rpx;
+			height: 60rpx;
+			border-radius: 8rpx;
+			background-color: rgba(255, 255, 255, 1);
+			color: rgba(58, 98, 215, 1);
+			font-size: 24rpx;
+			text-align: center;
+			font-family: PingFangSC-regular;
+			border: 2rpx solid rgba(58, 98, 215, 1);
+			margin-right: 26rpx;
 			display: flex;
 			align-items: center;
-			justify-content: flex-end;
-
-			.evaluate_btn {
-				width: 160rpx;
-				height: 60rpx;
-				border-radius: 8rpx;
-				background-color: rgba(255, 255, 255, 1);
-				color: rgba(58, 98, 215, 1);
-				font-size: 24rpx;
-				text-align: center;
-				font-family: PingFangSC-regular;
-				border: 2rpx solid rgba(58, 98, 215, 1);
-				margin-right: 26rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
+			justify-content: center;
+		}
+	}
+
+	.repair_form {
+		padding: 0 32rpx;
+	}
+
+	.repair-btn {
+		width: 100%;
+		display: flex;
+		justify-content: space-around;
+		/* 水平均匀分布 */
+		margin-top: 32rpx;
+		padding: 0 32rpx;
+
+		/deep/.u-btn {
+			width: 100%;
 		}
 	}
+}
 </style>
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index 75d98cc..0ab902c 100644
--- a/store/index.js
+++ b/store/index.js
@@ -19,6 +19,7 @@ const store = new Vuex.Store({
             维修负责人   1839537055389515777
             维修人员  1839552581620793346
           */
+        //  console.log(66666666666,role_id)
             if(role_id == "1123598816738675201"||role_id == "1846419477876510721"){
               commit('updateDatatype', 1) //客户
             }