zhujun vor 2 Jahren
Ursprung
Commit
2ea84b9c35

+ 1 - 0
src/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue

@@ -5,6 +5,7 @@
       v-if="visible"
       :visible.sync="visible"
       :title="title"
+      :append-to-body="true"
       :close-on-click-modal="false"
       width="80%"
       @close="cancel"

+ 11 - 1
src/views/saleManage/saleOrder/components/detailDialog.vue

@@ -270,6 +270,12 @@
       <div v-if="activeComp=='invoice'">
       <invoiceList :orderId="detailId"></invoiceList>
       </div>
+      <div v-if="activeComp=='returnorder'">
+      <returnGoodsList :orderId="detailId"></returnGoodsList>
+      </div>
+      <div v-if="activeComp=='accountstatement'">
+        <accountstatementList :orderId="detailId"></accountstatementList>
+      </div>
       <div slot="footer" class="footer">
         <el-button @click="cancel">返回</el-button>
       </div>
@@ -279,6 +285,8 @@
   <script>
   import { getSaleOrderDetail} from '@/api/saleManage/saleorder';
   import invoiceList from '@/views/saleManage/saleOrder/orderAssociation/invoiceList.vue'
+  import returnGoodsList from '@/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue'
+  import accountstatementList from '@/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue'
   import {getFile} from '@/api/system/file';
   import dictMixins from '@/mixins/dictMixins';
   import {download } from '@/utils/file';
@@ -288,7 +296,9 @@
   export default {
       mixins: [dictMixins],
       components:{
-        invoiceList
+        invoiceList,
+        returnGoodsList,
+        accountstatementList
       },
       data() {
       

+ 2 - 1
src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -5,6 +5,7 @@
       v-if="visible"
       :visible.sync="visible"
       :title="title"
+      :append-to-body="true"
       :close-on-click-modal="false"
       width="80%"
       @close="cancel"
@@ -94,7 +95,7 @@
               prop="reviewStatus"
               style="margin-bottom: 16px"
             >
-            {{reviewStatusEnum[form.reviewStatus].label}}
+            {{reviewStatusEnum[form.reviewStatus]?.label}}
             </el-form-item>
 
            

+ 267 - 0
src/views/saleManage/saleOrder/orderAssociation/accountstatementList.vue

@@ -0,0 +1,267 @@
+<template>
+    <div class="ele-body">
+      <el-card shadow="never" v-loading="loading">
+           <div class="ele-border-lighter form-content" v-loading="loading">
+  
+              <!-- 数据表格 -->
+              <ele-pro-table
+                ref="table"
+                :columns="columns"
+                :datasource="datasource"
+                height="calc(100vh - 385px)"
+                full-height="calc(100vh - 116px)"
+                tool-class="ele-toolbar-form"
+                :selection.sync="selection"
+                cache-key="eomContactPageTable"
+              >
+              
+                <!-- 查看详情列 -->
+             
+                <template v-slot:statementNo="{ row }">
+                  <el-link type="primary" :underline="false" @click="openorderDetail(row,'statementNo')"> {{ row.statementNo }}</el-link>
+                </template>
+                <template v-slot:orderNo="{ row }">
+                <el-link type="primary" :underline="false" @click="openorderDetail(row,'orderNo')"> {{ row.orderNo }}</el-link>
+              </template>
+               
+              </ele-pro-table>
+            </div>
+      </el-card>
+  
+      <detail-dialog ref="DetailDialogRef"></detail-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import detailDialog from '@/views/saleManage/saleOrder/accountstatement/components/detailDialog.vue';
+  import {reviewStatusEnum} from '@/enum/dict';
+  import {getAccountstatementList} from '@/api/saleManage/accountstatement';
+  import dictMixins from '@/mixins/dictMixins';
+  
+  
+  export default {
+      mixins: [dictMixins],
+      components: {
+        detailDialog,
+      },
+      props:{
+        orderId:String
+      },
+      data() {
+        return {
+          activeComp: 'saleorder',
+          tabOptions: [
+            { key: 'saleorder', name: '销售订单' },
+            { key: 'invoice', name: '发货单' },
+            { key: 'returnorder', name: '退货单' }
+          ],
+          selection:[],   //单选中集合
+          delVisible:false,  //批量删除弹框状态
+          loading: false,  // 加载状态
+          columns: [
+            {
+               width: 45,
+               type: 'selection',
+               columnKey: 'selection',
+               align: 'center'
+            },
+            {
+              columnKey: 'index',
+              label: '序号',
+              type: 'index',
+              width: 55,
+              align: 'center',
+              showOverflowTooltip: true,
+              fixed: 'left'
+            },
+            {
+              prop: 'statementNo',
+              label: '对账单编码',
+              align: 'center',
+              slot: 'statementNo',
+              showOverflowTooltip: true,
+              minWidth: 200
+            },
+           
+            {
+              prop: 'contactName',
+              label: '客户名称',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 180,
+            },
+            {
+              prop: 'projectName',
+              label: '项目名称',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+            },
+            {
+              prop: 'accountPeriod',
+              label: '账期',
+              align: 'center',
+              slot: 'accountPeriod',
+              showOverflowTooltip: true,
+              minWidth: 200
+            },
+            {
+              prop: 'orderNum',
+              label: '订单量',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+            },
+            {
+              prop: 'productNum',
+              label: '产品总数量',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+            },
+            {
+              prop: 'totalPrice',
+              label: '产品总金额',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+            },
+            {
+              prop: 'reviewStatus',
+              label: '状态',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+              formatter: (_row, _column, cellValue) => {
+              return reviewStatusEnum[_row.reviewStatus].label;
+            }
+            },
+           
+            {
+              prop: 'createTime',
+              label: '创建时间',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 170
+            },
+           
+            {
+              columnKey: 'action',
+              label: '操作',
+              width: 230,
+              align: 'center',
+              resizable: false,
+              slot: 'action',
+              showOverflowTooltip: true,
+              fixed: 'right',
+            }
+          ]
+        };
+      },
+      computed: {},
+   
+      methods: {
+      
+      
+        /* 表格数据源 */
+        datasource({ page, limit, where, order }) {
+          return getAccountstatementList({
+            pageNum: page,
+            size: limit,
+            orderId:this.orderId,
+            ...where
+          });
+        },
+      
+     
+    
+        /* 刷新表格 */
+        reload(where) {
+          this.$refs.table.reload({ page: 1, where });
+        },
+        
+        //新增编辑
+        openEdit(type,row) {
+          this.$refs.accountDialogRef.open( type,row);
+          this.$refs.accountDialogRef.$refs.form &&
+          this.$refs.accountDialogRef.$refs.form.clearValidate();
+        },
+       
+        //批量删除
+        allDelBtn(){
+          if(this.selection.length===0) return
+          this.delVisible=true
+        },
+        
+        //删除接口
+        remove(delData) {
+          deletetAccountstatement(delData).then((res) => {
+            this.$message.success('删除成功!');
+            this.reload();
+          });
+        },
+  
+      //删除弹框确定
+        commitBtn(){
+          const dataId=this.selection.map(v=>v.id)
+          this.remove(dataId)
+        },
+  
+      //查看详情
+      openorderDetail(row,type){
+        
+          if(type==='statementNo'){
+            this.$refs.DetailDialogRef.open(row);
+      }
+      if(type==='orderNo'){
+        this.$refs.orderDetailDialogRef.open({id:row.orderId});
+      }
+        },
+  
+      }
+    };
+  </script>
+  
+  <style lang="scss" scoped>
+  .ele-body{
+    padding-top:0;
+    padding-bottom: 0;
+  }
+ :deep .el-card__body{
+  padding: 0;
+}
+  :deep(.el-link--inner){
+    margin-left: 0px !important;
+  }
+  
+  .sys-organization-list {
+    height: calc(100vh - 264px);
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
+    overflow: auto;
+  }
+  .sys-organization-list :deep(.el-tree-node__content) {
+    height: 40px;
+    & > .el-tree-node__expand-icon {
+      margin-left: 10px;
+    }
+  }
+  
+  .switch_left ul .active{
+    border-top: 4px solid var(--color-primary);
+      color: var(--color-primary-5);
+  }
+  .switch{
+    padding-bottom: 20px;
+  }
+  
+  .el-dropdown-link {
+      cursor: pointer;
+      color: var(--color-primary-5);
+    }
+    .el-icon-arrow-down {
+      font-size: 12px;
+    }
+  </style>
+  

+ 0 - 384
src/views/saleManage/saleOrder/orderAssociation/components/detailDialog.vue

@@ -1,384 +0,0 @@
-<template>
-    <ele-modal
-    custom-class="ele-dialog-form long-dialog-form"
-      :centered="true"
-      v-if="visible"
-      :visible.sync="visible"
-      :title="title"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-      width="80%"
-      @close="cancel"
-    >
- 
-        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-    
-     <headerTitle title="发货信息"></headerTitle>
-       <el-row>
-        <el-col :span="12">
-            <el-form-item
-              label="客户名称:"
-              prop="contactName"
-              style="margin-bottom: 16px"
-            >
-            {{form.contactName}}
-            </el-form-item>
-            <el-form-item
-              label="客户联系人:"
-              prop="linkName"
-              style="margin-bottom: 16px"
-            >
-            {{form.linkName}}
-            </el-form-item>
-            <el-form-item
-              label="客户电话:"
-              prop="linkPhone"
-              style="margin-bottom: 16px"
-            >
-            {{form.linkPhone}}
-            </el-form-item>
-       
-            <el-form-item
-              label="客户地址:"
-              prop="partaAddress"
-              style="margin-bottom: 16px"
-            >
-            {{form.receiveAddress}}
-            </el-form-item>
-            <el-form-item
-              label="发货附件:"
-              prop="sendFiles"
-              style="margin-bottom: 16px"
-            >
-            <div v-if="detailData.sendFiles && detailData.sendFiles?.length">
-               <el-link v-for="link in detailData.sendFiles" :key="link.id"
-                         type="primary" :underline="false"
-                         @click="downloadFile(link)"> {{ link.name }}</el-link> 
-                        </div>
-            </el-form-item>
-          </el-col>
-
-
-
-
-          <el-col :span="12">
-            <el-form-item
-              label="车牌号:"
-              prop="carNo"
-              style="margin-bottom: 16px"
-            >
-            {{form.carNo}}
-            </el-form-item>
-            <el-form-item
-              label="发货单据编码:"
-              prop="docNo"
-              style="margin-bottom: 16px"
-            >
-            {{form.docNo}}
-            </el-form-item>
-            <el-form-item
-              label="制单人:"
-              prop="makerName"
-              style="margin-bottom: 16px"
-            >
-            {{form.makerName}}
-            </el-form-item>
-            <el-form-item prop="orderNo" label="订单编码:" >
-              {{form.orderNo}}
-              </el-form-item>
-              <el-form-item prop="replied" label="是否回执:">
-                {{form.replied==1?'是':'否'}}
-              </el-form-item>
-
-              <el-form-item
-              label="审核状态:"
-              prop="reviewStatus"
-              style="margin-bottom: 16px"
-            >
-            {{reviewStatusEnum[form.reviewStatus].label}}
-            </el-form-item>
-
-           
-          </el-col>
-       </el-row>
-
-   </el-form>
-
-
-       
-        <headerTitle title="产品清单"></headerTitle>
-        <ele-pro-table ref="table" :needPage="false" :columns="competAnalysisListcolumns"  :toolkit="[]" :datasource="detailData.productList" row-key="id">
-          <!-- <template v-slot:toolbar>
-        <div class="headbox">
-        <span class="amount">总计:{{detailData.totalAmount}}元</span>
-        <span class="amount">应付金额:{{detailData.payAmount}}元</span>
-      </div>
-      </template> -->
-          <template v-slot:technicalDrawings="{ row }">
-            <div v-if="row.technicalDrawings && row.technicalDrawings?.length">
-            <el-link 
-            v-for="link in row.technicalDrawings" :key="link.id"
-                         type="primary" :underline="false"
-                         @click="downloadFile(link)"> {{ link.name }}</el-link>
-                        </div>
-                        </template>
-                     
-          </ele-pro-table>
-       
-      <div slot="footer" class="footer">
-        <el-button @click="cancel">返回</el-button>
-      </div>
-    </ele-modal>
-  </template>
-  
-  <script>
-  import {getFile} from '@/api/system/file';
-  import dictMixins from '@/mixins/dictMixins';
-  import {download } from '@/utils/file';
-  import {reviewStatusEnum} from '@/enum/dict';
-  import {copyObj} from '@/utils/util';
-  import { getSendSaleOrderrecordDetail} from '@/api/saleManage/saleordersendrecord';
-  
-  export default {
-      mixins: [dictMixins],
-      data() {
-      
-        return {
-          reviewStatusEnum,
-          visible: false,
-          detailId:'',
-          title: '详情',
-          row: {},
-          activeName: 'base',
-          form:{
-            orderFiles:[{name:'222'}]
-          },
-          rules:{},
-          detailData:{},
-          receiptPaymentListcolumns:[
-          {
-          width: 45,
-          type: 'index',
-          columnKey: 'index',
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          width: 200,
-          prop: 'moneyName',
-          label: '款项名称',
-          slot: 'moneyName'
-        },
-        {
-          width: 100,
-          prop: 'price',
-          label: '金额',
-          slot: 'price',
-          formatter: (_row, _column, cellValue) => {
-              return _row.price+'元'
-            }
-        },
-        {
-          width: 100,
-          prop: 'ratio',
-          label: '比例',
-          slot: 'ratio',
-          formatter: (_row, _column, cellValue) => {
-              return _row.ratio+'%'
-            }
-        },
-        {
-          width: 160,
-          prop: 'deadLine',
-          label: '截止日期',
-          slot: 'deadLine'
-        },
-        {
-          prop: 'remark',
-          label: '	说明',
-          slot: 'remark'
-        }
-          ],
-          competAnalysisListcolumns: [
-        
-          {
-          width: 45,
-          type: 'index',
-          columnKey: 'index',
-          align: 'center',
-          fixed: 'left'
-        },
-        {
-          width: 200,
-          prop: 'productName',
-          label: '名称',
-          slot: 'productName'
-        },
-        {
-          width: 120,
-          prop: 'productCode',
-          label: '编码',
-          slot: 'productCode'
-        },
-        {
-          width: 200,
-          prop: 'productCategoryName',
-          label: '类型',
-          slot: 'productCategoryName'
-        },
-        {
-          width: 160,
-          prop: 'productBrand',
-          label: '牌号',
-          slot: 'productBrand'
-        },
-        {
-          width: 120,
-          prop: 'modelType',
-          label: '型号',
-          slot: 'modelType'
-        },
-        {
-          width: 120,
-          prop: 'specification',
-          label: '规格',
-          slot: 'specification'
-        },
-       
-       
-        {
-          width: 120,
-          prop: 'totalCount',
-          label: '数量',
-          slot: 'totalCount'
-        },
-        {
-          width: 120,
-          prop: 'measuringUnit',
-          label: '计量单位',
-          slot: 'measuringUnit'
-        },
-        {
-          width: 160,
-          prop: 'singlePrice',
-          label: '单价',
-          slot: 'singlePrice'
-        },
-        {
-          width: 120,
-          prop: 'totalPrice',
-          label: '销售总金额',
-          slot: 'totalPrice',
-          formatter: (_row, _column, cellValue) => {
-              return _row.totalPrice+'元'
-            }
-        },
-       
-        {
-          width: 120,
-          prop: 'deliveryDays',
-          label: '交期(天)',
-          slot: 'deliveryDays'
-        },
-        {
-          width: 200,
-          prop: 'guaranteePeriod',
-          label: '质保期',
-          slot: 'guaranteePeriod',
-          formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod+_row.guaranteePeriodUnitName
-            }
-        },
-        // {
-        //   width: 120,
-        //   prop: 'guaranteePeriodUnitCode',
-        //   label: '',
-        //   slot: 'guaranteePeriodUnitCode'
-        // },
-         {
-          width: 120,
-          prop: 'technicalAnswerName',
-          label: '技术答疑人',
-          slot: 'technicalAnswerName'
-        },
-        {
-          width: 220,
-          prop: 'technicalParams',
-          label: '技术参数',
-          slot: 'technicalParams'
-        },
-        {
-          width:240,
-          prop: 'technicalDrawings',
-          label: '技术图纸',
-          slot: 'technicalDrawings',
-          formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod+_row.guaranteePeriodUnitName
-            }
-
-        },
-        {
-          width: 220,
-          prop: 'remark',
-          label: '备注',
-          slot: 'remark'
-        }
-           ],
-        };
-      },
-      methods: {
-     
-        async open(row) {
-          this.form = row;
-          this.visible = true;
-          this.getDetailData(row.id)
-          this.detailId=row.id
-        },
-  
-        cancel() {
-          this.$nextTick(() => {
-            // 关闭后,销毁所有的表单数据
-            this.form = copyObj(this.formDef),
-            this.otherForm = copyObj(this.otherFormDef),
-            this.tableBankData = []
-            this.tableLinkData = []
-            this.visible = false;
-          })
-        },
-        downloadFile(file){
-        getFile({ objectName: file.storePath }, file.name);
-      },
-        async getDetailData (id) {
-          this.loading = true;
-          const data = await getSendSaleOrderrecordDetail(id);
-          this.loading = false;
-          if (data) {
-            this.form = data;
-            this.detailData = data;
-            
-          }
-        },
-  
-      }
-    };
-  </script>
-  
-  <style scoped lang="scss">
-  .ele-dialog-form{
-    .el-form-item{
-      margin-bottom: 10px;
-    }
-  }
-
-  .headbox{
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  .amount{
-    font-size: 14px;
-    font-weight: bold;
-    margin-right: 20px;
-  }
-}
-  </style>
-  

+ 1 - 13
src/views/saleManage/saleOrder/orderAssociation/invoiceList.vue

@@ -26,16 +26,13 @@
             </div>
       </el-card>
   
-      <orderDetailDialog  ref="orderDetailDialogRef"></orderDetailDialog>
       <detail-dialog ref="DetailDialogRef"></detail-dialog>
-      <addReturnGoodsDialog ref="addReturnGoodsRef"  @done="reload"></addReturnGoodsDialog>
     </div>
   </template>
   
   <script>
-  import detailDialog from './components/detailDialog.vue';
+  import detailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue';
   import {reviewStatusEnum} from '@/enum/dict';
-  import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue'
   import addReturnGoodsDialog from '@/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog';
   import {getSendTableList} from '@/api/saleManage/saleordersendrecord';
   import dictMixins from '@/mixins/dictMixins';
@@ -48,7 +45,6 @@
       },
       components: {
         addReturnGoodsDialog,
-        orderDetailDialog,
         detailDialog,
       },
       data() {
@@ -86,14 +82,6 @@
               showOverflowTooltip: true,
               minWidth: 200
             },
-            {
-              prop: 'orderNo',
-              label: '销售订单编码',
-              align: 'center',
-              slot: 'orderNo',
-              showOverflowTooltip: true,
-              minWidth: 200
-            }, 
             {
               prop: 'contactName',
               label: '客户名称',

+ 217 - 0
src/views/saleManage/saleOrder/orderAssociation/returnGoodsList.vue

@@ -0,0 +1,217 @@
+<template>
+    <div class="ele-body">
+      <el-card shadow="never" v-loading="loading">
+           <div class="ele-border-lighter form-content" v-loading="loading">  
+              <!-- 数据表格 -->
+              <ele-pro-table
+                ref="table"
+                :columns="columns"
+                :datasource="datasource"
+                height="calc(100vh - 385px)"
+                full-height="calc(100vh - 116px)"
+                tool-class="ele-toolbar-form"
+                :selection.sync="selection"
+                cache-key="eomContactPageTable"
+              >
+                <!-- 查看详情列 -->
+             
+                <template v-slot:returnNo="{ row }">
+                  <el-link type="primary" :underline="false" @click="openorderDetail(row,'returnNo')"> {{ row.returnNo }}</el-link>
+                </template>
+                <template v-slot:sendNo="{ row }">
+                  <el-link type="primary" :underline="false" @click="openorderDetail(row,'sendNo')"> {{ row.sendNo }}</el-link>
+                </template>
+                <template v-slot:orderNo="{ row }">
+                  <el-link type="primary" :underline="false" @click="openorderDetail(row,'orderNo')"> {{ row.orderNo }}</el-link>
+                </template>
+              
+              </ele-pro-table>
+            </div>
+      </el-card>
+  
+  
+      <send-detail-dialog  ref="sendDetailDialogRef"></send-detail-dialog>
+      <detail-dialog ref="DetailDialogRef"></detail-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import detailDialog from '@/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue';
+  import sendDetailDialog from '@/views/saleManage/saleOrder/invoice/components/detailDialog.vue'
+  import {reviewStatusEnum} from '@/enum/dict';
+  import {getReturnTableList} from '@/api/saleManage/returnGoods';
+  import dictMixins from '@/mixins/dictMixins';
+  
+  
+  export default {
+      mixins: [dictMixins],
+      components: {
+        sendDetailDialog,
+        detailDialog,
+      },
+      props:{
+        orderId:String
+      },
+      data() {
+        return {
+          activeComp: 'saleorder',
+          tabOptions: [
+            { key: 'saleorder', name: '销售订单' },
+            { key: 'invoice', name: '发货单' },
+            { key: 'returnorder', name: '退货单' }
+          ],
+          selection:[],   //单选中集合
+          delVisible:false,  //批量删除弹框状态
+          loading: false,  // 加载状态
+          columns: [
+            {
+               width: 45,
+               type: 'selection',
+               columnKey: 'selection',
+               align: 'center'
+            },
+            {
+              columnKey: 'index',
+              label: '序号',
+              type: 'index',
+              width: 55,
+              align: 'center',
+              showOverflowTooltip: true,
+              fixed: 'left'
+            },
+            {
+              prop: 'returnNo',
+              label: '退货编码',
+              align: 'center',
+              slot: 'returnNo',
+              showOverflowTooltip: true,
+              minWidth: 200
+            },
+            {
+              prop: 'sendNo',
+              label: '发货编码',
+              align: 'center',
+              slot: 'sendNo',
+              showOverflowTooltip: true,
+              minWidth: 200
+            },
+            {
+              prop: 'contactName',
+              label: '客户名称',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 180,
+            },
+            {
+              prop: 'payAmount',
+              label: '应付金额',
+              align: 'center',
+              slot: 'payAmount',
+              showOverflowTooltip: true,
+              minWidth: 200
+            },
+            {
+              prop: 'reviewStatus',
+              label: '状态',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 200,
+              formatter: (_row, _column, cellValue) => {
+              return reviewStatusEnum[_row.reviewStatus].label;
+            }
+            },
+            {
+              prop: 'createTime',
+              label: '创建时间',
+              align: 'center',
+              showOverflowTooltip: true,
+              minWidth: 170
+            }
+          ]
+        };
+      },
+      computed: {},
+   
+      methods: {
+      
+      
+        /* 表格数据源 */
+        datasource({ page, limit, where, order }) {
+          return getReturnTableList({
+            pageNum: page,
+            size: limit,
+            orderId:this.orderId,
+            ...where
+          });
+        },
+      
+    
+        /* 刷新表格 */
+        reload(where) {
+          this.$refs.table.reload({ page: 1, where });
+        },
+        
+      
+  
+  
+      //查看详情
+      openorderDetail(row,type){
+        if(type==='returnNo'){
+          this.$refs.DetailDialogRef.open(row);
+        }
+        if(type==='sendNo'){
+          this.$refs.sendDetailDialogRef.open({id:row.sendId});
+        }
+        if(type==='orderNo'){
+          this.$refs.orderDetailDialogRef.open({id:row.orderId});
+        }
+         
+        },
+  
+      }
+    };
+  </script>
+  
+  <style lang="scss" scoped>
+  .ele-body{
+    padding-top:0;
+    padding-bottom: 0;
+  }
+  :deep .el-card__body{
+  padding: 0;
+  }
+  :deep(.el-link--inner){
+    margin-left: 0px !important;
+  }
+  
+  .sys-organization-list {
+    height: calc(100vh - 264px);
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
+    overflow: auto;
+  }
+  .sys-organization-list :deep(.el-tree-node__content) {
+    height: 40px;
+    & > .el-tree-node__expand-icon {
+      margin-left: 10px;
+    }
+  }
+  
+  .switch_left ul .active{
+    border-top: 4px solid var(--color-primary);
+      color: var(--color-primary-5);
+  }
+  .switch{
+    padding-bottom: 20px;
+  }
+  
+  .el-dropdown-link {
+      cursor: pointer;
+      color: var(--color-primary-5);
+    }
+    .el-icon-arrow-down {
+      font-size: 12px;
+    }
+  </style>
+  

+ 1 - 0
src/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue

@@ -5,6 +5,7 @@
       v-if="visible"
       :visible.sync="visible"
       :title="title"
+      :append-to-body="true"
       :close-on-click-modal="false"
       width="80%"
       @close="cancel"