Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/views/order/index.vue

@@ -22,7 +22,13 @@
         :params="parameter.params"
         :config="configAutocompleteLc"
       />
-      <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
+      <!-- 产品名称 -->
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocompleteCp"
+      />
+      <!-- <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
         <el-option
           v-for="item in refineryList"
           :key="item.id"
@@ -30,7 +36,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <div class="buttons">
         <el-button icon="el-icon-search" @click="handleCurrentChange(1)"
           >查询</el-button
@@ -222,6 +228,14 @@ export default {
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },
+      configAutocompleteCp: {
+        serveTarget: serve.findByEntity,
+        autocompleteKey: "name",
+        labelKey: "refineryName",
+        valueKey: "id",
+        placeholder: "产品名称",
+        querykey: "refineryId",
+      },
       refineryTypeEnum: [
         {
           label: "普通炼厂",
@@ -328,13 +342,17 @@ export default {
     //下单取消
     orderCencle(row){
       if(row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'){
-        order.update({id:row.id,orderStatus:'CANCELED'}).then((res) => {
+        order.orderUpdate({id:row.id,orderStatus:'CANCELED'}).then((res) => {
           if(res.code==20000){
             this.getByPage()
           }
         });
       }else{
-
+        order.orderRefund({id:row.id}).then((res) => {
+          if(res.code==20000){
+            this.getByPage()
+          }
+        });
       }
     },
     //新增