From 66163cd8364edfa19b1122886dfba21f19c8e943 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Thu, 5 Dec 2024 14:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/betone_components/betone-list.vue |  32 ++--
 config/status.js                         |   4 +
 pages.json                               |   2 +-
 pages/submission/recordsdetails.vue      |  13 +-
 pages/submission/sendOrders.vue          | 231 ++++++++++-------------
 5 files changed, 125 insertions(+), 157 deletions(-)

diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue
index c21e824..22a110f 100644
--- a/common/betone_components/betone-list.vue
+++ b/common/betone_components/betone-list.vue
@@ -73,15 +73,12 @@
                                 <u-button v-if="item.status == 3" size="mini" :plain="true" style="margin-right:16rpx"
                                     :hair-line="true" type="primary" @click="orderConfirm(item)">审批</u-button>
 
-
                             </block>
                             <!-- 维修人员 -->
                             <block v-if="dataTypes == 4">
                                 <!-- 查看维修详情 -->
-
-
                                 <u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right:16rpx"
-                                    type="primary" @click="openModel(item, 'submitOrder')">确认</u-button>
+                                    type="primary" @click="orderConfirm(item)">确认</u-button>
                                 <u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right:16rpx"
                                     type="primary" @click="openModel(item, 'turn')">驳回</u-button>
                                 <u-button v-if="item.status == 2" size="mini" :plain="true" style="margin-right:16rpx"
@@ -140,15 +137,14 @@
         <betone-modal v-model="detailsShow" :title="'下载内容'" @confirm="detailsShowFn" @cancel="detailsShow = false">
             <recordsdetails :data="rowInfo" :detailId="rowInfo.id" id="capture"></recordsdetails>
         </betone-modal>
-        <sp-html2canvas-render domId="capture" ref="renderRef" @renderOver="renderOver"  pdfFileName="这是一个pdf文件"
-      @beforeSavePDF="beforeSavePDF"
-      @successSavePDF="successSavePDF"></sp-html2canvas-render>
+        <sp-html2canvas-render domId="capture" ref="renderRef" @renderOver="renderOver" pdfFileName="这是一个pdf文件"
+            @beforeSavePDF="beforeSavePDF" @successSavePDF="successSavePDF"></sp-html2canvas-render>
     </view>
 </template>
 
 <script>
 import recordsdetails from '@/pages/submission/components/details.vue'
-import {tabList,tabListColor} from '@/config/status.js'
+import { tabList, tabListColor } from '@/config/status.js'
 export default {
     props: {
         // tabList: {
@@ -200,7 +196,7 @@ export default {
 
             detailsShow: false,//打印详情页面
 
-            tabList:[],//tab状态
+            tabList: [],//tab状态
         };
     },
     computed: {
@@ -211,7 +207,7 @@ export default {
             this.tabList = tabList[this.$store.state.dataType]
             return this.$store.state.dataType
         },
-        tagColor(){
+        tagColor() {
             return tabListColor
         },
     },
@@ -293,11 +289,17 @@ export default {
         },
         // 获取状态信息
         statusName(item) {
-            let newArr = this.tabList.filter(i => {
-                let sta = i.key.split(',')
-                return sta.includes(item + '')
-            })
-            return newArr[0].name
+            if (this.tabList.length > 0) {
+                let newArr = this.tabList.filter(i => {
+                  
+                    let sta = i.key.split(',')
+                    
+                    return sta.includes(item + '')
+                })
+                
+                return newArr[0].name
+            }
+
         },
 
         // 提报按钮
diff --git a/config/status.js b/config/status.js
index a53d0ae..517bd69 100644
--- a/config/status.js
+++ b/config/status.js
@@ -108,6 +108,10 @@ export const tabList = {
             name: "全部",
             key: "9999",
         },
+        {
+            name: "待提报",
+            key: "-1",
+        },
         {
             name: "待确认",
             key: "1",
diff --git a/pages.json b/pages.json
index 2297ca2..e7e3483 100644
--- a/pages.json
+++ b/pages.json
@@ -169,7 +169,7 @@
                     "style": {
                         "navigationBarTitleText": "报送记录",
                         "navigationBarTextStyle": "black",
-                        "navigationBarBackgroundColor": "#efefef",
+                        "navigationBarBackgroundColor": "#fff",
                         "enablePullDownRefresh": true
                     }
                 },
diff --git a/pages/submission/recordsdetails.vue b/pages/submission/recordsdetails.vue
index 06e3a9c..cb484c9 100644
--- a/pages/submission/recordsdetails.vue
+++ b/pages/submission/recordsdetails.vue
@@ -1,8 +1,7 @@
 <template>
 	<view class="page-css"
-		:style="{ 'padding-bottom': (detailForm.status == 5 && dataTypes == 1) ? '180rpx' : '20rpx' }"
-		ref="contentToExport">
-		<view class="" id="capture">
+		:style="{ 'padding-bottom': (detailForm.status == 5 && dataTypes == 1) ? '180rpx' : '20rpx' }">
+		<view class="">
 			<view class="repair_detail">
 				<view class="repair_title">{{ dataTypes == 1 ? '故障信息' : '故障详情' }}</view>
 				<view class="detail_item">
@@ -41,7 +40,7 @@
 			</view>
 			<!-- 维修详情 -->
 			<view class="repair_detail"
-				v-if="(dataTypes == 1 || dataTypes == 2) && (detailForm.status == 5 || detailForm.status == 6 || detailForm.status == 7 || detailForm.status == 8 || detailForm.status == 9) || (dataTypes == 4 && !(detailForm.status == 0 || detailForm.status == 1 || detailForm.status == 2)) || (dataTypes == 3) && (detailForm.closeReason == '')">
+				v-if="!(detailForm.status == -1 || detailForm.status == 0 || detailForm.status == 1 || detailForm.status == 2)">
 				<view class="repair_title">维修详情</view>
 				<view class="detail_item">
 					<text class="item_left_txt">维修人：</text>
@@ -141,8 +140,8 @@
 			</view>
 
 		</view>
-	
-		
+
+
 	</view>
 </template>
 <script>
@@ -234,7 +233,7 @@ export default {
 			// 保存PDF文件
 			pdf.save('download.pdf');
 		},
-		
+
 	}
 }
 
diff --git a/pages/submission/sendOrders.vue b/pages/submission/sendOrders.vue
index 022df72..f8e0344 100644
--- a/pages/submission/sendOrders.vue
+++ b/pages/submission/sendOrders.vue
@@ -5,27 +5,30 @@
             <u-form labelPosition="left" :rules="rules" ref="repairDetailsForm" :model="repairDetails"
                 :label-width="200" class="repair_form">
                 <u-form-item label="需求单号:" prop="requirementCode" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.requirementCode" placeholder=""
-                        :disabled="true" />
+                    <u-input v-model="repairDetails.requirementCode" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="提报单位:" prop="reportUnit" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.reportUnit" placeholder="" :disabled="true" />
+                    <u-input v-model="repairDetails.reportUnit" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="故障现象描述:" prop="faultDescribe" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.faultDescribe" placeholder="请输入"
-                        :disabled="disabled" />
+
+                    <u-input v-model="repairDetails.faultDescribe" :border="true" placeholder="请输入" :disabled="disabled"
+                        :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
                 <u-form-item label="故障位置:" prop="faultLocation" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.faultLocation" placeholder="请输入"
-                        :disabled="disabled" />
+
+                    <u-input v-model="repairDetails.faultLocation" :border="true" placeholder="请输入" :disabled="disabled"
+                        :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
                 <u-form-item label="设备名称:" prop="deviceName" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.deviceName" placeholder="请输入"
-                        :disabled="disabled" />
+                    <u-input v-model="repairDetails.deviceName" :border="true" placeholder="请输入" :disabled="disabled"
+                        :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
                 <u-form-item label="设备专业类型:" prop="faultType" :border-bottom="false">
-                    <betone-new-input label="" v-model="repairDetails.faultType" placeholder="请输入"
-                        :disabled="disabled" />
+                    <u-input v-model="repairDetails.faultType" :border="true" placeholder="请输入" :disabled="disabled"
+                        :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
             </u-form>
         </view>
@@ -38,49 +41,24 @@
                 <u-form-item label="维修人员:" prop="name" :border-bottom="false" :required="true">
                     <u-input v-if="dataTypes == 2" v-model="sendOrder.name" type="select" :border="true"
                         @click="sendOrdersShow = true" :disabled="disabled" />
-                    <betone-new-input v-if="dataTypes == 4" label="" v-model="sendOrder.name" placeholder=""
-                        :disabled="disabled" />
+                    <u-input v-if="dataTypes == 4" v-model="sendOrder.name" :border="true" placeholder=""
+                        :disabled="disabled" :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
                 <u-form-item label="计划完成时间:" prop="planCompleteTime" :border-bottom="false">
                     <u-input v-if="dataTypes == 2" v-model="sendOrder.planCompleteTime" type="select"
                         @click="calendarShow = true" :border="true" placeholder="请选择时间" :disabled="disabled" />
-                    <betone-new-input v-if="dataTypes == 4" label="" v-model="sendOrder.planCompleteTime" placeholder=""
-                        :disabled="disabled" />
+                    <u-input v-if="dataTypes == 4" v-model="sendOrder.planCompleteTime" :border="true" placeholder=""
+                        :disabled="disabled" :class="disabled ? 'sp-new-input-diabled' : ''" />
                 </u-form-item>
                 <u-form-item label="客服意见:" prop="reportPeople" :border-bottom="false">
                     <u-input v-if="dataTypes == 2" v-model="sendOrder.customerOpinion" type="textarea" :border="true"
                         :disabled="disabled" :height="120" />
-                    <betone-new-input v-if="dataTypes == 4" label="" v-model="sendOrder.customerOpinion" placeholder=""
-                        :disabled="disabled" type="textarea" :height="120" />
+                    <u-input v-if="dataTypes == 4" v-model="sendOrder.customerOpinion" :border="true" placeholder=""
+                        type="textarea" :disabled="disabled" :class="disabled ? 'sp-new-input-diabled' : ''"
+                        :height="120" />
                 </u-form-item>
 
-                <!-- <u-form-item v-if="dataTypes == 4" label="是否申领物料:" prop="isNeedMaterials" :border-bottom="false"
-                    :label-width="200" :isRequire="true">
-                    <uni-data-checkbox v-model="sendOrder.isNeedMaterials"
-                        :localdata="isMaterialList"></uni-data-checkbox>
-                </u-form-item> -->
 
-                <!-- <view class="selectForm clearfix" v-if="sendOrder.isNeedMaterials == 1">
-                    <view class="form-item form-label">物料申领:</view>
-                    <view class="form-item form-content">
-                        <view class="select-box clearfix">
-                            <view class="select-box-item clearfix" v-for="(item, index) in sendOrder.materialsData"
-                                :key="index">
-                                <view class="material-text">名称：{{ item.name }}</view>
-                                <view class="material-text">规格：{{ item.rule }}</view>
-                                <view class="material-text">型号：{{ item.xh }}</view>
-                                <view class="material-text">数量：{{ item.goodsNum }}</view>
-                                <view class="material-text">单位：{{ item.unit }}</view>
-                            </view>
-                        </view>
-                        <u-button size="medium" :plain="true" style="margin-right: 32rpx;width:100%" type="primary"
-                            @click="goodsSelect()">{{ sendOrder.materialsData.length > 0 ? '修改' : '添加' }}</u-button>
-                    </view>
-                </view> -->
-                <!-- <u-form-item v-if="dataTypes == 4" label="备注:" prop="remark" :border-bottom="false">
-                    <u-input v-model="sendOrder.remark" type="textarea" :border="true" :height="120" />
-
-                </u-form-item> -->
             </u-form>
         </view>
 
@@ -89,36 +67,44 @@
             <view class="repair_title">处理情况</view>
             <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
                 <u-form-item label="接单时间:" prop="dispatchTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.dispatchTime" placeholder="" :disabled="true" />
+
+                    <u-input v-model="detailForm.dispatchTime" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="计划完成时间:" prop="planCompleteTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.planCompleteTime" placeholder="" :disabled="true" />
+                    <u-input v-model="detailForm.planCompleteTime" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="客服意见:" prop="customerOpinion" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.customerOpinion" placeholder="" :disabled="true"
-                        type="textarea" :height="120" />
+                    <u-input v-model="detailForm.customerOpinion" type="textarea" :border="true" :disabled="disabled"
+                        :height="120" class="sp-new-input-diabled" />
                 </u-form-item>
             </u-form>
         </view>
         <!-- 维修详情 待提交维修方案  展示 -->
         <view class="repair_detail"
-            v-if="(dataTypes == 4 && detailForm.status == 2) || (dataTypes == 3 && detailForm.status == 3)">
+            v-if="(dataTypes == 4 && detailForm.status == 2) || (dataTypes == 3 && detailForm.status == 3) || (dataTypes == 1 && detailForm.status == 4)">
             <view class="repair_title">维修详情</view>
             <u-form labelPosition="left" :rules="repairInfoRules" ref="repairInfoForm" :model="repairInfo"
                 :label-width="140" class="repair_form">
                 <u-form-item label="维修人:" prop="reportPeople" :border-bottom="false">
-                    <betone-new-input :disabled="true" label="" v-model="detailForm.repairPersonName" placeholder="" />
+
+                    <u-input v-model="detailForm.repairPersonName" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="设备名称:" prop="deviceName" :border-bottom="false">
-                    <betone-new-input :disabled="true" label="" v-model="detailForm.deviceName" placeholder="" />
+                    <u-input v-model="detailForm.deviceName" :border="true" placeholder="" :disabled="true"
+                        class="sp-new-input-diabled" />
                 </u-form-item>
                 <u-form-item label="故障原因:" prop="faultReason" :border-bottom="false" :required="true">
-                    <betone-new-input label="" v-model="repairInfo.faultReason" placeholder="请输入" type="textarea"
-                        :disabled="optionDisabled" />
+                    <u-input v-model="repairInfo.faultReason" :border="true" placeholder="请输入" type="textarea"
+                        :disabled="optionDisabled" :class="optionDisabled ? 'sp-new-input-diabled' : ''"
+                        :height="120" />
                 </u-form-item>
                 <u-form-item label="处理方法:" prop="dealMethods" :border-bottom="false" :required="true">
-                    <betone-new-input label="" v-model="repairInfo.dealMethods" placeholder="请输入" type="textarea"
-                        :disabled="optionDisabled" />
+                    <u-input v-model="repairInfo.dealMethods" :border="true" placeholder="请输入" type="textarea"
+                        :disabled="optionDisabled" :class="optionDisabled ? 'sp-new-input-diabled' : ''"
+                        :height="120" />
                 </u-form-item>
                 <u-form-item label="是否申领物料:" prop="isMaterial" :border-bottom="false" :label-width="200"
                     :required="true">
@@ -136,8 +122,9 @@
                                 <view class="material-text">型号：{{ item.xh }}</view>
                                 <view class="material-text">数量：{{ item.goodsNum }}</view>
                                 <view class="material-text">单位：{{ item.unit }}</view>
-                                <view class="material-text">价格：{{ (dataTypes == 3 && detailForm.status ==
-                                    3) ? item.materialPrice : (item.unifiedQuotation * item.goodsNum) }}</view>
+                                <view class="material-text">价格：{{ ((dataTypes == 3 && detailForm.status ==
+                                    3) || (dataTypes == 1 && detailForm.status ==
+                                        4)) ? item.materialPrice : (item.purchasePrice * item.goodsNum) }}</view>
                             </view>
                         </view>
                         <u-button v-if="!optionDisabled" size="medium" :plain="true"
@@ -145,13 +132,16 @@
                                 sendOrder.materialsData.length > 0 ? '修改' : '添加' }}</u-button>
                     </view>
                 </view>
-                <block v-if="dataTypes == 3 && detailForm.status == 3 && repairInfo.isMaterial == 1">
+                <block
+                    v-if="(dataTypes == 3 && detailForm.status == 3) || (dataTypes == 1 && detailForm.status == 4) && repairInfo.isMaterial == 1">
                     <u-form-item label="总价:" prop="reportPeople" :border-bottom="false">
                         <view>{{ approveInfo.totalPrice }}</view>
                     </u-form-item>
                     <u-form-item label="折扣:" prop="reportPeople" :border-bottom="false">
-                        <betone-new-input label="" v-model="approveInfo.discount" placeholder="" type="number"
-                            @changevalue="changDiscount" />折
+                        <!-- <betone-new-input label="" v-model="approveInfo.discount" placeholder="" type="number"
+                            @changevalue="changDiscount" />折 -->
+                            <u-input v-model="approveInfo.discount" :border="true" placeholder="" :disabled="true"
+                            :class="optionDisabled?'sp-new-input-diabled':''" />折
                     </u-form-item>
                     <u-form-item label="折扣后的金额:" prop="reportPeople" :border-bottom="false" :label-width="240">
                         <view>{{ approveInfo.discountPrice }}</view>
@@ -176,6 +166,13 @@
                 </u-form-item>
             </u-form>
         </view>
+        <!--   维修人员接单确认-->
+        <view class="repair-4-btn" style="margin-right: 32rpx;width:100%"
+            v-if="dataTypes == 4 && detailForm.status == 1">
+            <u-button size="medium" @click="endOrderCancel()">取消</u-button>
+            <u-button size="medium" @click="turnShow = true">驳回</u-button>
+            <u-button size="medium" type="primary" @click="repairOrderSubmit()">确认接单</u-button>
+        </view>
         <!-- 客户  审批  确认维修方案 -->
         <view class="repair_detail" v-if="dataTypes == 1 && detailForm.status == 4">
             <view class="repair_title">客户审批</view>
@@ -197,13 +194,6 @@
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
             <u-button size="medium" type="primary" @click="sendOrderSubmit()">确定派单</u-button>
         </view>
-        <!--   维修人员接单-->
-        <!-- <view class="repair-4-btn" style="margin-right: 32rpx;width:100%"
-            v-if="dataTypes == 4 && detailForm.status == 1">
-            <u-button size="medium" @click="endOrderCancel()">取消</u-button>
-            <u-button size="medium" @click="turnShow = true">驳回</u-button>
-            <u-button size="medium" type="primary" @click="repairOrderSubmit()">确认接单</u-button>
-        </view> -->
         <!-- 维修人员 提交维修方案 -->
         <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && detailForm.status == 2">
             <u-button size="medium" @click="endOrderCancel()">取消</u-button>
@@ -242,7 +232,7 @@
                         <view class="item-right">
                             <view class="material-title">
                                 <text class="material-title-name">{{ item.name }}</text>
-                                <text class="material-title-code">{{ item.code }}</text>
+                                <text class="material-title-code">{{ item.inventoryId }}</text>
                                 <text>库存数：{{ item.num }}</text>
                             </view>
                             <view class="material-text">品牌：{{ item.brand }}</view>
@@ -268,6 +258,13 @@
                 <betone-new-input v-model="repaiRejectReason" placeholder="请输入" style="margin-bottom: 32rpx" />
             </view>
         </betone-modal>
+
+        <betone-modal v-model="submitOrderShow" :title="'提示'" @confirm="submitOrderShowFn"
+            @cancel="submitOrderShow = false">
+            <view class="modal-text">
+                请确认是否进行接单确认？
+            </view>
+        </betone-modal>
         <betone-loading ref="BetLoading" />
     </view>
 </template>
@@ -283,7 +280,7 @@ export default {
             return this.$store.state.dataType == 2 ? false : true
         },
         optionDisabled() {
-            return this.$store.state.dataType == 3 && this.detailForm.status == 3 ? true : false
+            return (this.$store.state.dataType == 3 && this.detailForm.status == 3) || (this.$store.state.dataType == 1 && this.detailForm.status == 4) ? true : false
         },
     },
 
@@ -401,7 +398,9 @@ export default {
                 approveResult: null,//1通过  0驳回
                 approveText: '',//展示内容
                 approveTime: '',//当前时间
-            }
+            },
+
+            submitOrderShow: false,//维修人员接单确认
         }
     },
     onReady() {
@@ -444,7 +443,6 @@ export default {
                     if (this.detailForm.materials.length > 0) {
                         this.detailForm.materials.forEach(item => {
                             data = data + item.materialPrice
-                            console.log(1111111, item.materialPrice)
                             item.goodsNum = item.materialCount
                             item.name = item.materialName
                         })
@@ -452,6 +450,8 @@ export default {
 
                     // 获取审批总价
                     this.approveInfo.totalPrice = data
+                    this.approveInfo.discount =  this.detailForm.discount
+                    this.approveInfo.discountPrice =  this.detailForm.discountPrice
                 }
 
             })
@@ -570,6 +570,10 @@ export default {
             let selected = this.goodsTableData.filter(i => {
                 return i.checked
             })
+            if (selected.find(item => item.goodsNum == 0)) {
+                uni.showToast({ title: "申领数量不能为0", icon: "none" });
+                return false
+            }
             this.sendOrder.materialsData = JSON.parse(JSON.stringify(selected))
             this.aterialShow = false
         },
@@ -591,70 +595,7 @@ export default {
                 })
             }
         },
-        // 维修人员接单确认  如果有申领物料  先调用申领物料接口   再调用维修人员接收工单按钮
-        repairOrderSubmit() {
-            // 判断是否申领物料  调用申领接口
-            if (this.sendOrder.isNeedMaterials == 1 && this.sendOrder.materialsData.length <= 0) {
-                uni.showToast({ title: "请选择需要的申领材料", icon: "none" });
-                return false
-            }
-            // 申领物料 数量的判断
-            if (this.sendOrder.materialsData.find(item => item.goodsNum == 0)) {
-                uni.showToast({ title: "申领数量不能为0", icon: "none" });
-                return false
-            }
-            this.BetLoading.show();
-            if (this.sendOrder.isNeedMaterials == 1) {
-                let data = []
-                this.sendOrder.materialsData.map(item => {
-                    data.push({
-                        inventoryId: item.inventoryId,//物资id
-                        productName: item.name,	//物资名称
-                        brand: item.brand,//品牌
-                        xh: item.xh,//型号
-                        rule: item.rule,//参数
-                        applyNum: item.applyNum,//领用数量
-                    })
-                })
-                // 申领传参
-                let query1 = {
-                    details: data,
-                    applyUserId: this.userInfo.user_id,	//申领人Id
-                    applyUser: this.userInfo.user_name,	//申领人
-                    applyTime: dateFormat("yyyy-MM-dd hh:mm:ss", new Date()),//申领时间(yyyy-MM-dd HH:mm:ss)
-                    status: 0,
-                    workId: this.orderId,
-                }
-                this.$u.api.applySave(query1).then(res => {
-
-                })
-            }
-
-            let query_ = {
-                id: this.orderId
-            }
-            this.$u.api.servicemanReceive(query_).then(res => {
-                if (res.code == 200) {
-                    uni.showToast({ title: "确认成功", icon: "none" });
-                    uni.navigateBack({
-                        delta: 1 // 默认值是1，表示回退一个页面
-                    })
-                }
-            })
-
-
-            // this.$u.api.editData(query).then(res => {
-            //     if (res.code == 200) {
-            //         uni.showToast({ title: "派单成功", icon: "none" });
-            //         uni.navigateBack({
-            //             delta: 1 // 默认值是1，表示回退一个页面
-            //         })
-            //     }
-            // })
 
-
-
-        },
         // 维修人员驳回
         turnFn() {
             if (this.repaiRejectReason == '') {
@@ -879,7 +820,26 @@ export default {
             this.maxDate = year + 1 + "-" + month + "-" + day; // 最大日期可选到一年后
             //this.maxDate = year  + '-'+ month +'-' + day; // 最大日期可选到今天
         },
-
+        // 维修人员确认接单
+        submitOrderShowFn() {
+            let query_ = {
+                id: this.detailForm.id
+            }
+            this.$u.api.servicemanReceive(query_).then(res => {
+                if (res.code == 200) {
+                    uni.showToast({ title: "确认成功", icon: "none" });
+                    // this.getRecordsList()
+                    setTimeout(() => {
+                        uni.navigateBack({
+                            delta: 1 // 默认值是1，表示回退一个页面
+                        })
+                    }, 500)
+                }
+            })
+        },
+        repairOrderSubmit() {
+            this.submitOrderShow = true
+        }
 
     }
 }
@@ -953,6 +913,9 @@ export default {
             .material-text {
                 width: 50%;
                 float: left;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
             }
         }