Merge branch 'green' into allTestUrgent

src/bgj/serviceAppointment/index.vue

@@ -51,7 +51,7 @@
                         clearable
                     >
                         <el-option
-                            v-for="item in options.serviceworktype"
+                            v-for="item in options.servicebookingtype"
                             :key="item.value"
                             :label="$t(item.value)"
                             :value="item.value"
@@ -165,7 +165,7 @@ export default {
     data() {
         return {
             options: {
-                serviceworktype: [],
+                servicebookingtype: [],
             },
             where: {
                 status: [], //工单状态，可多选

src/bgj/serviceAppointment/modules/changeBill.vue

@@ -11,6 +11,7 @@
             :show-close="false"
             :visible.sync="dialogFormVisible"
             size="600px"
+            @close="onCancel"
         >
             <div slot="title" style="font-size: 15px">
                 <span style="margin-right: 16px"
@@ -123,7 +124,7 @@
             <div class="fixed__btn__panel">
                 <el-button
                     size="small"
-                    @click="dialogFormVisible = false"
+                   @click="onCancel"
                     class="normal-btn-width"
                     >{{ $t("取 消") }}</el-button
                 >
@@ -201,9 +202,14 @@ export default {
                 });
                 this.tool.showMessage(res, () => {
                     this.$emit("onSuccess");
+                    this.$refs["form"].resetFields();
                     this.dialogFormVisible = false;
                 });
             });
+        },
+         onCancel() {
+            this.dialogFormVisible = false;
+            this.$refs["form"].resetFields();
         },
         modelChange(data) {
             this.form.type = this.serveModelList.find(