国内贸易修改

src/views/businessManagement/deliveryNotice/index.vue

@@ -329,6 +329,7 @@ export default {
     onLoad(page, params) {
       if (this.search.businessDate.length > 0) {
         params = {
+          ...this.search,
           ...params,
           businessStartDate: this.search.businessDate[0]+ " " + "00:00:00",
           businessEndDate: this.search.businessDate[1]+ " " + "23:59:59",

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -20,8 +20,8 @@
   "searchSpan": 8,
   "column": [
     {
-      "label": "销售订单号",
-      "prop": "orgOrderNo",
+      "label": "采购订单号",
+      "prop": "orderNo",
       "search": true,
       "index": 1,
       "width": 100,
@@ -135,7 +135,7 @@
     },
     {
       "label": "来源单号",
-      "prop": "srcOrderNo",
+      "prop": "orgOrderNo",
       "search": false,
       "index": 13,
       "width": 100,

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -543,7 +543,7 @@ export default {
             ]
           }, {
             label: '来源单号',
-            prop: 'srcOrderNo',
+            prop: 'orgOrderNo',
             rules: [
               {
                 required: false,

src/views/businessManagement/purchaseOrder/index.vue

@@ -303,6 +303,7 @@ export default {
     onLoad(page, params) {
       if (this.search.requiredArrivalDate.length > 0) {
         params = {
+          ...this.search,
           ...params,
           requiredArrivalStartDate: this.search.requiredArrivalDate[0]+ " " + "00:00:00",
           requiredArrivalEndDate: this.search.requiredArrivalDate[1]+ " " + "23:59:59",

src/views/businessManagement/receipt/index.vue

@@ -332,6 +332,7 @@ export default {
     onLoad(page, params) {
       if (this.search.businessDate.length > 0) {
         params = {
+          ...this.search,
           ...params,
           businessStartDate: this.search.businessDate[0]+ " " + "00:00:00",
           businessEndDate: this.search.businessDate[1]+ " " + "23:59:59",

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -38,7 +38,7 @@
   "column": [
     {
       "label": "销售订单号",
-      "prop": "orgOrderNo",
+      "prop": "orderNo",
       "search": true,
       "index": 1,
       "width": 100,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -617,7 +617,7 @@ export default {
       saveLoading: false,
       disabled: false,
       form: {},
-      billType:"销售",  //账单类型
+      billType:"收费",  //账单类型
       billData:{},     //账单需要数据
       applySettlementDialog:false,//生成账单组件
       configuration: {
@@ -1118,7 +1118,7 @@ export default {
             ]
           }, {
             label: '销售订单号',
-            prop: 'orgOrderNo',
+            prop: 'orderNo',
             disabled: true,
             rules: [
               {
@@ -1478,6 +1478,20 @@ export default {
       this.pageLoading = false
       let goodsData = []
       res.data.forEach(item => {
+        getMarketPrice({code: item.code}).then(res => {
+          if (res.data.data.length > 0) {
+            this.$set(item, 'price', res.data.data[0].salesPrice)
+          } else {
+            this.$set(item, 'price', '0')
+          }
+        })
+        getPurchasePrice({code: item.code}).then(res => {
+          if (res.data.data.length > 0) {
+            this.$set(item, 'purchaseAmount', res.data.data[0].purchasePrice)
+          } else {
+            this.$set(item, 'purchaseAmount', '0')
+          }
+        })
         this.$set(item, 'priceType', '一般')
         this.$set(item, 'actualQuantity', '0')
         this.$set(item, 'purchaseAmount', '0')
@@ -1742,7 +1756,20 @@ export default {
             this.$set(this.tableData[item], 'orderQuantity', 0)
             this.$set(this.tableData[item], 'actualQuantity', 0)
             this.$set(this.tableData[item], 'purchaseAmount', '0')
-            this.tableData[item].price = '0'
+            getMarketPrice({code: this.tableData[item].code}).then(res => {
+              if (res.data.data.length > 0) {
+                this.$set(this.tableData[item], 'price', res.data.data[0].salesPrice)
+              } else {
+                this.$set(this.tableData[item], 'price', '0')
+              }
+            })
+            getPurchasePrice({code: this.tableData[item].code}).then(res => {
+              if (res.data.data.length > 0) {
+                this.$set(this.tableData[item], 'purchaseAmount', res.data.data[0].purchasePrice)
+              } else {
+                this.$set(this.tableData[item], 'purchaseAmount', '0')
+              }
+            })
             this.tableData[item].amount = 0
             this.tableData[item].sort = this.maxGoodsNum + 1
             delete this.tableData[item].id

src/views/businessManagement/salesOrder/index.vue

@@ -345,6 +345,7 @@ export default {
     onLoad(page, params) {
       if (this.search.businesDate && this.search.businesDate.length > 0) {
         params = {
+          ...this.search,
           ...params,
           orderStartDate: this.search.businesDate[0]+ " " + "00:00:00",
           orderEndDate: this.search.businesDate[1]+ " " + "23:59:59",
@@ -375,6 +376,8 @@ export default {
     goBack() {
       this.detailData=this.$options.data().detailData
       this.isShow = true;
+      // console.log(this.search)
+      // this.onLoad(this.page, this.search)
     },
   }
 }