Merge branch 'lin_增值服务' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/userManagement/masterManagement/index.vue

@@ -65,7 +65,8 @@ export default {
       /** 表单变量 */
       formData: {
         type: '工程师',
-        examineRemark: ''
+        examineRemark: '',
+        examineStatus:''
       },
       examineStatus: ''
     }

src/views/workOrder/workOrderPool/index.vue

@@ -99,7 +99,7 @@ export default {
         {
           name: '工单状态',
           key: 'orderStatus',
-          value: this.$route.query.orderStatus || "",
+          value: this.pageType == "orderStatus" && this.pageCode ? this.pageCode : "",
           conditions: [{
             label: "全部",
             value: ""
@@ -204,23 +204,23 @@ export default {
   },
   methods: {
     initFun() {
-      if(this.pageType == "detail"){
+      if (this.pageType == "detail") {
         this.id = this.pageCode
         this.$nextTick(() => {
           this.detailFormBool = true
         })
       }
-      
-      if(this.pageType == "saleOrderId"){
+
+      if (this.pageType == "saleOrderId") {
         this.defaultSearchData = [{ "param": "a.sale_order_id", "compare": "=", "value": this.pageCode, label: "销售订单号" }]
       }
 
 
-      if(this.pageType == "pgIncreItemId"){
+      if (this.pageType == "pgIncreItemId") {
         this.defaultSearchData = [{ "param": "a.pg_incre_order_id", "compare": "=", "value": this.pageCode, label: "增置服务明细ID" }]
       }
 
-      if(this.pageType == "rpProjectRepairId"){
+      if (this.pageType == "rpProjectRepairId") {
         this.defaultSearchData = [{ "param": "a.rp_project_repair_id", "compare": "=", "value": this.pageCode, label: "维保配置ID" }]
       }
     },