改代收

CallCenterWeb.UI/src/views/customerServiceManagement/customerServiceChangeCollection/index.vue

@@ -18,12 +18,14 @@
         <!-- <el-option label="漏发" value="8"/> -->
       </el-select>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button type="primary" v-permission="'HY_batch_signfor'" class="filter-item" @click="btn_batch_signfor">批量签收</el-button>
-      <el-button type="primary" v-permission="'HY_bulk_submit'" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
+      <el-button v-permission="'HY_batch_signfor'" type="primary" class="filter-item" @click="btn_batch_signfor">批量签收</el-button>
+      <el-button v-permission="'HY_batch_rejection'" type="primary" class="filter-item" @click="btn_batch_rejection">批量拒收</el-button>
+      <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
-      <el-tab-pane label="未签收" name="0"></el-tab-pane>
-      <el-tab-pane label="已签收" name="1"></el-tab-pane>
+      <el-tab-pane label="未签收" name="0"/>
+      <el-tab-pane label="已签收" name="1"/>
+      <el-tab-pane label="已拒收" name="2"/>
     </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
@@ -39,7 +41,7 @@
       <el-table-column label="售后类型" align="center">
         <template slot-scope="scope">
           {{ scope.row.F_Type | judgmentStateName }}
-        </template> 
+        </template>
       </el-table-column>
       <el-table-column label="售后审核状态" align="center">
         <template slot-scope="scope">
@@ -60,14 +62,20 @@
           <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_signfor'"
-            type="text"
             v-if="authority_signfor(scope.row.F_IsSignfor)"
+            type="text"
             @click="btn_signfor(scope.row.F_Id, scope.row.F_OrderId)"
           >签收</el-button>
           <el-button
-            v-permission="'HY_submit'"
+            v-permission="'HY_signfor'"
+            v-if="authority_signfor(scope.row.F_IsSignfor)"
             type="text"
+            @click="btn_rejection(scope.row.F_Id, scope.row.F_OrderId)"
+          >拒收</el-button>
+          <el-button
+            v-permission="'HY_submit'"
             v-if="authority_submit(scope.row.F_IsSignfor)"
+            type="text"
             @click="btn_submit(scope.row.F_Id, scope.row.F_OrderId)"
           >提交</el-button>
         </template>
@@ -86,7 +94,7 @@
 
 <script>
 import { getDictionaryValueList } from '@/api/commonAPI'
-import { signforChangeCollectionOrderCustomerService, submitChangeCollectionOrderCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
+import { signforChangeCollectionOrderCustomerService, submitChangeCollectionOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
 import { getAfterSaleList, deleteAfterSaleList } from '@/api/afterSaleManagement/afterSaleList'
 import { pickerOptions, formatterContent } from '@/utils'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
@@ -147,7 +155,7 @@ export default {
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      selectedOrderId: [], // 选中工单id
+      selectedOrderId: [] // 选中工单id
     }
   },
   created() {
@@ -171,7 +179,7 @@ export default {
           pagesize: 1000000, // int 每页几条信息
           F_PayState: '-2',
           F_ReturnType: '改代收',
-          IsSignfor: this.activeName,
+          IsSignfor: this.activeName
         }
         getAfterSaleList(params).then(response => {
           this.loading = false
@@ -187,133 +195,203 @@ export default {
     btn_batch_signfor() {
       if (this.selectedId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.selectedOrderId.length < 1) {
+        this.$message({
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
+      }
+      this.$confirm('确定签收吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const data = {
+            orderids: this.selectedOrderId.join(',').replace(/\s+/g, ''),
+            id: this.selectedId.join(',').replace(/\s+/g, ''),
+            Status: 2
+          }
+          signforChangeCollectionOrderCustomerService(data).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('签收成功!')
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消签收'
+          })
+        })
+    },
+    // 批量拒收
+    btn_batch_rejection() {
+      if (this.selectedId.length < 1) {
+        this.$message({
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
       if (this.selectedOrderId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
-      this.$confirm("确定签收吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('确定拒收吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           const data = {
             orderids: this.selectedOrderId.join(',').replace(/\s+/g, ''),
-            id: this.selectedId.join(',').replace(/\s+/g, ''), 
-          };
+            id: this.selectedId.join(',').replace(/\s+/g, ''),
+            Status: 4
+          }
           signforChangeCollectionOrderCustomerService(data).then((response) => {
-            if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("签收成功!");
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('拒收成功!')
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消签收",
-          });
-        });
+            type: 'info',
+            message: '已取消拒收'
+          })
+        })
     },
     // 签收
     btn_signfor(id, orderId) {
-      this.$confirm("确定签收吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('确定签收吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          const data = {
+            orderids: orderId,
+            id: id,
+            Status: 2
+          }
+          signforChangeCollectionOrderCustomerService(data).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('签收成功!')
+            }
+          })
+        })
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消签收'
+          })
+        })
+    },
+    // 拒收
+    btn_rejection(id, orderId) {
+      this.$confirm('确定拒收吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           const data = {
             orderids: orderId,
             id: id,
-          };
+            Status: 4
+          }
           signforChangeCollectionOrderCustomerService(data).then((response) => {
-            if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("签收成功!");
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('拒收成功!')
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消签收",
-          });
-        });
+            type: 'info',
+            message: '已取消拒收'
+          })
+        })
     },
     // 批量提交
     btn_bulk_submit() {
       if (this.selectedId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
       if (this.selectedOrderId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
-      this.$confirm("确定提交吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('确定提交吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           const data = {
             orderids: this.selectedOrderId.join(',').replace(/\s+/g, ''),
-            id: this.selectedId.join(',').replace(/\s+/g, ''), 
-          };
+            id: this.selectedId.join(',').replace(/\s+/g, '')
+          }
           submitChangeCollectionOrderCustomerService(data).then((response) => {
-            if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("提交成功!");
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('提交成功!')
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消提交",
-          });
-        });
+            type: 'info',
+            message: '已取消提交'
+          })
+        })
     },
     // 提交
     btn_submit(id, orderId) {
-      this.$confirm("确定提交吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('确定提交吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           const data = {
             orderids: orderId,
-            id: id,
-          };
+            id: id
+          }
           submitChangeCollectionOrderCustomerService(data).then((response) => {
-            if (response.state.toLowerCase() === "success") {
-              this.getList();
-              this.$message.success("提交成功!");
+            if (response.state.toLowerCase() === 'success') {
+              this.getList()
+              this.$message.success('提交成功!')
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消提交",
-          });
-        });
+            type: 'info',
+            message: '已取消提交'
+          })
+        })
     },
     // 详情
     btn_after_sale_detail(editId) {
@@ -344,7 +422,7 @@ export default {
       }
     },
     handleTabClick(tab, event) {
-      this.pageParams.pageindex=1
+      this.pageParams.pageindex = 1
       this.getList()
     },
     btn_search() {

CallCenterWeb.UI/src/views/customerServiceManagement/orderListPending/importReceiving.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="importFile">
+    <el-alert title="选取的EXCEL文件需要严格按照下载的EXCEL模板进行填写！选择好文件后点击导入即可！" type="warning" class="md" show-icon/>
+    <el-row>
+      <el-col :lg="7" class="md">
+        <a :href="downloadUrl" download="导入模板.xlsx" class="download_btn" title="点击下载EXCEL模板" rel="nofollow">
+          下载EXCEL模板
+        </a>
+      </el-col>
+      <el-col :lg="17" class="md">
+        <el-upload
+          ref="upload"
+          :limit="1"
+          :file-list="uploadData.fileList"
+          :action= "uploadData.uploadUrl"
+          :data = "uploadData.uploaderFiles"
+          :on-success="uploadSuccess"
+          :on-error="uploadError"
+          :on-exceed="uploadExceed"
+          :auto-upload="false"
+          :headers = "uploadData.uploadHeader"
+          class="uploadFiles"
+          list-type="text"
+          name="upFile"
+          accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+          <el-button slot="trigger" size="small" type="primary">选取EXCEL文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">导入</el-button>
+          <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+        </el-upload>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+
+export default {
+  name: 'ImportFile',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      downloadUrl: '/static/xls/importToBeReviewed.xlsx',
+      uploadData: {// 文件上传数据
+        uploadHeader: {
+          Authorization: getToken()
+        },
+        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/Order/importcheckordermoney',
+        uploaderFiles: {// 上传文件的参数
+
+        },
+        fileList: [] // 展示文件的数据
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    submitUpload() {
+      this.$refs.upload.submit()
+    },
+    // 文件上传
+    uploadSuccess(response, file, fileList) {
+      if (response.state.toLowerCase() === 'success') {
+        this.$parent.$layer.close(this.layerid)
+        this.$parent.getList() // 重新加载父级数据
+        this.$message.success('恭喜你，导入成功!')
+      } else {
+        this.$message.error(response.message)
+      }
+    },
+    uploadExceed(file, fileList) {
+      this.$message.warning('只能选择一个文件!')
+    },
+    uploadError(err, file, fileList) {
+      this.$message.error(err)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.importFile{
+		.md{
+			margin-bottom: 20px;
+		}
+		.download_btn{
+			display: inline-block;
+			line-height: 1;
+			white-space: nowrap;
+			cursor: pointer;
+			border: 1px solid #dcdfe6;
+			-webkit-appearance: none;
+			text-align: center;
+			-webkit-box-sizing: border-box;
+			box-sizing: border-box;
+			outline: 0;
+			margin: 0;
+			-webkit-transition: .1s;
+			transition: .1s;
+			font-weight: 500;
+			padding: 9px 15px;
+			font-size: 12px;
+			border-radius: 4px;
+			color: #fff;
+			background-color: #409EFF;
+			border-color: #409EFF;
+			&:hover{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+			&:active{
+				background: #66b1ff;
+				border-color: #66b1ff;
+				color: #fff;
+			}
+		}
+	}
+</style>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListPending/index.vue

@@ -13,8 +13,8 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
       />
-        <!-- :clearable="false" -->
-        <!-- align="left" -->
+      <!-- :clearable="false" -->
+      <!-- align="left" -->
       <el-cascader
         ref="myCascader"
         v-model="searchData.provinceCity"
@@ -82,14 +82,15 @@
       <el-button v-permission="'HY_bulk_warehouse'" v-if="authority_bulk_warehouse()" type="primary" class="filter-item" @click="btn_bulk_warehouse">批量分仓</el-button>
       <el-button v-permission="'HY_bulk_review'" v-if="authority_bulk_review()" type="primary" class="filter-item" @click="btn_bulk_review">批量审核</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
+      <el-button v-permission="'HY_import'" v-if="activeName==7" type="primary" class="filter-item" @click="btn_import">批量导入审核</el-button>
       <el-button v-permission="'HY_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
       <el-button v-permission="'HY_import_goback'" type="primary" class="filter-item" @click="btn_import_goback">导入附件退回</el-button>
     </div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick">
-      <el-tab-pane label="待分仓" name="1"></el-tab-pane>
-      <el-tab-pane label="无货" name="4"></el-tab-pane>
-      <el-tab-pane label="付款待审核" name="7"></el-tab-pane>
-      <el-tab-pane label="0金额袜子" name="isZeroCommodity"></el-tab-pane>
+      <el-tab-pane label="待分仓" name="1"/>
+      <el-tab-pane label="无货" name="4"/>
+      <el-tab-pane label="付款待审核" name="7"/>
+      <el-tab-pane label="0金额袜子" name="isZeroCommodity"/>
     </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
@@ -99,10 +100,10 @@
       :data="dataLists"
       border
       stripe
-      @selection-change="handleSelectionChange"
       row-key="F_Id"
+      @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" :reserve-selection="true"></el-table-column>
+      <el-table-column :reserve-selection="true" type="selection"/>
       <el-table-column type="index" label="编号" align="center" fixed width="80" />
       <el-table-column prop="F_Id" label="订单编号" align="center" min-width="180">
         <template slot-scope="scope">
@@ -116,7 +117,7 @@
       <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>
+        <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">
@@ -180,41 +181,42 @@
 
 <script>
 import { getDictionaryValueList, getProviceCityById } from '@/api/commonAPI'
-import { getOrderListCustomerService } from "@/api/customerServiceManagement/orderListCustomerService";
-import { pickerOptions, formatterContent } from "@/utils";
+import { getOrderListCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
+import { pickerOptions, formatterContent } from '@/utils'
 // import through from "./through";
 // import label from "./label";
 // import edit from "./edit";
 // import merge from './merge';
-import importGoback from './importGoback';
-import goback from "./goback";
-import warehouse from './warehouse';
-import review from './review';
-import detail from "@/views/orderManagement/orderList/detail"
-import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import importReceiving from './importReceiving'
+import importGoback from './importGoback'
+import goback from './goback'
+import warehouse from './warehouse'
+import review from './review'
+import detail from '@/views/orderManagement/orderList/detail'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 
 export default {
-  name: "OrderListCustomerService",
+  name: 'OrderListCustomerService',
   components: {
     Pagination
   },
   filters: {
-    judgmentStateName (status) {
+    judgmentStateName(status) {
       const statusMap = {
-        '0': "未提交",
-        '1': "待分仓",
-        '2': "已退回",
-        '3': "已分仓",
-        '4': "无货",
-        '5': "仓库待审核",
-        '6': "已发货",
-        '7': "付款待审核",
-        '8': "待分物流",
-        '9': "物流未通过",
+        '0': '未提交',
+        '1': '待分仓',
+        '2': '已退回',
+        '3': '已分仓',
+        '4': '无货',
+        '5': '仓库待审核',
+        '6': '已发货',
+        '7': '付款待审核',
+        '8': '待分物流',
+        '9': '物流未通过'
       }
       return statusMap[status]
     },
-    judgmentOrderGoods (status) {
+    judgmentOrderGoods(status) {
       let orderGoodsNameQuantity = ''
       for (let i = 0; i < status.length; i++) {
         orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
@@ -222,36 +224,36 @@ export default {
       orderGoodsNameQuantity = orderGoodsNameQuantity.substring(0, orderGoodsNameQuantity.length - 1)
       return orderGoodsNameQuantity
     },
-    judgmentAddress (data) {
-      let addProvince = data.F_AddProvince === null ? '' : data.F_AddProvince //省
-      let addCity = data.F_AddCity === null ? '' : data.F_AddCity //市
-      let addArea = data.F_AddArea === null ? '' : data.F_AddArea //县/区
-      let addTown = data.F_AddTown === null ? '' : data.F_AddTown //乡/镇
-      let address = data.F_Address === null ? '' : data.F_Address //详细地址
-      let addressStr = addProvince + addCity + addArea + addTown + address // 地址
+    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
     }
   },
-  data () {
+  data() {
     return {
       loading: false,
       searchData: {
         state: '1',
-        adFrom: '', //消息/广告媒体来源
-        type: '', //订单类型
-        id: '', //订单号
-        customer: '', //客户姓名
-        customerPhone: '', //客户手机号
-        trackingNo: '', //运单号
-        payState: '', //交易状态
+        adFrom: '', // 消息/广告媒体来源
+        type: '', // 订单类型
+        id: '', // 订单号
+        customer: '', // 客户姓名
+        customerPhone: '', // 客户手机号
+        trackingNo: '', // 运单号
+        payState: '', // 交易状态
         provinceCity: [], // 省市县
         minprice: '', // 最低金额
         maxprice: '', // 最高金额
         F_AddDes: '', // 送货说明
-        isZeroCommodity: '',
+        isZeroCommodity: ''
       },
-      searchTime: [], //订单时间
-      activeName: "1", //标签切换首页
+      searchTime: [], // 订单时间
+      activeName: '1', // 标签切换首页
       provinceCityDatas: [], // 省市下拉数据
       provinceCityText: [], // 省市下拉绑定的值
       props: {
@@ -270,16 +272,16 @@ export default {
       dataLists: [], // 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], // 选中的数据的id
-      orderType: [],//订单类型
-      selectOrderId: [], //合并订单id
-    };
+      orderType: [], // 订单类型
+      selectOrderId: [] // 合并订单id
+    }
   },
   watch: {
     searchTime(newVal, oldVal) {
       !newVal && (this.searchTime = [])
     }
   },
-  created () {
+  created() {
     if (this.$route.params.id) {
       this.activeName = this.$route.params.id
     }
@@ -290,28 +292,28 @@ export default {
     this.getAddDesList()
     document.onkeyup = e => {
       if (e.keyCode === 13) {
-        this.getList();
+        this.getList()
       }
-    };
+    }
   },
   methods: {
-    getList () {
-      this.loading = true;
+    getList() {
+      this.loading = true
       return new Promise(resolve => {
         const params = {
-          F_State: this.searchData.state, //订单状态
+          F_State: this.searchData.state, // 订单状态
           pageindex: 1, // int 第几页
           pagesize: 1000000, // int 每页几条信息
-          F_ADFrom: this.searchData.adFrom, //消息/广告来源
-          F_Type: this.searchData.type, //订单类型
-          F_Id: this.searchData.id, //订单号
-          F_Customer: this.searchData.customer, //客户姓名
-          F_CustomerPhone: this.searchData.customerPhone, //客户手机号
-          F_TrackingNo: this.searchData.trackingNo, //运单号
-          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], //添加开始时间
-          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], //添加结束时间
-          PayState: this.searchData.payState, //交易状态
-          F_IsExpress: -2, //-2全部 0客服未分配快递 1已分配
+          F_ADFrom: this.searchData.adFrom, // 消息/广告来源
+          F_Type: this.searchData.type, // 订单类型
+          F_Id: this.searchData.id, // 订单号
+          F_Customer: this.searchData.customer, // 客户姓名
+          F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
+          F_TrackingNo: this.searchData.trackingNo, // 运单号
+          SearchStartTime: this.searchTime[0] == null ? '' : this.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchTime[1] == null ? '' : this.searchTime[1], // 添加结束时间
+          PayState: this.searchData.payState, // 交易状态
+          F_IsExpress: -2, // -2全部 0客服未分配快递 1已分配
           state: '',
           F_AddProvince: this.provinceCityText && this.provinceCityText[0], // 省份
           F_AddCity: this.provinceCityText[1] && this.provinceCityText[1], // 市
@@ -321,31 +323,31 @@ export default {
           maxprice: this.searchData.maxprice, // 最高金额
           F_AddDes: this.searchData.F_AddDes, // 送货说明
           F_IsZeroCommodity: this.searchData.isZeroCommodity
-        };
+        }
         getOrderListCustomerService(params).then(response => {
-          this.loading = false;
-          if (response.state.toLowerCase() === "success") {
-            this.pageParams.total = response.data.Totals;
-            this.dataLists = response.data.Rows;
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.pageParams.total = response.data.Totals
+            this.dataLists = response.data.Rows
           }
-        });
-        resolve();
-      });
+        })
+        resolve()
+      })
     },
-    //处理默认选中当前日期
+    // 处理默认选中当前日期
     getNowTime() {
-      let now = new Date();
-      let year = now.getFullYear(); //得到年份
-      let month = now.getMonth() + 1; //得到月份
-      let date = now.getDate(); //得到日期
-      let hour =" 00:00:00"; //默认时分秒
-      month = month.toString().padStart(2, "0");
-      date = date.toString().padStart(2, "0");
-      let defaultDate = `${year}-${month}-${date}`;
+      const now = new Date()
+      const year = now.getFullYear() // 得到年份
+      let month = now.getMonth() + 1 // 得到月份
+      let date = now.getDate() // 得到日期
+      const hour = ' 00:00:00' // 默认时分秒
+      month = month.toString().padStart(2, '0')
+      date = date.toString().padStart(2, '0')
+      const defaultDate = `${year}-${month}-${date}`
       this.searchTime = [defaultDate, defaultDate]
     },
     // 获取订单类型
-    getOrderType () {
+    getOrderType() {
       return new Promise(resolve => {
         const params = {
           isleaf: true,
@@ -372,9 +374,9 @@ export default {
         })
       })
     },
-    handleTabClick (tab, event) {
-      this.pageParams.pageindex=1
-      if (this.activeName == "isZeroCommodity") {
+    handleTabClick(tab, event) {
+      this.pageParams.pageindex = 1
+      if (this.activeName == 'isZeroCommodity') {
         this.searchData.isZeroCommodity = 1
         this.searchData.state = ''
       } else {
@@ -383,33 +385,45 @@ export default {
       }
       this.getList()
     },
-    btn_search () {
-      this.pageParams.pageindex = 1;
-      this.getList();
+    btn_search() {
+      this.pageParams.pageindex = 1
+      this.getList()
+    },
+    // 批量导入
+    btn_import() {
+      this.$layer.iframe({
+        content: {
+          content: importReceiving, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: '' } // props
+        },
+        area: ['30%', '30%'],
+        title: '导入'
+      })
     },
-    //导出
-    btn_export () {
-      let SearchStartTime = this.searchTime[0] == undefined ? '' : this.searchTime[0]
-      let SearchEndTime = this.searchTime[1] == undefined ? '' : this.searchTime[1]
-      let F_AddProvince = this.provinceCityText[0] == undefined ? '' : this.provinceCityText[0]
-      let F_AddCity = this.provinceCityText[1] == undefined ? '' : this.provinceCityText[1]
-      let F_AddArea = this.provinceCityText[2] == undefined ? '' : this.provinceCityText[2]
-      let F_AddTown = this.provinceCityText[3] == undefined ? '' : this.provinceCityText[3]
-      window.location.href = this.$store.getters.serverConfig.BASE_API + "api/order/getorderlistbykfpage?isdc=1" + "&F_State=" + this.activeName + "&SearchStartTime=" + SearchStartTime + "&SearchEndTime=" + SearchEndTime + "&F_AddProvince=" + F_AddProvince + "&F_AddCity=" + F_AddCity + "&F_AddArea=" + F_AddArea + "&F_AddTown=" + F_AddTown + "&minprice=" + this.searchData.minprice + "&maxprice=" + this.searchData.maxprice + "&F_AddDes=" + this.searchData.F_AddDes
+    // 导出
+    btn_export() {
+      const SearchStartTime = this.searchTime[0] == undefined ? '' : this.searchTime[0]
+      const SearchEndTime = this.searchTime[1] == undefined ? '' : this.searchTime[1]
+      const F_AddProvince = this.provinceCityText[0] == undefined ? '' : this.provinceCityText[0]
+      const F_AddCity = this.provinceCityText[1] == undefined ? '' : this.provinceCityText[1]
+      const F_AddArea = this.provinceCityText[2] == undefined ? '' : this.provinceCityText[2]
+      const F_AddTown = this.provinceCityText[3] == undefined ? '' : this.provinceCityText[3]
+      window.location.href = this.$store.getters.serverConfig.BASE_API + 'api/order/getorderlistbykfpage?isdc=1' + '&F_State=' + this.activeName + '&SearchStartTime=' + SearchStartTime + '&SearchEndTime=' + SearchEndTime + '&F_AddProvince=' + F_AddProvince + '&F_AddCity=' + F_AddCity + '&F_AddArea=' + F_AddArea + '&F_AddTown=' + F_AddTown + '&minprice=' + this.searchData.minprice + '&maxprice=' + this.searchData.maxprice + '&F_AddDes=' + this.searchData.F_AddDes
     },
-    btn_edit (editId) {
+    btn_edit(editId) {
       this.$layer.iframe({
         content: {
           content: edit, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: editId } // props
         },
-        area: ["80%", "90%"],
-        title: "编辑订单"
-      });
+        area: ['80%', '90%'],
+        title: '编辑订单'
+      })
     },
-    //导入
-    btn_waybill_number_import () {
+    // 导入
+    btn_waybill_number_import() {
       this.$layer.iframe({
         content: {
           content: importWaybillNumber, // 传递的组件对象
@@ -422,127 +436,127 @@ export default {
       })
     },
     // 批量分仓
-    btn_bulk_warehouse () {
+    btn_bulk_warehouse() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
       this.$layer.iframe({
         content: {
           content: warehouse, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderids } // props
         },
-        area: ["30%", "30%"],
-        title: "分仓"
-      });
+        area: ['30%', '30%'],
+        title: '分仓'
+      })
     },
     // 分仓
-    btn_warehouse (orderid) {
+    btn_warehouse(orderid) {
       this.$layer.iframe({
         content: {
           content: warehouse, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderid } // props
         },
-        area: ["30%", "30%"],
-        title: "分仓"
-      });
+        area: ['30%', '30%'],
+        title: '分仓'
+      })
     },
     // 批量审核
-    btn_bulk_review () {
+    btn_bulk_review() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
       this.$layer.iframe({
         content: {
           content: review, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderids } // props
         },
-        area: ["30%", "30%"],
-        title: "审核"
-      });
+        area: ['30%', '30%'],
+        title: '审核'
+      })
     },
     // 审核
-    btn_review (orderid) {
+    btn_review(orderid) {
       this.$layer.iframe({
         content: {
           content: review, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderid } // props
         },
-        area: ["30%", "30%"],
-        title: "审核"
-      });
+        area: ['30%', '30%'],
+        title: '审核'
+      })
     },
     // 批量退回
-    btn_bulk_goback () {
+    btn_bulk_goback() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-        return;
+          message: '请选择订单！',
+          type: 'warning'
+        })
+        return
       }
-      let orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
+      const orderids = this.selectOrderId.join(',').replace(/\s+/g, '')
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderids } // props
         },
-        area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        area: ['30%', '30%'],
+        title: '退回订单'
+      })
     },
-    //退回订单
-    btn_goback (orderid) {
+    // 退回订单
+    btn_goback(orderid) {
       this.$layer.iframe({
         content: {
           content: goback, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderid } // props
         },
-        area: ["30%", "30%"],
-        title: "退回订单"
-      });
+        area: ['30%', '30%'],
+        title: '退回订单'
+      })
     },
-    //导入附件退回
-    btn_import_goback () {
+    // 导入附件退回
+    btn_import_goback() {
       this.$layer.iframe({
         content: {
           content: importGoback, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: "" } // props
+          data: { rowid: '' } // props
         },
-        area: ["30%", "30%"],
-        title: "导入附件退回"
-      });
+        area: ['30%', '30%'],
+        title: '导入附件退回'
+      })
     },
-    //通过订单
-    btn_through (orderid) {
+    // 通过订单
+    btn_through(orderid) {
       this.$layer.iframe({
         content: {
           content: through, // 传递的组件对象
           parent: this, // 当前的vue对象
           data: { rowid: orderid } // props
         },
-        area: ["30%", "30%"],
-        title: "通过订单"
-      });
+        area: ['30%', '30%'],
+        title: '通过订单'
+      })
     },
-    //订单详情
-    hadndleOrderCode (ordercode) {
+    // 订单详情
+    hadndleOrderCode(ordercode) {
       this.$layer.iframe({
         content: {
           content: detail, // 传递的组件对象
@@ -553,8 +567,8 @@ export default {
         title: '订单详情'
       })
     },
-    //选择多个
-    handleSelectionChange (val) {
+    // 选择多个
+    handleSelectionChange(val) {
       const ids = []
       this.multipleSelection = val
       for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -607,8 +621,8 @@ export default {
       }
       return data
     },
-    //编辑权限
-    authority_edit (state) {
+    // 编辑权限
+    authority_edit(state) {
       if (state == -1 || state == 0 || state == 1) {
         return true
       } else {
@@ -616,7 +630,7 @@ export default {
       }
     },
     // 分仓权限
-    authority_warehouse (state) {
+    authority_warehouse(state) {
       if (state == 1 || state == 4) {
         return true
       } else {
@@ -624,7 +638,7 @@ export default {
       }
     },
     // 审核权限
-    authority_review (state) {
+    authority_review(state) {
       if (state == 7) {
         return true
       } else {
@@ -635,7 +649,7 @@ export default {
     authority_bulk_review() {
       if (this.activeName == 7) {
         return true
-      } else { 
+      } else {
         return false
       }
     },
@@ -647,8 +661,8 @@ export default {
         return false
       }
     },
-    //退回权限
-    authority_goback (state) {
+    // 退回权限
+    authority_goback(state) {
       return true
       // if (state == 2 || state == 3 || state == 4 || state == 5 || state == 6) {
       //   return false
@@ -656,20 +670,20 @@ export default {
       //   return true
       // }
     },
-    //通过权限
-    authority_through (state) {
+    // 通过权限
+    authority_through(state) {
       if (state == -1 || state == 0 || state == 1) {
         return true
       } else {
         return false
       }
-    },
+    }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .el {
   cursor: pointer;
 }
-</style>
+</style>

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

@@ -12,12 +12,14 @@
         <!-- <el-option label="漏发" value="8"/> -->
       </el-select>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button type="primary" v-permission="'HY_import_waybill_number'" class="filter-item" @click="btn_import_waybill_number">导入运单号</el-button>
+      <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="0"></el-tab-pane>
-      <el-tab-pane label="已签收" name="1"></el-tab-pane>
-      <el-tab-pane label="已提交" name="2"></el-tab-pane>
+      <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"/>
     </el-tabs>
     <div>
       <span>订单数量：{{ pageParams.total }}</span>
@@ -55,8 +57,8 @@
           <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'"
-            type="text"
             v-if="authority_waybill_number(scope.row.F_ReturnType)"
+            type="text"
             @click="btn_waybill_number(scope.row.F_OrderId)"
           >运单号</el-button>
         </template>
@@ -127,10 +129,10 @@ export default {
         checkState: '-2', // 售后审核状态
         type: '', // 售后类型
         isSignfor: '0', // 是否签入
-        woState: '',  // 是否提交
-        returnType: '改代收', // 退回状态
+        woState: '', // 是否提交
+        returnType: '改代收' // 退回状态
       },
-      activeName: '0',
+      activeName: '4',
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -164,7 +166,7 @@ export default {
           F_PayState: '-2',
           F_ReturnType: this.searchData.returnType,
           IsSignfor: this.searchData.isSignfor, // 是否签入
-          F_WoState: this.searchData.woState, // 是否提交
+          F_WoState: this.searchData.woState // 是否提交
         }
         getAfterSaleList(params).then(response => {
           this.loading = false
@@ -232,16 +234,16 @@ export default {
       })
     },
     handleTabClick(tab, event) {
-      this.pageParams.pageindex=1
-      if (this.activeName == "2") {
-        this.searchData.woState = "1"
-        this.searchData.isSignfor = ""
-        this.searchData.returnType = "改代收"
-      } else { 
-        this.searchData.woState = ""
+      this.pageParams.pageindex = 1
+      if (this.activeName == '3') {
+        this.searchData.woState = '1'
+        this.searchData.isSignfor = ''
+        this.searchData.returnType = '改代收'
+      } else {
+        this.searchData.woState = ''
         this.searchData.isSignfor = this.activeName
-        this.searchData.returnType = "改代收"
-       }
+        this.searchData.returnType = '改代收'
+      }
       this.getList()
     },
     btn_search() {
@@ -283,7 +285,7 @@ export default {
       }
     },
     authority_waybill_number(returnType) {
-      if (returnType == "改代收") {
+      if (returnType == '改代收') {
         return true
       } else {
         return false

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

@@ -284,14 +284,14 @@
             @click="btn_cancel(scope.row.F_Id)"
             :disabled="isDisable"
           >撤回</el-button> -->
-          <el-button
+          <!-- <el-button
             v-permission="'HY_afterSale'"
-            v-if="authority_afterSale(scope.row.F_State)"
+            v-if="authority_afterSale(scope.row.State)"
             :disabled="isDisable"
             type="text"
             @click="btn_afterSale(scope.row.F_Id)"
           >售后</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -838,13 +838,13 @@ export default {
       }
     },
     // 售后权限
-    authority_afterSale(state) {
-      if (this.activeName == 1) {
-        return true
-      } else {
-        return false
-      }
-    },
+    // authority_afterSale(state) {
+    //   if (this.activeName == 1) {
+    //     return true
+    //   } else {
+    //     return false
+    //   }
+    // },
     // 编辑权限
     authority_edit(state, type) {
       if (