From d3a85324d1a73ee38c5ebc08926efa4edc489aae Mon Sep 17 00:00:00 2001
From: lixuan <lixuan@163.com>
Date: Mon, 27 Feb 2023 16:53:38 +0800
Subject: [PATCH] xiugai

---
 src/views/order/components/billOfLading.vue |  5 ++++-
 src/views/order/index.vue                   |  4 ++--
 src/views/product/components/create.vue     | 11 ++++++++---
 src/views/product/index.vue                 |  6 +++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue
index 22e417a..dd36e1e 100644
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -229,6 +229,8 @@ export default {
             // this.$set(this.billData.list,this.billData.index,this.billAddData)
             this.$message.success(res.msg)
             this.dialogDelivery = false
+            this.$forceUpdate()
+            this.$emit("closeWindow")
           }
         })
     },
@@ -248,6 +250,7 @@ export default {
               // this.$set(this.billData.list,index,this.billAddData)
               this.$message.success(res.msg)
               this.dialogBillAdd = false
+              this.$emit("closeWindow");
             }
           })
         })
@@ -367,8 +370,8 @@ export default {
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
-      this.$refs.form.clearValidate();
       this.controlWindows.bill = false;
+      this.$refs.form.clearValidate();
     },
   },
 };
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 1d83b14..9a465a6 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -134,7 +134,7 @@
             <el-link type="primary" :underline="false" @click="detail(row)"
               >详情</el-link
             >
-            <el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'" type="primary" :underline="false" @click="billOfLading(row)"
+            <el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'&&row.payStatus!=='REFUNDED'" type="primary" :underline="false" @click="billOfLading(row)"
               >提货单</el-link
             >
             <el-popconfirm
@@ -151,7 +151,7 @@
               icon-color="red"
               @confirm="orderCencle(row)"
             >
-              <el-link v-show="row.orderStatus!=='CANCELED'" slot="reference" type="primary" :underline="false"
+              <el-link v-show="row.orderStatus!=='CANCELED'&&row.payStatus!=='REFUNDED'" slot="reference" type="primary" :underline="false"
                 >{{row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'?'订单取消':'订单退款'}}</el-link
               >
             </el-popconfirm>
diff --git a/src/views/product/components/create.vue b/src/views/product/components/create.vue
index 6ea0141..76e91ad 100644
--- a/src/views/product/components/create.vue
+++ b/src/views/product/components/create.vue
@@ -98,7 +98,6 @@
 
 <script>
 import serve from "api/product.js";
-import refineryInfoServe from "api/refineryInfo.js";
 
 import autocomplete from "components/autocomplete/index.vue";
 export default {
@@ -139,7 +138,7 @@ export default {
       refineryList: [],
       productRowData:{},
       configAutocomplete: {
-        serveTarget: refineryInfoServe.findByEntity,
+        serveTarget: serve.findByEntity,
         autocompleteKey: "refineryName",
         labelKey: "refineryName",
         valueKey: "id",
@@ -216,7 +215,13 @@ export default {
         enableMark:'ENABLE'
       }
       await serve.getRefineryProductList(data).then((res) => {
-       this.productNameList = res.data;
+        if(res.data.length>0){
+          this.productNameList = res.data;
+        }else{
+          this.productNameList = []
+          this.form.productId = ''
+        }
+       
       })
       // this.form.productId = this.productNameList[0].productId
         console.log(this.productRowData,this.productNameList,'aaaaaaaaaa')
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 2f9684a..81420d5 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -269,9 +269,9 @@ export default {
         },
       ],
       configAutocomplete: {
-        serveTarget: refineryInfoServe.findByEntity,
-        autocompleteKey: "refineryName",
-        labelKey: "refineryName",
+        serveTarget: serve.findByEntity,
+        autocomplateKey: "refineryName",
+        valueKey: "refineryName",
         valueKey: "id",
         placeholder: "炼厂名称",
         querykey: "refineryId",