ymy 1 年間 前
コミット
dc8f326386

+ 8 - 0
src/api/cargoOwner.ts

@@ -38,4 +38,12 @@ export function disableMember(data : any) {
 		method: 'POST',
     params: data
 	})
+}
+//删除
+export function del(data : any) {
+	return request({
+		url: '/omsOrder/omsPartner/deleteById',
+		method: 'POST',
+    params: data
+	})
 }

+ 3 - 3
src/benyun/compVue/ModuleViewHandle.ts

@@ -47,11 +47,11 @@ export default class ModuleViewHandle extends VueViews{
     }
     if(!this.$refs[this.tableID]){
       if(this.timeNum > 4){
-        clearInterval(this.time)
+        return
       }
-      this.time =setInterval(()=>{
+      setTimeout(() => {
         this.getList()
-      },500) 
+      },500)
       this.timeNum ++;
       return
     }

+ 0 - 1
src/benyun/components/moduleView/moduleView.vue

@@ -216,7 +216,6 @@ export default class ModuleView extends ModuleViewHandle {
   }
   getFormValue(){
     if(this.$refs[this.formID]){
-      (this.$refs[this.formID] as any)
       return (this.$refs[this.formID] as any).getValue();
     }
     return null

+ 1 - 1
src/benyun/utils/request.ts

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 30000
 })
 
 // request拦截器

+ 33 - 1
src/views/oms/cargoOwner/index.vue

@@ -8,7 +8,7 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import {registerMember, updateMember, queryAll, queryById, disableMember} from '@/api/cargoOwner'
+import {registerMember, updateMember, queryAll, del, disableMember} from '@/api/cargoOwner'
 @Component({components:{}})
 export default class CargoOwner extends Vue {
   load=false;
@@ -92,6 +92,18 @@ export default class CargoOwner extends Vue {
             }]
           }
         }
+      },{
+        title:'操作',
+        action:true,
+        width:100,
+        plugins:[{
+          name:'删除',
+          event:{
+            click:(item:any) => {
+              this.del(item);
+            }
+          }
+        }]
       }]
     },
     modal:{
@@ -218,6 +230,26 @@ export default class CargoOwner extends Vue {
       this.getList()
     })
   }
+  del(item:any) {
+    this.$confirm('此操作将永久删除货主名称为 “'+item.wmsMemberName+'” 的数据, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      this.load = true;
+      del({id:item.id}).then(()=>{
+        this.load = false;
+        this.$message({
+          message:'删除成功!',
+          type:'success'
+        })
+        this.getList();
+      }).catch(()=>{
+        this.load = false;
+      })
+    }).catch(() => {});
+    
+  }
   validateLevel(rule:any, value:any, callback:any){
     if(value){
       if(Number(value) >=1 && Number(value) <= 99){

+ 1 - 0
src/views/oms/order/components/addOrder.vue

@@ -1574,6 +1574,7 @@ export default class AddOrder extends Vue {
       this.orderValue.receiverCountry="中华人民共和国";
       this.load = true;
       this.orderValue.isCod = this.orderValue.isCod ? 1 : 0
+      this.orderValue.freeAmount = this.orderValue.freeAmount ? this.orderValue.freeAmount : 0;
       addOrder(this.orderValue).then((res:any) => {
         if(n != 'continue'){
           this.value = false;