snow 2 anni fa
parent
commit
c38b47622e

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


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

@@ -96,7 +96,7 @@
           <el-tooltip
             style="margin: 3px 0 0 0"
             effect="dark"
-            content="退货"
+            content="无地址退货"
             class="fr"
             v-if="addr_res + '' !== '0' && powers.some((i) => i == '051')"
             placement="top"
@@ -109,7 +109,7 @@
           </el-tooltip>
           <el-tooltip
             effect="dark"
-            content="批量退货"
+            content="有地址批量退货"
             style="margin: 3px 0 0 8px"
             v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
             placement="top"
@@ -214,6 +214,7 @@ import addModel from "@/views/sellOut/sellReturn/components/addModel";
 import inAddrModel from "@/components/in-address-model";
 import addReturnAllModel from "./addReturnAllModel";
 import { mapGetters } from "vuex";
+import { Message, MessageBox } from "element-ui";
 
 export default {
   name: "salesOrderDetail",
@@ -443,8 +444,12 @@ export default {
           returnAddr: [],
         };
         this.returnItem = this.resModel;
-        this.returnModel = true;
-        //  scope.row.outCode
+
+        if(e === 0){
+          MessageBox.confirm('是否确定无地址退货').then(() => this.returnModel = true).catch(() => {})
+        } else {
+          this.returnModel = true
+        }
       } else {
         let tol = 0,
           send_num = 0;

Some files were not shown because too many files changed in this diff