销售出库、退货

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

@@ -5,11 +5,11 @@
  */
 export default {
   orderOutReturnService: {
-    prefix: '/mdm-server/ivt/outbound/',
+    prefix: '/mdm-server/ivt/outbound_sale_return/',
     selectOutboundInfoById: 'select_outbound_info_by_id',
-    getOutboundForUpdate: 'get_outbound_for_update',
-    insertOutReturn: 'insert_out_return',
-    updateOutReturn: 'update_out_return',
+    getOutReturnForUpdate: 'get_out_return_for_update',
+    outboundInsert: 'outbound_insert',
+    outboundUpdate: 'outbound_update',
   }
 }
 

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

@@ -5,9 +5,11 @@
  */
 export default {
   orderOutService: {
-    prefix: '/mdm-server/ivt/outbound/',
+    prefix: '/mdm-server/ivt/outbound_sale_order/',
     selectOutboundInfoById: 'select_outbound_info_by_id',
     getOutboundForUpdate: 'get_outbound_for_update',
+    outboundInsert: 'outbound_insert',
+    outboundUpdate: 'outbound_update',
   }
 }
 

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

@@ -410,11 +410,11 @@ export default {
      */
     saveData() {
       if (this.type === this.$config.formMode.add) {
-        this.excute(this.$service.orderOutService, this.$service.orderOutService.insert, this.params);
-        this.$Message.success(this.$t('I_001', {'param': '保存'}))
-        this.close(false);
+        this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundInsert, 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.orderOutService, this.$service.orderOutService.update, this.params);
+        return this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundUpdate, this.params);
       }
     },
 

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

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

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

@@ -38,19 +38,20 @@
                  :page-size-opts="pageSizeOpts"
                  :page-size="pageInfo.pageSize"
                  name="table">
-          <DkTableColumn field="returnNo"></DkTableColumn>
+          <DkTableColumn field="outNo"></DkTableColumn>
           <DkTableColumn field="orderNo"></DkTableColumn>
           <DkTableColumn field="cusName"></DkTableColumn>
           <DkTableColumn field="cusPhone"></DkTableColumn>
           <DkTableColumn field="contactName"></DkTableColumn>
           <DkTableColumn field="addressFull"></DkTableColumn>
-          <DkTableColumn field="returnStatusName" title="退货状态"></DkTableColumn>
-          <DkTableColumn field="intoStatusName" title="入库状态"></DkTableColumn>
-          <DkTableColumn field="sumQuantity" :digits="0" sum></DkTableColumn>
-          <DkTableColumn field="sumAmount" :digits="2" sum></DkTableColumn>
+          <DkTableColumn field="outingQty" dataType="number" sum></DkTableColumn>
+          <DkTableColumn field="outingAmt" :digits="2" dataType="number" sum></DkTableColumn>
+          <DkTableColumn field="outQty" dataType="number" sum></DkTableColumn>
+          <DkTableColumn field="outAmt" :digits="2" dataType="number" sum></DkTableColumn>
+          <DkTableColumn field="outDate" data-type="date"></DkTableColumn>
+          <DkTableColumn field="outStatusName"></DkTableColumn>
           <DkTableColumn field="orgName"></DkTableColumn>
           <DkTableColumn field="staffName"></DkTableColumn>
-          <DkTableColumn field="pickupDate" :dataType="$config.columnType.date"></DkTableColumn>
           <DkTableColumn field="makeTime" :dataType="$config.columnType.dateTime"></DkTableColumn>
           <DkTableColumn field="makeStaffName"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch"/>
@@ -65,16 +66,18 @@
         <div v-show="visGoodsDetailFlag">
           <DkTable :id="'table-'+$options.name" ref="detail-select" :data="tableDataDetail_goodsDetail" showFooter
                    :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
-            <DkTableColumn field="outNo"></DkTableColumn>
+            <DkTableColumn field="skuModel"></DkTableColumn>
             <DkTableColumn field="skuName"></DkTableColumn>
             <DkTableColumn field="skuCode"></DkTableColumn>
-            <DkTableColumn field="itemQty" :title="$t('returnQty1')" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="priceReturn" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="itemAmt" :title="$t('returnAmt1')" :digits="2" sum></DkTableColumn>
-            <DkTableColumn field="intoingQty" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoingAmt" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoQty" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoAmt"></DkTableColumn>
+            <DkTableColumn field="outStatusName"></DkTableColumn>
+            <DkTableColumn field="outingQty" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outingAmt" :digits="2" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outQty" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outAmt" :digits="2" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="returnQty" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="returnAmt" :digits="2" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="priceOut"></DkTableColumn>
+            <DkTableColumn field="whName"></DkTableColumn>
             <DkTableColumn field="nonStdCode"></DkTableColumn>
             <DkTableColumn field="remarks"></DkTableColumn>
           </DkTable>
@@ -272,9 +275,9 @@ export default {
      */
     currentChange({row}) {
       this.loading = true
-      this.excuteNoParam(this.$service.orderOutReturnService, this.$service.orderOutReturnService.selectOutReturnInfoById, [row.returnId], false).then(res => {
+      this.excuteNoParam(this.$service.orderOutReturnService, this.$service.orderOutReturnService.selectOutboundInfoById, [row.outId], false).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.tableDataDetail_goodsDetail = res.data.outReturnItem;
+          this.tableDataDetail_goodsDetail = res.data.outboundItem;
         }
         this.loading = false
       })