xiaohaizhao 4 месяцев назад
Родитель
Сommit
40a72fe2d3
2 измененных файлов с 19 добавлено и 17 удалено
  1. 2 4
      pages/workOrder/detail.vue
  2. 17 13
      pages/workOrder/work.vue

+ 2 - 4
pages/workOrder/detail.vue

@@ -184,6 +184,8 @@ const steps = reactive([
 let sa_workorderid = 0;
 onLoad((options) => {
     sa_workorderid = options.id;
+    getDetail()
+    $Http.getDetail = getDetail;
 });
 
 onUnload(() => {
@@ -192,10 +194,6 @@ onUnload(() => {
 
 const time = ref(new Date().getTime());
 
-onShow(() => {
-    getDetail()
-})
-
 let detail = reactive({
     servicetype: ""
 });

+ 17 - 13
pages/workOrder/work.vue

@@ -69,8 +69,7 @@
                 </block>
             </view>
 
-            <up-form-item v-if="workpresetjson.confirm != 0"
-                label="确认信息" prop="confirm"
+            <up-form-item v-if="workpresetjson.confirm != 0" label="确认信息" prop="confirm"
                 :required="workpresetjson.confirm == 11">
                 <view class="options-box">
                     <view class="option" :class="form.confirm == item ? 'active' : ''"
@@ -492,17 +491,22 @@ async function save() {
     }).then(res => {
         loading.value = false;
         console.log("保存工单", res);
-        if (res.code == 1) {
-            loading.value = true;
-            upload.value.saveFileLinks('sa_workorder_node', data.sa_workorder_nodeid).then((s) => {
-                loading.value = false;
-            })
-            formModified.value = false;
-            uni.navigateBack()
-        }
-        setTimeout(() => {
-            uni.showToast({ title: res.code !== 1 ? res.msg : "保存成功", icon: 'none' });
-        }, 500);
+        if (res.code != 1) return wx.showModal({
+            title: '保存失败',
+            content: res.msg,
+            showCancel: false
+        });
+        loading.value = true;
+        upload.value.saveFileLinks('sa_workorder_node', data.sa_workorder_nodeid).then((s) => {
+            loading.value = false;
+        })
+        formModified.value = false;
+        uni.navigateBack({
+            success: () => {
+                $Http.getDetail && $Http.getDetail()
+                uni.showToast({ title: res.code !== 1 ? res.msg : "保存成功", icon: 'none' });
+            }
+        })
     })
 }