订单 发票列表 高级搜索默认供应商和订单ID

src/views/myOrder/orderInvoice/components/HighSearch.vue

@@ -13,22 +13,23 @@
             <textarea :value="consignor" class="inputInfo" type="text"></textarea>
             <div contenteditable="true" class="inputInfo">{{consignor}}</div>
           </div> -->
-          <div class="high-info" @click="showPost('supplier')">
+          <!-- <div class="high-info" @click="showPost('supplier')"> -->
+          <div class="high-info">
             <div class="title font-bold font-16">供应商</div>
-            <div contenteditable="false" class="inputInfo">{{supplier}}</div>
+            <div class="inputInfo">{{supplier}}</div>
           </div>
           <div class="high-info">
             <div class="title font-bold font-16">订单号</div>
-            <!-- <div contenteditable="true" class="inputInfo">{{orderNo}}</div> -->
-            <input :value="orderNo" class="input" type="text">
+            <div class="inputInfo">{{orderNo}}</div>
+            <!-- <input :value="orderNo" class="input" type="text"> -->
           </div>
           <div class="high-info">
             <div class="title font-bold font-16">发票号</div>
-            <input :value="invoiceNo" class="input" type="text">
+            <input :value="invoiceNo" placeholder="请输入发票号" class="input" type="text">
           </div>
-          <div class="high-info" @click="showPost('goods')">
-            <div class="title font-bold font-16">商品</div>
-            <div contenteditable="false" class="inputInfo">{{goods}}</div>
+          <div class="high-info">
+            <div class="title font-bold font-16">商品信息</div>
+            <div contenteditable="true" placeholder="请输入编码/品名/规格/生产厂家" class="inputInfo">{{goods}}</div>
           </div>
           <!-- <div class="high-info" @click="showPost('client')">
             <div class="title font-bold font-16">客户</div>
@@ -89,12 +90,12 @@
         @cancleclick="showPost"
         @confirmclick="postConfirm"
       ></search-in-consignor>
-      <cg-search-goods
+      <search-goods
         v-model="moreSearchDialog.goodsShow"
         :customer="!moreSearchInfo.goods ? {}:moreSearchInfo.goods"
         @cancleclick="showPost"
         @confirmclick="postConfirm"
-      ></cg-search-goods>
+      ></search-goods>
       <search-in-client
         v-model="moreSearchDialog.clientShow"
         :customer="!moreSearchInfo.client ? {}:moreSearchInfo.client"
@@ -113,7 +114,7 @@ import SearchInSupplier from "@/components/SearchInSupplier";
 // 货主
 import SearchInConsignor from "@/components/SearchInConsignor";
 // 商品
-import CgSearchGoods from "@/components/CgSearchGoods";
+import SearchGoods from "@/components/SearchGoods";
 // 客户
 import SearchInClient from "@/components/SearchInClient"
 export default {
@@ -121,7 +122,7 @@ export default {
   components: {
     TimeChoose,
     SearchInSupplier,
-    CgSearchGoods,
+    SearchGoods,
     SearchInConsignor,
     SearchInClient
   },
@@ -150,14 +151,15 @@ export default {
       chinfo: {
         goodsId: '',
         supplier: ''
-      }
+      },
+      orderModel: {}
     }
   },
   computed: {
     // 供应商
     supplier () {
-      if (this.moreSearchInfo.supplier.comPartyId) {
-        return !this.moreSearchInfo.supplier ? '' : (this.moreSearchInfo.supplier.comPartyId + '/(' + this.moreSearchInfo.supplier.partyOpcode + ')' + this.moreSearchInfo.supplier.partyName)
+      if (this.orderModel.supplierName) {
+        return !this.orderModel.supplierName ? '' : this.orderModel.supplierName
       } else {
         return ''
       }
@@ -193,8 +195,8 @@ export default {
     },
     // 订单号
     orderNo () {
-      if (this.moreSearchInfo.orderNo) {
-        return !this.moreSearchInfo.orderNo ? '' : this.moreSearchInfo.orderNo
+      if (this.orderModel.orderNo) {
+        return !this.orderModel.orderNo ? '' : this.orderModel.orderNo
       } else {
         return ''
       }
@@ -221,6 +223,10 @@ export default {
   watch: {
     value (val) {
       this.moreSearchShow = val
+      if (val) {
+        this.orderModel = this.$route.query
+        console.log(this.orderModel)
+      }
       // this.time = JSON.parse(JSON.stringify(this.choosetime))
     },
     moreSearchShow (val) {
@@ -343,6 +349,10 @@ export default {
           overflow-y: auto;
           padding: 5PX;
         }
+        .inputInfo:empty::before {
+           content: attr(placeholder);
+           color: #999999;
+        }
         .input {
           color: #666666;
           width: 100%;

src/views/myOrder/orderInvoice/index.vue

@@ -31,7 +31,8 @@ export default {
           end: getFormateDate(new Date(), "yyyy-MM-dd"),
         },
       },
-      invoiceList: []
+      invoiceList: [],
+      orderModel: {}
     }
   },
   computed: {