售后管理

CallCenterWeb.UI/src/api/afterSaleManagement/afterSaleList.js

@@ -25,4 +25,22 @@ export function editAfterSaleList(params) {
     method: 'POST',
     params
   })
+}
+
+// 删除售后列表
+export function deleteAfterSaleList(params) {
+  return request({
+    url: 'api/AfterSale/deleteaftersalesh',
+    method: 'POST',
+    params
+  })
+}
+
+// 获取售后订单商品列表
+export function getAfterSaleOrderCommodityList(params) {
+  return request({
+    url: 'api/AfterSale/deleteaftersalesh',
+    method: 'POST',
+    params
+  })
 }

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/addOrEdit.vue

@@ -1,20 +1,79 @@
 <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_OrderList" >
-        <el-input v-model="ruleForm.F_OrderList" placeholder="请输入订单编号" disabled="false" />
+      <el-form-item label="订单编号" prop="F_OrderId" >
+        <el-input v-model="ruleForm.F_OrderId" disabled="false" />
       </el-form-item>
-      <el-form-item label="合并类型" prop="F_Type" >
+      <el-form-item label="售后类型" prop="F_Type" >
         <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
           <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="赠送商品" prop="F_Gift">
-        <el-input v-model="ruleForm.F_Gift" placeholder="请输入赠送商品"/>
-      </el-form-item>
-      <el-form-item label="减免金额" prop="F_Money">
-        <el-input v-model="ruleForm.F_Money" placeholder="请输入减免金额"/>
+      <el-form-item label="变动金额" prop="F_Money">
+        <el-input v-model="ruleForm.F_Money" 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
+              @change="commodityTypeChange"
+              style="width: 100%;"/>
+            <!-- <el-select v-model="commoditySearchData.className" placeholder="请选择商品分类" class="filter-item" clearable value-key="F_ClassId" @change="commodityTypeChange">
+              <el-option
+                v-for="item in commodityTypeLists"
+                :key="item.F_ClassId"
+                :label="item.F_ClassName"
+                :value="item">
+              </el-option>
+            </el-select> -->
+          </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-option>
+            </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-input-number>
+          </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 type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <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-row>
       <el-form-item label="销售备注" prop="F_Remark">
         <el-input :autosize="{ minRows: 4}" v-model="ruleForm.F_Remark" type="textarea" placeholder="请输入销售备注"/>
       </el-form-item>
@@ -28,6 +87,9 @@
 
 <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, editAfterSaleList, getAfterSaleList } from "@/api/afterSaleManagement/afterSaleList";
 
 export default {
@@ -44,7 +106,22 @@ export default {
   },
   data() {
     return {
+      parentids: [],
       mergeType: [],//订单类型
+      commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
+      commodityTableData: [], //添加商品
+      commoditySearchData: { //商品搜索数据
+        classId: '', // 商品分类id
+        className: '', // 商品分类名称
+        productName: '', //商品名称
+        productId: '', //商品id
+        num: 1, //商品数量
+      },
       ruleForm: {
         F_Id: '',
         F_OrderList: '', //合并订单
@@ -86,6 +163,8 @@ export default {
   },
   created() {
     this.getMergeType()
+    this.getCommodityTypeSelect()
+    this.getOrderDetail()
     Promise.all([
     ]).then(() => {
       if (this.rowid) {
@@ -138,7 +217,7 @@ export default {
       return new Promise(resolve=>{
         const params={
           isleaf:true,
-          code:'MERGETYPE'
+          code:'AFTERSALETYPE'
         }
         getDictionaryValueList(params).then(response=>{
           if(response.state.toLowerCase() === 'success'){
@@ -147,6 +226,79 @@ export default {
         })
       })
     },
+    //获取商品分类
+    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
+      }
+      let data = {
+        F_ProductId: this.commoditySearchData.productId,
+        F_ProductName: this.commoditySearchData.productName,
+        F_Count: this.commoditySearchData.num,
+      }
+      this.commodityTableData.push(data)
+    },
+    //删除商品
+    btn_deleteCommodity (val) {
+      let index = this.commodityTableData.indexOf(val)
+      this.commodityTableData.splice(index, 1)
+    },
     // 获取订单详情
     getDetail(orderId) {
       this.loading = true;
@@ -169,6 +321,16 @@ export default {
         resolve();
       });
     },
+    // 详情
+    getOrderDetail(rid) {
+      getOrder(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.orderDetailData.OrderDetailList = res.OrderDetailList //订单详情list
+          this.commodityTableData = res.OrderDetailList
+        }
+      })
+    },
   }
 };
 </script>

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleList/index.vue

@@ -40,7 +40,7 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { getAfterSaleList, deleteConsolidateOrderList } from "@/api/afterSaleManagement/afterSaleList";
+import { getAfterSaleList, deleteAfterSaleList } from "@/api/afterSaleManagement/afterSaleList";
 import { pickerOptions, formatterContent } from "@/utils";
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 import addOrEdit from "./addOrEdit"
@@ -108,7 +108,7 @@ export default {
       return new Promise(resolve=>{
         const params={
           isleaf:true,
-          code:'MERGETYPE'
+          code:'AFTERSALETYPE'
         }
         getDictionaryValueList(params).then(response=>{
           if(response.state.toLowerCase() === 'success'){
@@ -162,7 +162,7 @@ export default {
         const data = {
           ids: id
         }
-        deleteConsolidateOrderList(data).then(response => {
+        deleteAfterSaleList(data).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.getList()
             this.$message.success('删除成功!')

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

@@ -164,14 +164,16 @@
             <el-row>
               <el-col :span='8'>
                 <el-form-item label="商品分类" prop="className" >
-                  <el-select v-model="commoditySearchData.className" placeholder="请选择商品分类" class="filter-item" clearable value-key="F_ClassId" @change="commodityTypeChange">
-                    <el-option
-                      v-for="item in commodityTypeLists"
-                      :key="item.F_ClassId"
-                      :label="item.F_ClassName"
-                      :value="item">
-                    </el-option>
-                  </el-select>
+                  <el-cascader
+                    v-model="parentids"
+                    :options="commodityTypeLists"
+                    :props="typeDropProps"
+                    placeholder="请选择商品分类"
+                    clearable
+                    filterable
+                    change-on-select
+                    @change="commodityTypeChange"
+                    style="width: 100%;"/>
                 </el-form-item>
               </el-col>
               <el-col :span='8'>
@@ -286,6 +288,11 @@ export default {
       stockList: [], //出库货仓下拉数据
       expressList: [], //快递
       commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
       commodityListLists: [], //商品下拉数据
       commoditySearchData: { //商品搜索数据
         classId: '', // 商品分类id
@@ -391,7 +398,6 @@ export default {
       })
     },
     resetForm() {
-      // this.$refs.commoditySearchData.resetFields()
       this.$refs.ruleForm.resetFields()
       this.activityAccountData = []
       this.commodityTableData = []
@@ -524,7 +530,7 @@ export default {
         getCommodityType(data).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.commodityTypeLists = response.data.Rows
+            this.commodityTypeLists = response.data
           }
         })
         resolve()
@@ -539,7 +545,7 @@ export default {
           pagesize: 300, // int 每页几条信息,
           ProductId: '',
           ClassId: this.commoditySearchData.classId === '' ? 0 : this.commoditySearchData.classId,
-          ClassName: this.commoditySearchData.className,
+          ClassName: '',
           ProductName: '',
           PinyinShort: '',
           ProductNumber: '',
@@ -557,8 +563,7 @@ export default {
       })
     },
     commodityTypeChange(item) {
-      this.commoditySearchData.classId = item.F_ClassId
-      this.commoditySearchData.className = item.F_ClassName
+      this.commoditySearchData.classId = this.parentids[this.parentids.length - 1]
       this.getCommodityListSelect()
     },
     commodityListChange(item) {

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

@@ -0,0 +1,374 @@
+<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="false" />
+      </el-form-item>
+      <el-form-item label="售后类型" prop="F_Type" >
+        <el-select v-model="ruleForm.F_Type" class="form_select" filterable clearable placeholder="请选择合并类型">
+          <el-option v-for="item in mergeType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="变动金额" prop="F_Money">
+        <el-input v-model="ruleForm.F_Money" 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
+              @change="commodityTypeChange"
+              style="width: 100%;"/>
+          </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-option>
+            </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-input-number>
+          </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 type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <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-row>
+      <el-row>
+        <el-col :span='24'>
+          <el-form-item label="退回商品">
+            <el-table :data="oldCommodityTableData" stripe style="width: 100%" @selection-change="handleSelectionChange" >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column prop="F_ProductName" label="商品名称" align="center" ></el-table-column>
+              <el-table-column prop="F_Count" label="商品数量" align="center"></el-table-column>
+              <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-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, editAfterSaleList, getAfterSaleList, getAfterSaleOrderCommodityList } from "@/api/afterSaleManagement/afterSaleList";
+
+export default {
+  name: "AddOrEdit",
+  props: {
+    rowid: {
+      type: String,
+      default: ""
+    },
+    layerid: {
+      type: String,
+      default: ""
+    }
+  },
+  data() {
+    return {
+      parentids: [],
+      mergeType: [],//订单类型
+      commodityTypeLists: [], //商品分类下拉数据
+      // 自定义菜单下拉数据的key值
+      typeDropProps: {
+        value: 'id',
+        label: 'text'
+      },
+      commodityTableData: [], //添加商品
+      commoditySearchData: { //商品搜索数据
+        classId: '', // 商品分类id
+        className: '', // 商品分类名称
+        productName: '', //商品名称
+        productId: '', //商品id
+        num: 1, //商品数量
+      },
+      oldCommodityTableData: [], //退回商品列表
+      ruleForm: {
+        F_OrderId: '', //订单编号
+        F_OrderList: '', //补发产品列表
+        F_OldDetailList: '', //退回产品列表
+        F_Type: '', //合并类型
+        F_Gift: '', //赠送商品
+        F_Money: '', //减免金额
+        F_Remark: '', //销售备注
+        F_state: '', //订单状态
+      },
+      rules: {
+        order1: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号1',
+        }],
+        order2: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单编号2',
+        }],
+        F_Type: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入订单类型',
+        }],
+        F_Gift: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入赠送商品',
+        }],
+        F_Money: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入减免金额',
+        }],
+      },
+      loading: false
+    };
+  },
+  created() {
+    this.getMergeType()
+    this.getCommodityTypeSelect()
+    Promise.all([
+    ]).then(() => {
+      if (this.rowid) {
+        this.ruleForm.F_OrderId = this.rowid
+        this.getDetail(this.rowid)
+        this.getAfterSaleOrderCommodity(this.rowid)
+      }
+    });
+  },
+  mounted() {
+    this.automaticallyCheck()
+  },
+  methods: {
+    submitForm(state) {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          this.ruleForm.F_state = state
+          this.ruleForm.F_OrderList = this.commodityTableData //补发产品列表
+          //添加
+          if (!this.rowid) {
+            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
+          }
+          // 编辑
+          editAfterSaleList(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;
+            });
+        } else {
+          this.$message.error("请输入有效的必填项信息!");
+          return false;
+        }
+      });
+    },
+    // 获取合并类型
+    getMergeType() {
+      return new Promise(resolve=>{
+        const params={
+          isleaf:true,
+          code:'AFTERSALETYPE'
+        }
+        getDictionaryValueList(params).then(response=>{
+          if(response.state.toLowerCase() === 'success'){
+            this.mergeType = response.data.Rows
+          }
+        })
+      })
+    },
+    //获取商品分类
+    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
+      }
+      for (let i; i < this.commodityTableData.length; i++ ) {
+        if (this.commodityTableData[i].F_ProductId = this.commoditySearchData.F_ProductId) {
+          this.commodityTableData[i].num = this.commodityTableData[i].num + this.commoditySearchData.num
+        } else {
+          let data = {
+            F_ProductId: this.commoditySearchData.productId,
+            F_ProductName: this.commoditySearchData.productName,
+            F_Count: this.commoditySearchData.num,
+          }
+          this.commodityTableData.push(data)
+        }
+      }
+    },
+    //删除商品
+    btn_deleteCommodity (val) {
+      let index = this.commodityTableData.indexOf(val)
+      this.commodityTableData.splice(index, 1)
+    },
+    // 获取订单详情
+    getDetail(orderId) {
+      this.loading = true;
+      return new Promise(resolve => {
+        const params = {
+          F_State: '-2', //订单状态
+          f_id: orderId,
+        };
+        getAfterSaleList(params).then(response => {
+          this.loading = false;
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data.Rows[0]
+            this.ruleForm.F_OrderList = res.F_OrderList //合并订单
+            this.ruleForm.F_Type = res.F_Type //合并类型
+            this.ruleForm.F_Gift = res.F_Gift //赠送商品
+            this.ruleForm.F_Money = res.F_Money //减免金额
+            this.ruleForm.F_Remark = res.F_Remark //销售备注
+          }
+        });
+        resolve();
+      });
+    },
+    // 售后订单商品列表
+    getAfterSaleOrderCommodity(rid) {
+      getAfterSaleOrderCommodityList(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.oldCommodityTableData = res
+        }
+      })
+    },
+    // 列表自动勾选
+    automaticallyCheck() {
+      this.oldCommodityTableData.forEach((row,index)=>{
+        this.$nextTick(()=>{  
+          this.batchIds.push(row.id)
+          this.$refs.multipleTable.toggleRowSelection(this.tableDataEdit[index])
+        },1)
+      })
+    },
+    //选择多个
+    handleSelectionChange(selection) {
+      this.ruleForm.F_OldDetailList = selection
+    }, 
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form .form_select {
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/src/views/orderManagement/orderList/afterSales.vue

@@ -1,61 +0,0 @@
-<template>
-    <div>
-        <el-form ref="form" :model="form" label-width="80px">
-            <el-form-item label="订单编号">
-                <el-col :span='12'>
-                    <span>{{form.orderNumber}}</span>
-                </el-col>
-            </el-form-item>
-            <el-form-item label="售后内容">
-                <el-select v-model="form.reasonCancel" placeholder="请选择申请内容">
-                <el-option label="分开发货" value="0"></el-option>
-                <el-option label="改运费" value="1"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="submitForm()">提交</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-import { getOrder, } from '@/api/orderManagement/orderList'
-export default {
-    props: {
-        rowid: {
-        type: String,
-        default: ''
-        },
-    },
-    data(){
-        return{
-            form:{
-                orderNumber:'',//订单编号
-                reasonCancel:'',//取消原因
-            }
-        }
-    },
-    created() {
-        console.log(this.rowid)
-        if (this.rowid) {
-        this.getDetail(this.rowid)
-        }
-    },
-    methods: {
-        submitForm(){
-
-        },
-        // 详情
-        getDetail(rid) {
-            getOrder(rid).then(response => {
-                if (response.state.toLowerCase() === 'success') {
-                const res = response.data.model
-                this.form.orderNumber=res.ordercode
-                }
-            })
-        },
-    },
-}
-</script>
-<style lang="scss" scoped>
-</style>

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

@@ -62,7 +62,7 @@
           <el-button v-permission="'HY_apply'" type="text" @click="btn_apply(scope.row.F_Id)">申请</el-button>
           <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_Id)">编辑</el-button>
           <el-button v-permission="'HY_cancel'" type="text" @click="btn_cancel(scope.row.F_Id)">撤销</el-button>
-          <el-button v-permission="'HY_afterSales'" type="text" @click="btn_afterSales(scope.row.F_Id)">售后</el-button>
+          <el-button v-permission="'HY_afterSale'" type="text" @click="btn_afterSale(scope.row.F_Id)">售后</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -87,7 +87,7 @@ import detail from './detail';
 import merge from './merge';
 import apply from './apply';
 import importAuth from './importAuth';
-import afterSales from './afterSales';
+import afterSale from './afterSale';
 import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
 export default {
@@ -279,14 +279,14 @@ export default {
       });
     },
     //售后
-    btn_afterSales(afterSalesId) {
+    btn_afterSale(afterSalesId) {
       this.$layer.iframe({
         content: {
-          content: afterSales, // 传递的组件对象
+          content: afterSale, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: afterSalesId } // props
         },
-        area: ["30%", "40%"],
+        area: ["80%", "80%"],
         title: "售后内容"
       });
     },