Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/pre-book/preBookList.vue

@@ -307,27 +307,30 @@ export default {
 
     //  详情
     details(record) {
-      this.$refs.addPreBookDrawer.visible = true
+      
       // console.log('点击项的ID', record.id)
       preBookById({ id: record.id }).then(res => {
         if (res.success) {
-          console.log('点击的对象', res.result)
           // 把通过id查询到的对象，赋值给子组件
-          this.$refs.addPreBookDrawer.preBookDetails = res.result //主表
-          this.$refs.addPreBookDrawer.data = res.result.syLetterDepositItemList //子表
+          this.$refs.detailsPreBookDrawer.preBookDetails = res.result; //主表
+          this.$refs.detailsPreBookDrawer.data = res.result.syLetterDepositItemList; //子表
+          this.$refs.detailsPreBookDrawer.visible = true
+        }else{
+          this.$message.error(res.message)
         }
       })
     },
 
     //  编辑
     edit(record) {
-      this.$refs.editPreBookDrawer.visible = true
+      
       preBookById({ id: record.id }).then(res => {
         if (res.success) {
-          console.log('编辑对象', res.result)
-          // console.log('子表信息', res.result.syShippingDetailsItemList)
-          this.$refs.editPreBookDrawer.editPreBook = res.result
-          this.$refs.editPreBookDrawer.data = res.result.syLetterDepositItemList
+          this.$refs.addPreBookDrawer.addPreBook = res.result;
+          this.$refs.addPreBookDrawer.data = res.result.syLetterDepositItemList;
+          this.$refs.editPreBookDrawer.visible = true
+        }else{
+          this.$message.error(res.message)
         }
       })
     },

src/views/reportForms/order-statistics/external-statistics.vue

@@ -192,6 +192,7 @@ export default {
     // 初次加载当月数据（列表、图）
     getThisMonthData() {
       this.$nextTick(() => {
+        this.loading = true;
         // let nowDate = new Date()
         // let date = {
         //   year: nowDate.getFullYear(),
@@ -210,7 +211,7 @@ export default {
           // 参数给 chart
           this.$refs.departmentChart.queryParam = this.queryParam
           this.$refs.customerChart.queryParam = this.queryParam
-
+          this.loading = false;
           if (res.success) {
             this.extStadata = res.result.records;
             this.pagination = {
@@ -226,8 +227,10 @@ export default {
     // 查询订单统计
     getExternalData() {
       this.$nextTick(() => {
+        this.loading = true;
         this.queryParam.vendorType = '外部'
         externalList(this.queryParam).then(res => {
+          this.loading = false;
           // 参数给 chart
           this.$refs.departmentChart.queryParam = this.queryParam
           this.$refs.customerChart.queryParam = this.queryParam

src/views/reportForms/order-statistics/interior-statistics.vue

@@ -195,6 +195,7 @@ export default {
     // 初次加载当月数据（列表、图）
     getThisMonthData() {
       this.$nextTick(() => {
+        this.loading = true;
         //let nowDate = new Date()
         //let date = {
         //  year: nowDate.getFullYear(),
@@ -210,6 +211,7 @@ export default {
 
         this.queryParam.vendorType = '内部'
         externalList(this.queryParam).then(res => {
+          this.loading = false;
           // 参数给 chart
           this.$refs.departmentChart.queryParam = this.queryParam
           this.$refs.customerChart.queryParam = this.queryParam
@@ -232,8 +234,10 @@ export default {
     // 查询订单统计
     getExternalData() {
       this.$nextTick(() => {
+        this.loading = true;
         this.queryParam.vendorType = '内部'
         externalList(this.queryParam).then(res => {
+          this.loading = false;
           // 参数给 chart
           this.$refs.departmentChart.queryParam = this.queryParam