其他费用

pages/generalServices/detail.vue

@@ -321,6 +321,7 @@ function openAllot() {
 }
 
 function changeUser() {
+    if (!workDetail.value.sa_workorderid) return;
     Handle.value.sa_workorderid = workDetail.value.sa_workorderid
     if (workDetail.value.team.length) {
         Handle.value.activeUser2 = workDetail.value.team[0]

pages/workOrder/changeMsg.vue

@@ -158,13 +158,13 @@ function save() {
     if (loading.value) return;
     uFormRef.value.validate().then(async valid => {
         if (valid) {
-            let content = {
+            let content = Object.assign(detail, {
                 "sa_workorderid": sa_workorderid,
                 sa_serviceorderid: detail.sa_serviceorderid,
                 ...form,
                 servicemileage: form.servicemileage || 0,
                 phonenumber: form.customerphonenumber || '',
-            };
+            });
             content.customerphonenumber = content.customerphonenumber || content.phonenumber;
             content.name = content.customername || '';
             content.sa_customersid = content.sa_customersid == '' ? content.sa_customersid : 0;

pages/workOrder/work.vue

@@ -106,6 +106,17 @@
                         </up-input>
                     </up-form-item>
                 </view>
+                <up-form-item prop="otheramount">
+                    <text style="margin-right: 20rpx;">
+                        其他费用
+                    </text>
+                    <up-input v-model="form.otheramount" @change="changeAmount($event, 'otheramount')" type="digit"
+                        placeholder="其他费用">
+                        <template #suffix>
+                            元
+                        </template>
+                    </up-input>
+                </up-form-item>
                 <up-form-item label="总费用" prop="amountpay" :required="workpresetjson.amountpay == 11">
                     <up-input :disabled="true" v-model="form.amountpay" type="digit" placeholder="总费用">
                         <template #suffix>
@@ -189,12 +200,15 @@ function beforeleave(e) {
 function changeAmount(e, key) {
     let door = parseFloat(form.dooramount) || 0;
     let acc = parseFloat(form.accessoryamount) || 0;
+    let other = parseFloat(form.otheramount) || 0;
     if (key == 'dooramount') {
         door = parseFloat(e) || 0;
-    } else {
+    } else if (key == 'accessoryamount') {
         acc = parseFloat(e) || 0;
+    } else if (key == 'otheramount') {
+        other = parseFloat(e) || 0;
     }
-    form.amountpay = door + acc;
+    form.amountpay = door + acc + other;
 }
 
 // 去添加配件
@@ -300,6 +314,7 @@ let formToContent = (form) => {
     }
     if (content.amount === '') content.amount = 0;
     if (content.dooramount === '') content.dooramount = 0;
+    if (content.otheramount === '') content.otheramount = 0;
     if (content.accessoryamount === '') content.accessoryamount = 0;
     return content;
 }
@@ -354,6 +369,7 @@ onLoad(() => {
     if (workpresetjson.amountpay != 0) {
         form.dooramount = data.dooramount || 0;
         form.accessoryamount = data.accessoryamount || 0;
+        form.otheramount = data.otheramount || 0;
         $Http.basic({
             "id": "2025112114461803",
             "sa_workorderid": data.sa_workorderid,