build:地址导入

src/components/in-address-model/index.vue

@@ -440,7 +440,6 @@ export default {
           this.loading = false;
           return;
         }
-        this.loading = false;
         let list = JSON.parse(JSON.stringify(order_addr));
         this.$emit("refresh", { list: list });
       }

src/views/goodStore/active/components/baseForm.vue

@@ -140,7 +140,7 @@
               <el-table-column prop="good_name" label="商品名称" show-overflow-tooltip />
 
               <template v-if="Number(sitem.status) > 3">
-                <el-table-column prop="is_activity" label="是否使用结算单价" width="110px">
+                <el-table-column prop="is_activity" label="是否使用结算单价" width="120px">
                   <template slot-scope="scope">
                     <span>{{scope.row.is_activity === '1' ? '是' : '否'}}</span>
                   </template>

src/views/goodStore/active/components/finance-exam-three-form.vue

@@ -71,7 +71,7 @@
         label="商品名称"
         show-overflow-tooltip
       />
-      <el-table-column prop="is_activity" label="是否使用结算单价" width="110px">
+      <el-table-column prop="is_activity" label="是否使用结算单价" width="120px">
           <template slot-scope="scope">
              <span>{{scope.row.is_activity === '1' ? '是' : '否'}}</span>
           </template>

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -236,7 +236,7 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import outOrderAddModel from "./out-order-add-model";
 import addModel from "@/views/sellOut/sellReturn/components/addModel";
-import inAddrModel from "@/components/in-addr-model";
+import inAddrModel from "@/components/in-address-model";
 import addReturnAllModel from "./addReturnAllModel";
 import { mapGetters } from "vuex";
 
@@ -427,6 +427,7 @@ export default {
             message: "",
           });
           this.showModelThis = false;
+          this.addrmodel = false;
           this.loading = false;
           // 刷新
           this.$emit("refresh");