xiaohaizhao пре 5 месеци
родитељ
комит
83586675be

+ 2 - 2
pages/index/home.vue

@@ -174,10 +174,10 @@ const itemList = ref([{
 	text: "专业上门安装",
 	path: "/pages/workOrder/index?type=进行中",
 }, {
-	label: '已完',
+	label: '已完',
 	icon: '/static/image/ywj.png',
 	text: "精心维护保养",
-	path: "/pages/workOrder/index?type=已完",
+	path: "/pages/workOrder/index?type=已完",
 }]);
 </script>
 

+ 1 - 1
pages/workOrder/detail.vue

@@ -200,7 +200,7 @@ const steps = reactive([
     { title: '开始', value: '待开始' },
     { title: '进行中', value: '进行中' },
     { title: '提交', value: '提交' },
-    { title: '完工', value: '已完' }
+    { title: '完工', value: '已完' }
 ]);
 let sa_workorderid = 0;
 onLoad((options) => {

+ 5 - 5
pages/workOrder/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <view v-if="!['待接单', '已完'].includes(content.where.status)" style="background-color: #fff;">
+    <view v-if="!['待接单', '已完'].includes(content.where.status)" style="background-color: #fff;">
         <up-tabs lineColor="#3874F6" :scrollable="false" current="1" :list="[{
             name: '待开始'
         }, {
@@ -30,7 +30,7 @@
             <view class="user">
                 {{ item.customername + ' ' + item.customerphonenumber }}
             </view>
-            <view v-if="content.where.status != '已完'" class="but-box" @click.stop>
+            <view v-if="content.where.status != '已完'" class="but-box" @click.stop>
                 <view class="but-box-item">
                     <My-button :customStyle="{
                         'background-color': '#FFFFFF',
@@ -117,11 +117,11 @@ onLoad((options) => {
             });
             content.where.status = '进行中';
             break;
-        case '已完':
+        case '已完':
             uni.setNavigationBarTitle({
-                title: '已完工单'
+                title: '已完工单'
             });
-            content.where.status = '已完';
+            content.where.status = '已完';
             break;
     }
     getList();

+ 8 - 3
pages/workOrder/modules/vCode.vue

@@ -10,9 +10,10 @@
                     <up-input placeholder="完工验证码" v-model="code" :focus="downTime == 59">
                         <!-- #endif -->
                         <template #suffix>
-                            <up-button @tap="getCode" :disabled="downTime != 0" :text="tips" type="success" size="mini">{{
-                                downTime == 0 ? '重新发送验证码' : downTime +
-                                    '秒重新获取' }}</up-button>
+                            <up-button @tap="getCode" :disabled="downTime != 0" :text="tips" type="success"
+                                size="mini">{{
+                                    downTime == 0 ? '重新发送验证码' : downTime +
+                                        '秒重新获取' }}</up-button>
                         </template>
                         <!-- #ifndef APP-NVUE -->
                     </up-input>
@@ -68,6 +69,10 @@ function completion(e) {
             }).then(res => {
                 console.log("完结工单", res)
                 if (res.code == 1) {
+                    uni.showToast({
+                        title: '工单成功完结',
+                        icon: 'none'
+                    });
                     setTimeout(() => {
                         showModal.value = false;
                         code.value = '';

+ 1 - 1
pages/workOrder/snatchingOrders.vue

@@ -20,7 +20,7 @@
             <view class="user">
                 {{ item.customername + ' ' + item.customerphonenumber }}
             </view>
-            <view v-if="content.where.status != '已完'" class="but-box" @click.stop>
+            <view v-if="content.where.status != '已完'" class="but-box" @click.stop>
                 <view class="but-box-item" @click="openModel(item)">
                     <My-button :customStyle="{
                         height: '70rpx',