xiugai

src/views/order/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="order">
     <div class="frame">
+      <el-input class="mr20" v-model="parameter.params.id" placeholder="订单编号" clearable></el-input>
         <!-- 公司名称 -->
       <autocomplete
           class="mr20"
@@ -23,11 +24,11 @@
         :config="configAutocompleteLc"
       />
       <!-- 产品名称 -->
-      <autocomplete
+      <!-- <autocomplete
         class="mr20"
         :params="parameter.params"
         :config="configAutocompleteCp"
-      />
+      /> -->
       <!-- <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
         <el-option
           v-for="item in refineryList"
@@ -115,7 +116,7 @@
           minWidth="180"
         >
           <template slot-scope="{ row }">
-            <span>{{ row.actAmount }} / {{ row.preAmount }} 元</span>
+            <span>{{ row.actAmount?row.actAmount:'--' }} / {{ row.preAmount?row.preAmount:'--' }} 元</span>
           </template>
         </el-table-column>
         <el-table-column label="时间" minWidth="235">
@@ -196,6 +197,7 @@
 <script>
 import serve from "api/refineryInfo.js";
 import commonServe from "api/common.js";
+import productApi from "api/product.js";
 import order from "api/order.js";
 import generalDetails from "components/generalDetails/index.vue";
 import autocomplete from "components/autocomplete/index.vue";
@@ -229,12 +231,12 @@ export default {
         querykey: "refineryId",
       },
       configAutocompleteCp: {
-        serveTarget: serve.findByEntity,
+        serveTarget: productApi.getRefineryProductList,
         autocompleteKey: "name",
         labelKey: "refineryName",
         valueKey: "id",
         placeholder: "产品名称",
-        querykey: "refineryId",
+        querykey: "productId",
       },
       refineryTypeEnum: [
         {
@@ -275,7 +277,8 @@ export default {
   components: {
     generalDetails,
     billOfLading,
-    autocomplete
+    autocomplete,
+    productApi
   },
   mounted() {
     this.$nextTick(() => {