Merge branch 'linwenxin_workOrder' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin into develop

src/views/workOrder/workOrderPool/index.vue

@@ -297,10 +297,10 @@ export default {
         if (pam.orderSmallType) {
           pam.params.push({ "param": "a.order_small_type", "compare": "=", "value": pam.orderSmallType })
         }
-        if (this.$route.query.saleOrderId) {
+        if (this.$route.query.saleOrderId && !pam.params.find(item => item.param == "a.sale_order_id")) {
           pam.params.push({ "param": "a.sale_order_id", "compare": "like", "value": this.$route.query.saleOrderId, label: "销售订单号" })
         }
-        if (this.$route.query.pgIncreItemId) {
+        if (this.$route.query.pgIncreItemId && !pam.params.find(item => item.param == "a.pg_incre_item_id")) {
           pam.params.push({ "param": "a.pg_incre_item_id", "compare": "like", "value": this.$route.query.pgIncreItemId, label: "增置服务明细ID" })
         }
         cb && cb(pam)