内贸修改

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="borderless">
+  <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
@@ -269,8 +269,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeGoods">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -310,8 +310,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeFees">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -690,10 +690,23 @@ export default {
       oldUploadList: [],
       // 导入销售订单明细
       marketDialog: false,
+      // 弹窗高度
+      rowHeight: '',
+      // 查询时loading页面
+      pageLoading: false,
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.rowHeight = (window.innerHeight - 130) + 'px'
+      }
+    })
+  },
   //初始化查询
   async created() {
+    this.rowHeight = (window.innerHeight - 130) + 'px'
     this.customerContact = await this.getColumnData(this.getColumnName(21), customerContact);
     this.advantageProject = await this.getColumnData(this.getColumnName(22), advantageProject);
     this.getWorkDicts("order_status").then(res => {
@@ -1243,6 +1256,8 @@ export default {
             } else {
               this.queryData(res.data.data.id)
             }
+          }).catch(() => {
+            this.saveLoading = false
           })
         } else {
           return false;
@@ -1326,6 +1341,15 @@ export default {
     // 导入销售明细
     importMarket(list) {
       console.log(list)
+      list.forEach(item => {
+        item.cname = item.priceCategoryNames
+        delete item.id
+        delete item.createTime
+        delete item.createUser
+        delete item.pid
+        this.$refs.crudContact.rowCellAdd(item);
+      })
+      this.marketDialog = false;
     },
     // 关闭销售弹窗
     closeMarkeDialog() {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="borderless">
+  <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
@@ -264,8 +264,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeGoods">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -305,8 +305,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeFees">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -586,10 +586,23 @@ export default {
       oldGoodsList: [],
       oldFeesList: [],
       oldUploadList: [],
+      // 弹窗高度
+      rowHeight: '',
+      // 查询时loading页面
+      pageLoading: false,
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.rowHeight = (window.innerHeight - 130) + 'px'
+      }
+    })
+  },
   //初始化查询
   async created() {
+    this.rowHeight = (window.innerHeight - 130) + 'px'
     // this.customerContact = customerContact
     this.customerContact = await this.getColumnData(this.getColumnName(18), customerContact);
     this.advantageProject = await this.getColumnData(this.getColumnName(19), advantageProject);
@@ -823,7 +836,6 @@ export default {
     },
     //费用编辑导入触发
     choiceCost() {
-      console.log('1111')
       if (this.tableDataCost.length === 1) {
         this.advantageProjectData[this.choiceIndex].feeName = this.tableDataCost[0].cname
         this.advantageProjectData[this.choiceIndex].itemId = this.tableDataCost[0].id
@@ -834,7 +846,6 @@ export default {
     },
     //费用导入触发
     importCost() {
-      console.log('111111')
       // this.advantageProjectForm = this.advantageProjectForm.concat(this.tableDataCost)
       if (this.tableDataCost.length > 0) {
         for (let item in this.tableDataCost) {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="borderless">
+  <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
@@ -262,8 +262,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeGoods">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -303,8 +303,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeFees">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -662,10 +662,23 @@ export default {
       oldGoodsList: [],
       oldFeesList: [],
       oldUploadList: [],
+      // 弹窗高度
+      rowHeight: '',
+      // 查询时loading页面
+      pageLoading: false,
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.rowHeight = (window.innerHeight - 130) + 'px'
+      }
+    })
+  },
   //初始化查询
   async created() {
+    this.rowHeight = (window.innerHeight - 130) + 'px'
     this.customerContact = await this.getColumnData(this.getColumnName(24), customerContact);
     this.advantageProject = await this.getColumnData(this.getColumnName(25), advantageProject);
     this.getWorkDicts("procurement_method").then(res => {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="borderless">
+  <div class="borderless" v-loading="pageLoading">
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
@@ -333,8 +333,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeGoods">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -375,8 +375,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closePolicy">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -424,8 +424,8 @@
         :destroy-on-close="true"
         :close-on-press-escape="false"
         @close="closeFees">
-      <el-row style="height: 0;">
-        <el-col :span="5">
+      <el-row :style="{height: rowHeight}">
+        <el-col :span="5" style="height: 100%;overflow-y: auto">
           <div>
             <el-scrollbar>
               <basic-container>
@@ -1045,10 +1045,23 @@ export default {
       purchasePriceOption: [],
       // 销售价格
       salesPriceOtion: [],
+      // 弹窗高度
+      rowHeight: '',
+      // 查询时loading页面
+      pageLoading: false,
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.rowHeight = (window.innerHeight - 130) + 'px'
+      }
+    })
+  },
   //初始化查询
   async created() {
+    this.rowHeight = (window.innerHeight - 130) + 'px'
     this.customerContact = await this.getColumnData(this.getColumnName(15), customerContact);
     this.advantageProject = await this.getColumnData(this.getColumnName(16), advantageProject);
     this.getWorkDicts("payment_term").then(res => {
@@ -1083,6 +1096,7 @@ export default {
       row.itemId = event.id
     },
     queryData(id, isCopy = false){
+      this.pageLoading = true
       detail(id).then(res => {
         this.form = res.data.data;
         this.contactsData = this.form.orderItemsList
@@ -1135,11 +1149,6 @@ export default {
           goodsNum.push(item.sort)
           purchaseAmount += Number(item.purchaseAmount)
         })
-        // if (Number(this.form.grossProfit) != 0) {
-        //   this.form.grossProfitRate = (((Number(this.form.grossProfit) - Number(purchaseAmount)) / Number(this.form.grossProfit)) * 100).toFixed(2)
-        // } else {
-        //   this.form.grossProfitRate = '0.00'
-        // }
         if (goodsNum.length == 0) {
           this.maxGoodsNum = 0;
         } else {
@@ -1176,6 +1185,7 @@ export default {
         }
       }).finally(() => {
         this.saveLoading = false
+        this.pageLoading = false
       });
     },
     // 复制新单
@@ -1978,4 +1988,17 @@ export default {
 ::v-deep .el-form-item__content{
   line-height: 32px;
 }
+///deep/ .avue-tree {
+//  display: flex;
+//  flex-direction: column;
+//  overflow-y: hidden;
+//  height: 100%;
+//}
+///deep/ .avue-tree__filter {
+//  flex-shrink: 1;
+//}
+///deep/ .avue-tree__content {
+//  height: calc(100% - 32px);
+//  overflow-y: auto;
+//}
 </style>

src/views/businessManagement/salesOrder/index.vue

@@ -118,8 +118,8 @@ export default {
   },
   async created() {
     this.search.businesDate = defaultDate(1)
-    this.option = option
-    // this.option = await this.getColumnData(this.getColumnName(14), option);
+    // this.option = option
+    this.option = await this.getColumnData(this.getColumnName(14), option);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++