jbb před 2 roky
rodič
revize
6fd5133b16

+ 7 - 1
src/api/document/order.js

@@ -14,4 +14,10 @@ const syncy = params => getAction('/sys/quartzJob/execute', params)
 //单条同步
 const oneSyncy = params => postAction('/orderData/syOrderData/tongBu', params)
 
-export { orderList, orderByNum, syncy,oneSyncy }
+//订单数据同步接口-分页列表查询销售订单
+const salesOrder = params => getAction('/orderData/sySOAndOM/querySOList', params)
+
+//订单数据同步接口-分页列表查询委外订单
+const subcontractOrder = params => getAction('/orderData/sySOAndOM/queryOMList', params)
+
+export { orderList, orderByNum, syncy,oneSyncy,salesOrder,subcontractOrder}

+ 37 - 13
src/views/order/manualModal.vue

@@ -99,6 +99,7 @@
   import moment from 'moment'
   import { syDeclarationElementsAdd,queryLatelyDeclarationElements } from '@api/document/shipmentList'
   import {Dictionaries} from '@api/document/book.js'
+  import {salesOrder } from '@api/document/order'
   
   export default {
     name: 'manualModal', // 报关要素
@@ -112,18 +113,7 @@
         queryParam:{},
         manualModVis:false,
         confirmLoading: false,
-        manualData:[
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        {id:1,priceRemarks:2},
-        ],
+        manualData:[ ],
         manualColumns:[
         {
           title: '销售订单账套号',
@@ -206,9 +196,43 @@
 
     },
     methods: {
+      //获取数据
+      getData(){
+      var that = this;
+      // that.spinIsShow = true;
+      this.loading = true
+      this.$nextTick(() => {
+        salesOrder(this.queryParam).then(res => {
+          debugger
+          // that.spinIsShow = false;
+          this.loading = false
+          if (res.success) {
+            debugger
+            that.orderListData = res.result.records;
+            that.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          }else{
+              that.$message.error(res.message);
+          }
+          
+        })
+      })
+      },
         //查询 
         searchQuery(){
-
+          if(this.queryParam.account == '' || !this.queryParam.account){
+            debugger
+             this.$message.error('请选择账套')
+          }else if(this.queryParam.orderNumber == '' || !this.queryParam.orderNumber){
+            debugger
+            this.$message.error('请选择销售订单号')
+          }else{
+            debugger
+            this.getData()
+          }
         },
         //重置
         searchReset(){

+ 1 - 2
src/views/order/orderList.vue

@@ -146,7 +146,7 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import OrderDetailDrawer from '@views/order/orderDetailDrawer.vue'
 import manualModal from '@views/order/manualModal.vue'
-import { orderList, syncy,oneSyncy } from '@api/document/order'
+import { orderList, syncy,oneSyncy} from '@api/document/order'
 export default {
   name: 'OrderList', // 【单证】 订单数据
   mixins: [JeecgListMixin],
@@ -348,7 +348,6 @@ export default {
     //手工匹配订单
     getManualList(){
       this.$refs.manualModal.manualModVis = true
-      debugger
     },
     // 查询按钮
     searchQuery() {