Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/api/pages/sale/order-out-return.js

@@ -5,9 +5,11 @@
  */
 export default {
   orderOutReturnService: {
-    prefix: '/mdm-server/sale/outReturn/',
-    selectOutReturnInfoById: 'select_out_return_info_by_id',
-    getOutReturnForUpdate: 'get_out_return_for_update',
+    prefix: '/mdm-server/ivt/outbound/',
+    selectOutboundInfoById: 'select_outbound_info_by_id',
+    getOutboundForUpdate: 'get_outbound_for_update',
+    insertOutReturn: 'insert_out_return',
+    updateOutReturn: 'update_out_return',
   }
 }
 

src/view/sale/order-return/form.vue

@@ -384,13 +384,13 @@ export default {
      */
     saveData() {
       if (this.type === this.$config.formMode.add) {
-        this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.insert, this.params);
-        this.$Message.success(this.$t('I_001', {'param': '保存'}))
-        this.close(false);
+        this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.insertOutReturn, this.params);
+        // this.$Message.success(this.$t('I_001', {'param': '保存'}))
+        // this.close(false);
       }
       //编辑
       else if (this.type === this.$config.formMode.edit) {
-        return this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.update, this.params);
+        return this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.updateOutReturn, this.params);
       }
       //入库办理
       else if(this.type === this.$config.formMode.handle){