销售改代收 加售后

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/afterSale.vue

@@ -0,0 +1,431 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="订单编号" prop="F_OrderId" >
+        <el-input v-model="ruleForm.F_OrderId" disabled />
+      </el-form-item>
+      <el-form-item label="售后类型" prop="F_Type" >
+        <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择售后类型" @change="changeType">
+          <!-- <el-option label="调换" value="1"></el-option>
+          <el-option label="退货" value="2"></el-option> -->
+          <!-- <el-option label="部分退货" value="3"></el-option> -->
+          <!-- <el-option label="对发货" value="4"></el-option>
+          <el-option label="补发货" value="5"></el-option>
+          <el-option label="补差额" value="6"></el-option> -->
+          <!-- <el-option label="错发" value="7"></el-option> -->
+          <!-- <el-option label="漏发" value="8"></el-option> -->
+          <el-option label="改代收" value="9"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="变动金额" prop="F_Money">
+        <el-input-number v-model="ruleForm.F_Money" controls-position="right" class="form_input_number"/>
+        <!-- <el-input v-model="ruleForm.F_Money" placeholder="-需要退 +用户需补"/> -->
+      </el-form-item>
+      <el-form-item label="售后原因" prop="F_ReturnType" >
+        <el-select v-model="ruleForm.F_ReturnType" class="form_select" filterable placeholder="请选择售后原因">
+          <el-option label="改代收" value="改代收"/>
+          <!-- <el-option v-for="item in afterSaleReasonsList" :key="item.F_ValueId" :label="item.F_Value" :value="item.F_Value"></el-option> -->
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="售后原因" prop="F_ReturnDes" >
+        <el-input v-model="ruleForm.F_ReturnDes" placeholder="请输入售后原因" />
+      </el-form-item> -->
+      <el-form-item label="退回商品状态" prop="F_ProductStatus" >
+        <el-input v-model="ruleForm.F_ProductStatus" placeholder="请输入退回商品状态" />
+      </el-form-item>
+      <el-form-item label="处理原因" prop="F_Reason" >
+        <el-input v-model="ruleForm.F_Reason" placeholder="请输入处理原因" />
+      </el-form-item>
+      <el-form-item label="客户意愿" prop="F_Aspiration" >
+        <el-input v-model="ruleForm.F_Aspiration" placeholder="请输入客户意愿" />
+      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="商品分类" prop="parentids" >
+            <el-cascader
+              v-model="parentids"
+              :options="commodityTypeLists"
+              :props="typeDropProps"
+              placeholder="请选择商品分类"
+              clearable
+              filterable
+              change-on-select
+              style="width: 100%;"
+              @change="commodityTypeChange"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="商品" prop="productName" >
+            <el-select v-model="commoditySearchData.productName" class="filter-item" value-key="F_ProductId" clearable placeholder="请选择商品" @change="commodityListChange">
+              <el-option
+                v-for="item in commodityListLists"
+                :key="item.F_ProductId"
+                :label="item.F_ProductName"
+                :value="item"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="商品数量" prop="num" >
+            <el-input-number v-model="commoditySearchData.num" :min="1" label="描述文字"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item>
+          <el-button type="primary" @click="addCommodity">添加商品</el-button>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="补发商品">
+            <el-table :data="commodityTableData" stripe style="width: 100%">
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" />
+              <el-table-column prop="F_Count" label="商品数量" align="center"/>
+              <el-table-column prop="F_DealPrice" label="商品单价" align="center"/>
+              <el-table-column prop="F_TotlePrice" label="商品总价" align="center"/>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="btn_deleteCommodity(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="总金额">
+            <span>{{ totalAmount }}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="退回商品">
+            <el-table ref="oldCommodityTable" :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" >
+              <el-table-column type="selection" width="55"/>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" />
+              <el-table-column prop="F_Count" label="商品数量" align="center"/>
+            </el-table>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="售后备注" prop="F_Remark">
+        <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入售后备注"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm(0)">保存</el-button>
+        <!-- <el-button type="primary" @click="submitForm(1)">提交</el-button> -->
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getDictionaryValueList } from '@/api/commonAPI'
+import { getOrder } from '@/api/orderManagement/orderList'
+import { getCommodityType } from '@/api/commodityManagement/commodityType'
+import { getCommodityList } from '@/api/commodityManagement/commodityList'
+import { addAfterSaleList, getAfterSaleList, getAfterSaleOrderCommodityList } from '@/api/afterSaleManagement/afterSaleList'
+import { getTotalAmount } from '@/api/orderManagement/orderList'
+
+export default {
+  name: 'AfterSale',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    collectionAfterSalesReasonType: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      parentids: [],
+      afterSaleReasonsList: [], // 售后原因类型
+      commodityTypeLists: [], // 商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
+      commodityListLists: [], // 商品列表
+      commodityTableData: [], // 添加商品
+      commoditySearchData: { // 商品搜索数据
+        classId: '', // 商品分类id
+        className: '', // 商品分类名称
+        productName: '', // 商品名称
+        productId: '', // 商品id
+        num: 1 // 商品数量
+      },
+      oldCommodityTableData: [], // 退回商品列表
+      oldDetailListSelection: [], // 退回商品选中数据
+      totalAmount: '', // 总金额
+      ruleForm: {
+        F_OrderId: '', // 订单编号
+        F_DetailList: '', // 补发产品列表
+        F_OldDetailList: '', // 退回产品列表
+        F_Type: '', // 合并类型
+        F_Money: '', // 减免金额
+        F_Remark: '', // 销售备注
+        F_ReturnType: '', // 售后原因类型
+        F_ReturnDes: '', // 售后原因
+        F_ProductStatus: '', // 退回商品状态
+        F_CheckStateSH: '', // 0保存 1提交按钮 2不通过
+        F_Reason: '', // 处理原因
+        F_Aspiration: '' // 客户意愿
+      },
+      rules: {
+        order1: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号1'
+        }],
+        order2: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号2'
+        }],
+        F_Type: [{
+          required: true,
+          trigger: 'change',
+          message: '请选择售后类型'
+        }],
+        F_Money: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入变动金额'
+        }],
+        F_ReturnType: [{
+          required: true,
+          trigger: 'change',
+          message: '请选择售后原因类型'
+        }]
+        // F_ReturnDes: [{
+        //   required: true,
+        //   trigger: 'blur',
+        //   message: '请输入售后原因',
+        // }],
+      },
+      loading: false
+    }
+  },
+  created() {
+    this.getCommodityTypeSelect()
+    this.getAfterSaleReasons()
+    Promise.all([
+    ]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.F_OrderId = this.rowid
+        this.getAfterSaleOrderCommodity(this.rowid)
+      }
+      if (this.collectionAfterSalesReasonType) {
+        this.ruleForm.F_ReturnType = this.collectionAfterSalesReasonType
+      }
+    })
+  },
+  methods: {
+    submitForm(state) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.ruleForm.F_CheckStateSH = state
+          // 添加
+          addAfterSaleList(this.ruleForm).then(response => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getList() // 重新加载父级数据
+              this.$message.success('恭喜你，添加成功!')
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+          return
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+    // 获取商品分类
+    getCommodityTypeSelect() {
+      this.loading = true
+      return new Promise(resolve => {
+        const data = {
+          pageindex: 1, // int 第几页
+          pagesize: 300, // int 每页几条信息
+          ParentId: 0
+        }
+        getCommodityType(data).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.commodityTypeLists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+
+    commodityTypeChange(item) {
+      this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
+      this.getCommodityListSelect()
+    },
+    commodityListChange(item) {
+      this.commoditySearchData.productId = item.F_ProductId
+      this.commoditySearchData.productName = item.F_ProductName
+    },
+    // 获取商品
+    getCommodityListSelect() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: 1, // int 第几页,
+          pagesize: 300, // int 每页几条信息,
+          ProductId: '',
+          ClassId: this.commoditySearchData.classId === '' ? 0 : this.commoditySearchData.classId,
+          ClassName: '',
+          ProductName: '',
+          PinyinShort: '',
+          ProductNumber: '',
+          ProductShortName: '',
+          tag: '',
+          issale: 1
+        }
+        getCommodityList(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.commodityListLists = response.data.Rows
+          }
+        })
+        resolve()
+      })
+    },
+    addCommodity() {
+      if (this.commoditySearchData.productName === '') {
+        this.$message({
+          message: '请选择商品！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.commodityTableData.length > 0) {
+        for (let i = 0; i < this.commodityTableData.length; i++) {
+          if (this.commodityTableData[i].F_ProductId === this.commoditySearchData.productId) {
+            this.commodityTableData[i].F_Count = this.commodityTableData[i].F_Count + this.commoditySearchData.num
+            this.getTotalAmountFun()
+            return
+          }
+        }
+      }
+      const data = {
+        F_ProductId: this.commoditySearchData.productId,
+        F_ProductName: this.commoditySearchData.productName,
+        F_Count: this.commoditySearchData.num,
+        F_DealPrice: '',
+        F_TotlePrice: ''
+      }
+      this.commodityTableData.push(data)
+      const idsQuantity = []
+      for (let i = 0; i < this.commodityTableData.length; i++) {
+        idsQuantity.push(this.commodityTableData[i].F_ProductId + ',' + this.commodityTableData[i].F_Count)
+      }
+      this.ruleForm.F_DetailList = idsQuantity.join('|') // 补发产品列表
+      this.getTotalAmountFun()
+    },
+    // 删除商品
+    btn_deleteCommodity(val) {
+      const index = this.commodityTableData.indexOf(val)
+      this.commodityTableData.splice(index, 1)
+      this.getTotalAmountFun()
+    },
+    // 售后订单商品列表
+    getAfterSaleOrderCommodity(rid) {
+      const params = {
+        orderid: rid
+      }
+      getAfterSaleOrderCommodityList(params).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.oldCommodityTableData = res
+          // this.$nextTick(()=>{
+          //   this.oldCommodityTableData.forEach((row,index)=>{
+          //     this.$refs.oldCommodityTable.toggleRowSelection(row)
+          //   })
+          // },1)
+        }
+      })
+    },
+    // 售后原因类型
+    getAfterSaleReasons() {
+      return new Promise(resolve => {
+        const params = {
+          isleaf: true,
+          code: 'AfterSaleReasons'
+        }
+        getDictionaryValueList(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.afterSaleReasonsList = response.data.Rows
+          }
+        })
+      })
+    },
+    changeType(val) {
+      // if(val === "5") {
+      //   this.$refs.oldCommodityTable.clearSelection()
+      // } else {
+      //   this.oldCommodityTableData.forEach((row,index)=>{
+      //     this.$refs.oldCommodityTable.toggleRowSelection(row, true)
+      //   })
+      // }
+    },
+    // 选择多个
+    handleSelectionChange(selection) {
+      const idsQuantity = []
+      this.oldDetailListSelection = selection
+      for (let i = 0; i < this.oldDetailListSelection.length; i++) {
+        idsQuantity.push(this.oldDetailListSelection[i].F_ProductId + ',' + this.oldDetailListSelection[i].F_Count)
+      }
+      this.ruleForm.F_OldDetailList = idsQuantity.join('|')
+    },
+    // 获取金额总数
+    getTotalAmountFun() {
+      return new Promise((resolve) => {
+        const params = {
+          OrderDetailList: this.commodityTableData,
+          UseActList: this.ruleForm.UseActList,
+          F_ExpressFee:
+            this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
+        }
+        getTotalAmount(params).then((response) => {
+          const res = response.orderDetails
+          this.totalAmount = response.totle
+          res.forEach((e, i) => {
+            this.commodityTableData.forEach((k, m) => {
+              if (e.F_ProductId == k.F_ProductId) {
+                k.F_DealPrice = e.F_DealPrice
+                k.F_TotlePrice = e.F_TotlePrice
+              }
+            })
+          })
+        })
+        resolve()
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select {
+  width: 100%;
+}
+.form_input_number {
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/orderManagement/changeCollectionOrderList/index.vue

@@ -15,55 +15,232 @@
       <el-button v-permission="'HY_import_waybill_number'" type="primary" class="filter-item" @click="btn_import_waybill_number">导入运单号</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
-      <el-tab-pane label="全部" name="4"/>
-      <el-tab-pane label="改代收" name="0"/>
-      <el-tab-pane label="已签收" name="1"/>
-      <el-tab-pane label="已拒收" name="2"/>
-      <el-tab-pane label="已提交" name="3"/>
+      <div>
+        <span>订单数量：{{ pageParams.total }}</span>
+      </div>
+      <el-tab-pane label="全部" name="6">
+        <el-table
+          v-loading="loading"
+          :data="dataLists"
+          border
+          stripe
+        >
+          <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="hadndleOrderCode(scope.row.F_Id)"
+              >{{ scope.row.F_Id }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Customer" label="客户姓名" align="center" min-width />
+          <el-table-column prop="F_CustomerPhone" label="手机号码" align="center" min-width="140" />
+          <el-table-column label="订购商品" align="center" min-width>
+            <template slot-scope="scope">{{ scope.row.OrderDetailList | judgmentOrderGoods }}</template>
+          </el-table-column>
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="订单状态" align="center">
+            <template slot-scope="scope">{{ scope.row.F_State | judgmentState }}</template>
+          </el-table-column>
+          <el-table-column label="地址" align="center">
+            <template slot-scope="scope">{{ scope.row | judgmentAddress }}</template>
+          </el-table-column>
+          <el-table-column prop="F_PayType" label="付款类型" align="center"/>
+          <el-table-column prop="F_RealPrice" label="付款金额" align="center"/>
+          <el-table-column prop="F_AddDes" label="送货说明" align="center"/>
+          <el-table-column prop="F_AddUserName" label="下单员工" align="center" />
+          <el-table-column prop="F_BelongName" label="归属员工" align="center" />
+          <el-table-column prop="F_Type" label="订单类型" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Waybill" label="物流操作时间" align="center" />
+          <el-table-column label="物流状态" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.F_Status | judgmentStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="100" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                v-permission="'HY_afterSale'"
+                type="text"
+                @click="btn_add_aftersale(scope.row.F_Id)"
+              >售后</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="改代收" name="0">
+        <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+          <el-table-column type="selection"/>
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售后审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Money" label="变动金额" align="center" />
+          <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Remark" label="备注" align="center" />
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button
+                v-permission="'HY_waybill_number'"
+                v-if="authority_waybill_number(scope.row.F_ReturnType)"
+                type="text"
+                @click="btn_waybill_number(scope.row.F_OrderId)"
+              >运单号</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="已签收" name="1">
+        <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+          <el-table-column type="selection"/>
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售后审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Money" label="变动金额" align="center" />
+          <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Remark" label="备注" align="center" />
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button
+                v-permission="'HY_waybill_number'"
+                v-if="authority_waybill_number(scope.row.F_ReturnType)"
+                type="text"
+                @click="btn_waybill_number(scope.row.F_OrderId)"
+              >运单号</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="已拒收" name="2">
+        <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+          <el-table-column type="selection"/>
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售后审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Money" label="变动金额" align="center" />
+          <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Remark" label="备注" align="center" />
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button
+                v-permission="'HY_waybill_number'"
+                v-if="authority_waybill_number(scope.row.F_ReturnType)"
+                type="text"
+                @click="btn_waybill_number(scope.row.F_OrderId)"
+              >运单号</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="已提交" name="3">
+        <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+          <el-table-column type="selection"/>
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="售后类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="售后审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库审核状态" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Money" label="变动金额" align="center" />
+          <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
+          <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
+          <el-table-column prop="F_Remark" label="备注" align="center" />
+          <el-table-column prop="F_AddTime" label="下单日期" align="center" />
+          <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
+              <el-button
+                v-permission="'HY_waybill_number'"
+                v-if="authority_waybill_number(scope.row.F_ReturnType)"
+                type="text"
+                @click="btn_waybill_number(scope.row.F_OrderId)"
+              >运单号</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
-    <div>
-      <span>订单数量：{{ pageParams.total }}</span>
-    </div>
-    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
-      <el-table-column type="selection"/>
-      <el-table-column type="index" label="编号" align="center" fixed width="80" />
-      <el-table-column prop="F_OrderId" label="订单编号" align="center" min-width="180" >
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_OrderId)">{{ scope.row.F_OrderId }}</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="售后类型" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.F_Type | judgmentStateName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="售后审核状态" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.F_CheckStateSH | judgmentAfterSaleCheckState }}
-        </template>
-      </el-table-column>
-      <el-table-column label="仓库审核状态" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.F_CheckStateKG | judgmentCustodianStateName }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="F_Money" label="变动金额" align="center" />
-      <el-table-column prop="F_ReturnType" label="售后原因" align="center" />
-      <el-table-column prop="F_TrackingNo" label="运单号" align="center" />
-      <el-table-column prop="F_Remark" label="备注" align="center" />
-      <el-table-column prop="F_AddTime" label="下单日期" align="center" />
-      <el-table-column label="操作" width="240" align="center" class-name="oparate_btn" fixed="right">
-        <template slot-scope="scope">
-          <el-button v-permission="'HY_after_sale_detail'" type="text" @click="btn_after_sale_detail(scope.row.F_Id)">详情</el-button>
-          <el-button
-            v-permission="'HY_waybill_number'"
-            v-if="authority_waybill_number(scope.row.F_ReturnType)"
-            type="text"
-            @click="btn_waybill_number(scope.row.F_OrderId)"
-          >运单号</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+
     <!-- <pagination
       v-show="pageParams.total > 0"
       :total="pageParams.total"
@@ -80,17 +257,62 @@ import { getDictionaryValueList } from '@/api/commonAPI'
 import { getAfterSaleList, deleteAfterSaleList } from '@/api/afterSaleManagement/afterSaleList'
 import { pickerOptions, formatterContent } from '@/utils'
 import importWaybillnumber from './importWaybillnumber'
+import afterSale from './afterSale'
 import waybillnumber from './waybillnumber'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 import detail from '@/views/orderManagement/orderList/detail'
 import afterSaleDetail from '@/views/afterSaleManagement/afterSaleList/afterSaleDetail'
-
+import { getOrderListCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
 export default {
   name: 'ConsolidateOrderList',
   components: {
     Pagination
   },
   filters: {
+    judgmentState(status) {
+      const statusMap = {
+        '0': '未提交',
+        '1': '待分仓',
+        '2': '已退回',
+        '3': '已分仓',
+        '4': '无货',
+        '5': '仓库待审核',
+        '6': '已发货',
+        '7': '付款待审核',
+        '8': '待分物流',
+        '9': '物流未通过'
+      }
+      return statusMap[status]
+    },
+    judgmentOrderGoods(status) {
+      if (status) {
+        let orderGoodsNameQuantity = ''
+        for (let i = 0; i < status.length; i++) {
+          orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+        }
+        orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
+        return orderGoodsNameQuantity
+      }
+    },
+    judgmentAddress(data) {
+      const addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince // 省
+      const addCity = data.F_AddCity === null ? '' : data.F_AddCity // 市
+      const addArea = data.F_AddArea === null ? '' : data.F_AddArea // 县/区
+      const addTown = data.F_AddTown === null ? '' : data.F_AddTown // 乡/镇
+      const address = data.F_Address === null ? '' : data.F_Address // 详细地址
+      const addressStr = addProvince + addCity + addArea + addTown + address // 地址
+      return addressStr
+    },
+    judgmentStatusName(status) {
+      const statusMap = {
+        '0': '未发出',
+        '1': '未签收',
+        '2': '签收',
+        '3': '改代收',
+        '4': '拒收'
+      }
+      return statusMap[status]
+    },
     judgmentStateName(status) {
       const statusMap = {
         '1': '调换货',
@@ -132,7 +354,7 @@ export default {
         woState: '', // 是否提交
         returnType: '改代收' // 退回状态
       },
-      activeName: '4',
+      activeName: '6',
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -202,6 +424,18 @@ export default {
         title: '售后列表详情'
       })
     },
+    // 添加售后
+    btn_add_aftersale(id) {
+      this.$layer.iframe({
+        content: {
+          content: afterSale, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: id.toString() } // props
+        },
+        area: ['80%', '90%'],
+        title: '添加售后'
+      })
+    },
     // 运单号
     btn_waybill_number(id) {
       this.$layer.iframe({
@@ -239,12 +473,32 @@ export default {
         this.searchData.woState = '1'
         this.searchData.isSignfor = ''
         this.searchData.returnType = '改代收'
+        this.getList()
+      } else if (this.activeName == '6') {
+        this.getlists()
       } else {
         this.searchData.woState = ''
         this.searchData.isSignfor = this.activeName
         this.searchData.returnType = '改代收'
+        this.getList()
       }
-      this.getList()
+    },
+    getlists() {
+      return new Promise(resolve => {
+        const params = {
+          F_State: '6', // 订单状态
+          pageindex: 1, // int 第几页
+          pagesize: 1000000 // int 每页几条信息
+
+        }
+        getOrderListCustomerService(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
+          }
+        })
+        resolve()
+      })
     },
     btn_search() {
       this.pageParams.pageindex = 1