问题修改

CallCenterWeb.UI/src/views/afterSaleManagement/afterSaleOrderList/edit.vue

           <el-form-item
             v-show="judgmentIsPayment"
             label="付款金额"
-            prop="OrderMoney.F_Money"            
+            prop="OrderMoney.F_Money"
           >
             <el-input
               v-model.number="ruleForm.OrderMoney.F_Money"
               placeholder="请输入付款金额"
+              :disabled="disabledIsPayment"
+              @change="changeOrderMoneyMoney"
             />
           </el-form-item>
         </el-col>
       maxUsePoints: '', // 最大可使用积分
       pointsDeductedAmount: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
+      disabledIsPayment: false, // 付款金额
       totalAmount: '',
       selectAddress: 3, // 选择地址
       defaultAddress: {
     changePayType(val) {
       if (val === '货到付款') {
         this.judgmentIsPayment = false
+        this.disabledIsPayment = false
       } else if (val === '全额付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = true
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === '部分付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = true
       } else {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       }
         this.getTotalAmountFun()
       }
     },
+    changeOrderMoneyMoney(val) {
+      let points = this.alreadyPoints == '' ? 0 : this.alreadyPoints
+      if (this.ruleForm.F_PayType === '部分付款') {
+        if (Number(val) > Number(points)) {
+          this.$message({
+            message: '请输入有效付款金额！',
+            type: 'warning'
+          })
+          this.isSubmitForm = true
+        }
+      } else {
+        this.isSubmitForm = false
+      }
+    },
   }
 };
 </script>

CallCenterWeb.UI/src/views/callScreen/components/createOrder.vue

                 <el-input
                   v-model.number="ruleForm.OrderMoney.F_Money"
                   placeholder="请输入付款金额"
+                  :disabled="disabledIsPayment"
+                  @change="changeOrderMoneyMoney"
                 />
               </el-form-item>
             </el-col>
       maxUsePoints: '', // 最大可使用积分
       pointsDeductedAmount: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
+      disabledIsPayment: false, // 付款金额
       totalAmount: 0, // 应付金额
       defaultAddress: {
         province: '', // 省
               message: '请输入付款金额'
             }
           ]
-        }        
+        }
       },
       loading: false,
       staffNumber: '8000'
     changePayType(val) {
       if (val === '货到付款') {
         this.judgmentIsPayment = false
+        this.disabledIsPayment = false
       } else if (val === '全额付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = true
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === '部分付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = true
       } else {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       }
         this.getTotalAmountFun()
       }
     },
+    changeOrderMoneyMoney(val) {
+      let points = this.alreadyPoints == '' ? 0 : this.alreadyPoints
+      if (this.ruleForm.F_PayType === '部分付款') {
+        if (Number(val) > Number(points)) {
+          this.$message({
+            message: '请输入有效付款金额！',
+            type: 'warning'
+          })
+          this.isSubmitForm = true
+        }
+      } else {
+        this.isSubmitForm = false
+      }
+    },
   }
 }
 </script>

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '京东快递'
         }
         getOrderListCustomerService(params).then(response => {

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</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_export'" type="primary" class="filter-item" @click="btn_export">导出</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '韵达快递'
         }
         getOrderListCustomerService(params).then(response => {

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceSF/goback.vue

-<template>
-  <div>
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="80px">
-      <el-form-item label="退回" prop="state">
-        <el-select
-          v-model="ruleForm.state"
-          class="form_select"
-          filterable
-          clearable
-          placeholder="请选择退回"
-          @change="selectback"
-        >
-          <el-option label="退回上一级" value="0" />
-          <el-option label="退回销售" value="1" />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-show="ishow" label="退回原因">
-        <el-input v-model="ruleForm.remark" type="textarea" placeholder="退回原因"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm()">提交</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-<script>
-import { gobackOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
-export default {
-  props: {
-    rowid: {
-      type: String,
-      default: ''
-    },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      ishow: true, // 原因显隐
-      ruleForm: {
-        orderids: '', // 订单编号
-        remark: '', // 备注
-        state: ''
-      },
-      rules: {
-        state: [
-          {
-            required: true,
-            trigger: 'change',
-            message: '请选择退回'
-          }
-        ]
-      }
-    }
-  },
-  created() {
-    if (this.rowid) {
-      this.ruleForm.orderids = this.rowid
-    }
-  },
-  methods: {
-    submitForm() {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          gobackOrderCustomerService(this.ruleForm)
-            .then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.$parent.$layer.close(this.layerid)
-                this.$parent.getList() // 重新加载父级数据
-                this.$message.success('恭喜你，订单信息退回成功!')
-              }
-            })
-            .catch(() => {
-              this.loading = false
-            })
-        }
-      })
-    },
-    selectback(e) {
-      if (e === '0') {
-        this.ishow = false
-      } else {
-        this.ishow = true
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.form_select {
-  width: 100%
-}
-</style>

CallCenterWeb.UI/src/views/customerServiceManagement/orderListCustomerServiceSF/importSubmit.vue

-<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/importCustomerServiceSubmit.xlsx',
-      uploadData: {// 文件上传数据
-        uploadHeader: {
-          Authorization: getToken(),
-        },
-        uploadUrl: this.$store.getters.serverConfig.BASE_API + 'api/KFOrder/importordersubmitexcel',
-        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/orderListCustomerServiceSF/index.vue

-<template>
-  <div class="app-container">
-    <div class="filter-container">
-      <el-date-picker
-        v-model="searchData.searchTime"
-        :picker-options="pickerOptions"
-        class="filter-item"
-        type="daterange"
-        format="yyyy年MM月dd日"
-        value-format="yyyy-MM-dd"
-        align="left"
-        unlink-panels
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      />
-      <el-input v-model="searchData.adFrom" placeholder="请输入消息/广告媒体来源" class="filter-item" />
-      <el-select v-model="searchData.type" class="filter-item" filterable clearable placeholder="请选择订单类型">
-        <el-option v-for="item in orderType" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"/>
-      </el-select>
-      <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
-      <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
-      <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
-      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</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_submit'" type="primary" class="filter-item" @click="btn_import_submit">导入附件提交</el-button>
-    </div>
-    <el-tabs v-model="activeName" type="card" @tab-click="handleTabClick" >
-      <el-tab-pane label="全部" name="3"/>
-    </el-tabs>
-    <div>
-      <span>订单数量：{{ pageParams.total }}</span>
-    </div>
-    <el-table v-loading="loading" :data="dataLists" border stripe row-key="F_Id" @selection-change="handleSelectionChange">
-      <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">
-          <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 | judgmentStateName }}
-        </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_Express" 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_submit'"
-            type="text"
-            @click="btn_submit(scope.row.F_Id)"
-          >提交</el-button>
-          <el-button
-            v-permission="'HY_goback'"
-            type="text"
-            @click="btn_goback(scope.row.F_Id)"
-          >客服退回</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- <pagination
-      v-show="pageParams.total > 0"
-      :total="pageParams.total"
-      :pageindex.sync="pageParams.pageindex"
-      :pagesize.sync="pageParams.pagesize"
-      class="pagination"
-      @pagination="getList"
-    /> -->
-  </div>
-</template>
-
-<script>
-import { getDictionaryValueList } from '@/api/commonAPI'
-import { getOrderListCustomerService, submitOrderCustomerService } from '@/api/customerServiceManagement/orderListCustomerService'
-import { pickerOptions, formatterContent } from '@/utils'
-import goback from './goback'
-import importSubmit from './importSubmit'
-import detail from '@/views/orderManagement/orderList/detail'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
-
-export default {
-  name: 'OrderListCustomerService',
-  components: {
-    Pagination
-  },
-  filters: {
-    judgmentStateName(status) {
-      const statusMap = {
-        '0': '未提交',
-        '1': '待分仓',
-        '2': '已退回',
-        '3': '已分仓',
-        '4': '无货',
-        '5': '仓库待审核',
-        '6': '已发货',
-        '7': '付款待审核',
-        '8': '待分物流',
-        '9': '物流未通过'
-      }
-      return statusMap[status]
-    },
-    judgmentOrderGoods(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
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      searchData: {
-        adFrom: '', // 消息/广告媒体来源
-        type: '', // 订单类型
-        id: '', // 订单号
-        customer: '', // 客户姓名
-        customerPhone: '', // 客户手机号
-        trackingNo: '', // 运单号
-        searchTime: '' // 订单时间
-      },
-      activeName: '3', // 标签切换首页
-      pickerOptions, // 日期数据
-      pageParams: {
-        pageindex: 1, // 当前第几页
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
-        total: 0 // 总共多少数据
-      },
-      dataLists: [], // 列表数据
-      multipleSelection: [], // 选中的数据
-      orderType: [], // 订单类型
-      selectOrderId: [] // 选中id
-    }
-  },
-  created() {
-    this.getOrderType()
-    this.getList()
-    document.onkeyup = e => {
-      if (e.keyCode === 13) {
-        this.getList()
-      }
-    }
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      return new Promise(resolve => {
-        const params = {
-          F_State: this.activeName, // 订单状态 -2全部
-          pageindex: this.pageParams.pageindex, // int 第几页
-          pagesize: this.pageParams.pagesize, // 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.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
-          F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
-          F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          F_Express: '顺丰快递'
-        }
-        getOrderListCustomerService(params).then(response => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.data.Totals
-            this.dataLists = response.data.Rows
-          }
-        })
-        resolve()
-      })
-    },
-    // 获取订单类型
-    getOrderType() {
-      return new Promise(resolve => {
-        const params = {
-          isleaf: true,
-          code: 'ORDERTYPE'
-        }
-        getDictionaryValueList(params).then(response => {
-          if (response.state.toLowerCase() === 'success') {
-            this.orderType = response.data.Rows
-          }
-        })
-      })
-    },
-    handleTabClick(tab, event) {
-      this.getList()
-    },
-    btn_search() {
-      this.pageParams.pageindex = 1
-      this.getList()
-    },
-    // 提交
-    btn_submit(orderId) {
-      this.isDisable = true
-      setTimeout(() => {
-        this.$confirm('您确定提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.isDisable = false
-            const data = {
-              orderids: orderId
-            }
-            submitOrderCustomerService(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('提交成功!')
-              }
-            })
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消提交'
-            })
-          })
-        this.isDisable = false
-      }, 300)
-    },
-    // 批量退回
-    btn_bulk_goback() {
-      if (this.selectOrderId.length < 1) {
-        this.$message({
-          message: '请选择订单！',
-          type: 'warning'
-        })
-        return
-      }
-      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: '退回订单'
-      })
-    },
-
-    // 批量提交
-    btn_bulk_submit() {
-      if (this.selectOrderId.length < 1) {
-        this.$message({
-          message: '请选择订单！',
-          type: 'warning'
-        })
-        return
-      }
-      this.isDisable = true
-      setTimeout(() => {
-        this.$confirm('您确定提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.isDisable = false
-            const data = {
-              orderids: this.selectOrderId.join(',').replace(/\s+/g, '')
-            }
-            submitOrderCustomerService(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('提交成功!')
-              }
-            })
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消提交'
-            })
-          })
-        this.isDisable = false
-      }, 300)
-    },
-    // 退回订单
-    btn_goback(orderid) {
-      this.$layer.iframe({
-        content: {
-          content: goback, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: orderid } // props
-        },
-        area: ['30%', '30%'],
-        title: '退回订单'
-      })
-    },
-    // 导入附件提交
-    btn_import_submit() {
-      this.$layer.iframe({
-        content: {
-          content: importSubmit, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
-        },
-        area: ['30%', '30%'],
-        title: '导入附件提交'
-      })
-    },
-    hadndleOrderCode(ordercode) {
-      this.$layer.iframe({
-        content: {
-          content: detail, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { 'rowid': ordercode }// props
-        },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
-    },
-    // 选择多个
-    handleSelectionChange(val) {
-      const ids = []
-      this.multipleSelection = val
-      for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].F_Id)
-      }
-      this.selectOrderId = ids
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-.el{
-  cursor: pointer;
-}
-</style>

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '申通快递'
         }
         getOrderListCustomerService(params).then(response => {

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '山西顺丰'
         }
         getOrderListCustomerService(params).then(response => {

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '新乡顺丰'
         }
         getOrderListCustomerService(params).then(response => {

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '圆通快递'
         }
         getOrderListCustomerService(params).then(response => {

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

       <el-input v-model="searchData.id" placeholder="请输入订单号" class="filter-item" />
       <el-input v-model="searchData.customer" placeholder="请输入客户姓名" class="filter-item" />
       <el-input v-model="searchData.customerPhone" placeholder="请输入客户手机号" class="filter-item" />
-      <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" />
+      <!-- <el-input v-model="searchData.trackingNo" placeholder="请输入运单号" class="filter-item" /> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_bulk_submit'" type="primary" class="filter-item" @click="btn_bulk_submit">批量提交</el-button>
       <el-button v-permission="'HY_bulk_goback'" type="primary" class="filter-item" @click="btn_bulk_goback">批量退回</el-button>
           F_Customer: this.searchData.customer, // 客户姓名
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_IsExpress: 1, // -2全部 0客服未分配快递 1已分配
           F_PayState: -2, // 支付状态-2 全部0待回款 1已完成 2待退款 3已完成
-          startexpress: this.searchData.expressTime[0],
-          endexpress: this.searchData.expressTime[1],
+          startexpress: this.searchData.expressTime && this.searchData.expressTime[0],
+          endexpress: this.searchData.expressTime && this.searchData.expressTime[1],
           F_Express: '中通快递'
         }
         getOrderListCustomerService(params).then(response => {

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

         change-on-select
         @change="handleItemChange"
       />
-      <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
-      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" />
+      <!-- <el-input v-model="searchData.minprice" placeholder="请输入最低金额" class="filter-item" />
+      <el-input v-model="searchData.maxprice" placeholder="请输入最高金额" class="filter-item" /> -->
       <el-select
         v-model="searchData.F_AddDes"
         placeholder="请选择送货说明"

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

                 <el-input
                   v-model.number="ruleForm.OrderMoney.F_Money"
                   placeholder="请输入付款金额"
+                  :disabled="disabledIsPayment"
+                  @change="changeOrderMoneyMoney"
                 />
               </el-form-item>
             </el-col>
       maxUsePoints: '', // 最大可使用积分
       pointsDeductedAmount: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
+      disabledIsPayment: false, // 付款金额
       totalAmount: 0, // 应付金额
       defaultAddress: {
         province: '', // 省
     changePayType(val) {
       if (val === '货到付款') {
         this.judgmentIsPayment = false
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === '全额付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = true
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === '部分付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = true
       } else {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       }
         this.getTotalAmountFun()
       }
     },
+    changeOrderMoneyMoney(val) {
+      let points = this.alreadyPoints == '' ? 0 : this.alreadyPoints
+      if (this.ruleForm.F_PayType === '部分付款') {
+        if (Number(val) > Number(points)) {
+          this.$message({
+            message: '请输入有效付款金额！',
+            type: 'warning'
+          })
+          this.isSubmitForm = true
+        }
+      } else {
+        this.isSubmitForm = false
+      }
+    },
   }
 }
 </script>

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

     },
     handleTabClick() {
       this.pageParams.pageindex = 1
+      let date = new Date()
+      date.setTime(date.getTime() - 24 * 60 * 60 * 1000)
+      const year = date.getFullYear()
+      let month = date.getMonth() + 1
+      const day = date.getDate()
+      const hour = '00:00:00'
+      month = month.toString().padStart(2, '0')
+      date = date.toString().padStart(2, '0')
+      const defaultDate = `${year}-${month}-${day} ${hour}`
+
       if (this.activeName == 2) {
-        let date = new Date()
-        date.setTime(date.getTime() - 24 * 60 * 60 * 1000)
-        const year = date.getFullYear()
-        let month = date.getMonth() + 1
-        const day = date.getDate()
-        const hour = '00:00:00'
-        month = month.toString().padStart(2, '0')
-        date = date.toString().padStart(2, '0')
-        const defaultDate = `${year}-${month}-${day} ${hour}`
         this.searchDatas.contactTime = ['', defaultDate]
       } else if (this.activeName == 1) {
-        let date = new Date()
-        const year = date.getFullYear()
-        let month = date.getMonth() + 1
-        const day = date.getDate()
-        const hour = '00:00:00'
-        month = month.toString().padStart(2, '0')
-        date = date.toString().padStart(2, '0')
-        const defaultDate = `${year}-${month}-${day} ${hour}`
         this.searchDatas.contactTime = ['1970-01-01 00:00:00', defaultDate]
       } else {
         this.searchDatas.contactTime = ['', '']

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

             <el-input
               v-model.number="ruleForm.OrderMoney.F_Money"
               placeholder="请输入付款金额"
+              :disabled="disabledIsPayment"
+              @change="changeOrderMoneyMoney"
             />
           </el-form-item>
         </el-col>
       maxUsePoints: '', // 最大可使用积分
       pointsDeductedAmount: '', // 最大可使用积分
       judgmentIsPayment: false, // 判断是否货到付款
+      disabledIsPayment: false, // 付款金额
       totalAmount: 0,
       selectAddress: 3, // 选择地址
       defaultAddress: {
     changePayType(val) {
       if (val === '货到付款') {
         this.judgmentIsPayment = false
+        this.disabledIsPayment = false
       } else if (val === '全额付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = true
         this.ruleForm.OrderMoney.F_Money = this.totalAmount
         this.rules.OrderMoney.F_Money[0].required = false
       } else if (val === '部分付款') {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = true
       } else {
         this.judgmentIsPayment = true
+        this.disabledIsPayment = false
         this.ruleForm.OrderMoney.F_Money = 0
         this.rules.OrderMoney.F_Money[0].required = false
       }
         this.getTotalAmountFun()
       }
     },
+    changeOrderMoneyMoney(val) {
+      let points = this.alreadyPoints == '' ? 0 : this.alreadyPoints
+      if (this.ruleForm.F_PayType === '部分付款') {
+        if (Number(val) > Number(points)) {
+          this.$message({
+            message: '请输入有效付款金额！',
+            type: 'warning'
+          })
+          this.isSubmitForm = true
+        }
+      } else {
+        this.isSubmitForm = false
+      }
+    },
   }
 };
 </script>

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

             class="filter-item"
           />
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="3">
           <el-input
             v-model="searchData.trackingNo"
           />
         </el-col>
         <el-col :span="3">
+          <el-input
+            v-model="searchData.keywords"
+            placeholder="请输入关键字"
+            class="filter-item"
+          />
+        </el-col>
+        <el-col :span="3">
           <el-select
-            v-if="activeName==1"
+            v-if="activeName == 1"
             v-model="searchData.logisticsStatus"
             class="form_select"
             filterable
         </el-col>
         <el-col :span="3">
           <el-select
-            v-if="activeName==1"
+            v-if="activeName == 1"
             v-model="searchData.F_State"
             class="form_select"
             filterable
             class="filter-item"
             icon="el-icon-search"
             @click="btn_search"
-          >搜索</el-button
+            >搜索</el-button
           >
           <el-button
             v-permission="'HY_export'"
             class="filter-item"
             icon="el-icon-upload2"
             @click="btn_export"
-          >导出</el-button
+            >导出</el-button
           >
           <el-button
             v-permission="'HY_import'"
             class="filter-item"
             icon="el-icon-download"
             @click="btn_import"
-          >导入</el-button
+            >导入</el-button
           >
           <el-button
             v-permission="'HY_merge'"
             type="primary"
             class="filter-item"
             @click="btn_merge"
-          >合并</el-button
+            >合并</el-button
           >
           <el-button
             v-permission="'HY_bulk_submit'"
             type="primary"
             class="filter-item"
             @click="btn_bulk_submit"
-          >批量提交</el-button
+            >批量提交</el-button
           >
         </el-col>
       </el-row>
             type="text"
             size="small"
             @click="hadndleOrderCode(scope.row.F_Id)"
-          >{{ scope.row.F_Id }}</el-button
+            >{{ scope.row.F_Id }}</el-button
           >
         </template>
       </el-table-column>
           scope.row.F_State | judgmentStateName
         }}</template>
       </el-table-column>
-      <el-table-column prop="F_CheckRemark" label="客服退回原因" align="center" />
+      <el-table-column
+        prop="F_CheckRemark"
+        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" />
             :disabled="isDisable"
             type="text"
             @click="btn_edit(scope.row.F_Id)"
-          >编辑</el-button
+            >编辑</el-button
           >
           <el-button
             v-permission="'HY_add_remark'"
             type="text"
             @click="btn_add_remark(scope.row.F_Id)"
-          >备注</el-button
+            >备注</el-button
           >
           <el-button
             v-permission="'HY_submit'"
             :disabled="isDisable"
             type="text"
             @click="btn_submit(scope.row.F_Id)"
-          >提交</el-button
+            >提交</el-button
           >
           <!-- <el-button
             v-permission="'HY_cancel'"
 </template>
 
 <script>
-import { getDictionaryValueList } from '@/api/commonAPI'
+import { getDictionaryValueList } from "@/api/commonAPI";
 import {
   getOrderLists,
   cancelOrder,
   orderBulkSubmit
-} from '@/api/orderManagement/orderList'
-import { pickerOptions, formatterContent } from '@/utils'
-import { Send } from '@/utils/telWebsocket'
-import { getCallOutprefix } from '@/api/teloperation'
-import { mapGetters } from 'vuex'
-import store from '@/store'
-import addOrEditRemark from './addOrEditRemark'
-import edit from './edit'
-import detail from './detail'
-import merge from './merge'
+} from "@/api/orderManagement/orderList";
+import { pickerOptions, formatterContent } from "@/utils";
+import { Send } from "@/utils/telWebsocket";
+import { getCallOutprefix } from "@/api/teloperation";
+import { mapGetters } from "vuex";
+import store from "@/store";
+import addOrEditRemark from "./addOrEditRemark";
+import edit from "./edit";
+import detail from "./detail";
+import merge from "./merge";
 // import apply from "./apply";
-import importAuth from './importAuth'
-import afterSale from './afterSale'
-import payMoney from './payMoney'
-import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import importAuth from "./importAuth";
+import afterSale from "./afterSale";
+import payMoney from "./payMoney";
+import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
 
 export default {
-  name: 'OrderList',
+  name: "OrderList",
   components: {
     Pagination
   },
   filters: {
     judgmentStateName(status) {
       const statusMap = {
-        0: '未提交',
-        1: '待分仓',
-        2: '已退回',
-        3: '已分仓',
-        4: '无货',
-        5: '仓库待审核',
-        6: '已发货',
-        7: '付款待审核',
-        8: '待分物流',
-        9: '物流未通过'
-      }
-      return statusMap[status]
+        0: "未提交",
+        1: "待分仓",
+        2: "已退回",
+        3: "已分仓",
+        4: "无货",
+        5: "仓库待审核",
+        6: "已发货",
+        7: "付款待审核",
+        8: "待分物流",
+        9: "物流未通过"
+      };
+      return statusMap[status];
     },
     judgmentStatusName(status) {
       const statusMap = {
-        0: '未发出',
-        1: '未签收',
-        2: '签收',
-        3: '改代收',
-        4: '拒收'
-      }
-      return statusMap[status]
+        0: "未发出",
+        1: "未签收",
+        2: "签收",
+        3: "改代收",
+        4: "拒收"
+      };
+      return statusMap[status];
     },
     judgmentOrderGoods(status) {
-      let orderGoodsNameQuantity = ''
+      let orderGoodsNameQuantity = "";
       for (let i = 0; i < status.length; i++) {
-        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`
+        orderGoodsNameQuantity = `${orderGoodsNameQuantity}${status[i].F_ProductName}*${status[i].F_Count},`;
       }
       orderGoodsNameQuantity = orderGoodsNameQuantity.substring(
         0,
         orderGoodsNameQuantity.length - 1
-      )
-      return orderGoodsNameQuantity
+      );
+      return orderGoodsNameQuantity;
     }
   },
   data() {
       isDisable: false, // 防止多次点击
       loading: false,
       searchData: {
-        adFrom: '', // 消息/广告媒体来源
-        type: '', // 订单类型
-        payType: '', // 支付方式
-        id: '', // 订单号
-        customer: '', // 客户姓名
-        customerPhone: '', // 客户手机号
-        trackingNo: '', // 运单号
-        searchTime: '', // 订单时间
-        logisticsStatus: '', // 物流状态
-        F_State: '0',
-        State: ''
+        adFrom: "", // 消息/广告媒体来源
+        type: "", // 订单类型
+        payType: "", // 支付方式
+        id: "", // 订单号
+        customer: "", // 客户姓名
+        customerPhone: "", // 客户手机号
+        trackingNo: "", // 运单号
+        keywords: "", // 关键字
+        searchTime: "", // 订单时间
+        logisticsStatus: "", // 物流状态
+        F_State: "0",
+        State: ""
       },
-      activeName: '0', // 标签切换首页
+      activeName: "0", // 标签切换首页
       pickerOptions, // 日期数据
       pageParams: {
         pageindex: 1, // 当前第几页
       selectOrderId: [], // 合并订单id
       orderstate: [
         {
-          id: '1',
-          value: '待分仓'
+          id: "1",
+          value: "待分仓"
         },
         // {
         //   id: '2',
         //   value: '客服退回'
         // },
         {
-          id: '3',
-          value: '已分仓'
+          id: "3",
+          value: "已分仓"
         },
         {
-          id: '4',
-          value: '无货'
+          id: "4",
+          value: "无货"
         },
         // {
         //   id: '5',
         //   value: '客服提交'
         // },
         {
-          id: '6',
-          value: '已发货'
+          id: "6",
+          value: "已发货"
         },
         {
-          id: '7',
-          value: '付款待审核'
+          id: "7",
+          value: "付款待审核"
         },
         {
-          id: '8',
-          value: '待分物流'
+          id: "8",
+          value: "待分物流"
         },
         {
-          id: '9',
-          value: '物流未通过'
+          id: "9",
+          value: "物流未通过"
         }
       ]
-    }
+    };
   },
   created() {
     if (this.$route.params.id) {
       // this.activeName = this.$route.params.id
     }
-    this.getOrderType()
-    this.getOrderF_State()
-    this.getList()
-    this.getPayType()
-    document.onkeyup = (e) => {
+    this.getOrderType();
+    this.getOrderF_State();
+    this.getList();
+    this.getPayType();
+    document.onkeyup = e => {
       if (e.keyCode === 13) {
-        this.getList()
+        this.getList();
       }
-    }
+    };
   },
   computed: {
     ...mapGetters([
-      'usercode', // 工号
-      'extension', // 分机号
-      'sidebar',
-      'avatar',
-      'telCallType', // 通话类型
-      'telIsVisCallout' // 外呼面板是否显示
+      "usercode", // 工号
+      "extension", // 分机号
+      "sidebar",
+      "avatar",
+      "telCallType", // 通话类型
+      "telIsVisCallout" // 外呼面板是否显示
     ])
   },
   methods: {
     getList() {
-      this.loading = true
-      return new Promise((resolve) => {
+      this.loading = true;
+      return new Promise(resolve => {
         const params = {
           F_State: this.searchData.F_State, // 订单状态
           pageindex: 1, // int 第几页
           F_Status: this.searchData.logisticsStatus, // 物流状态
           F_CustomerPhone: this.searchData.customerPhone, // 客户手机号
           F_TrackingNo: this.searchData.trackingNo, // 运单号
-          SearchStartTime: this.searchData.searchTime[0], // 添加开始时间
-          SearchEndTime: this.searchData.searchTime[1], // 添加结束时间
+          keywords: this.searchData.keywords, // 关键字
+          SearchStartTime: this.searchData.searchTime && this.searchData.searchTime[0], // 添加开始时间
+          SearchEndTime: this.searchData.searchTime && this.searchData.searchTime[1], // 添加结束时间
           F_PayState: -2,
           State: this.searchData.State
-        }
-        getOrderLists(params).then((response) => {
-          this.loading = false
-          if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.data.Totals
-            this.dataLists = response.data.Rows
+        };
+        getOrderLists(params).then(response => {
+          this.loading = false;
+          if (response.state.toLowerCase() === "success") {
+            this.pageParams.total = response.data.Totals;
+            this.dataLists = response.data.Rows;
           }
-        })
-        resolve()
-      })
+        });
+        resolve();
+      });
     },
     // 获取订单类型
     getOrderType() {
-      return new Promise((resolve) => {
+      return new Promise(resolve => {
         const params = {
           isleaf: true,
-          code: 'ORDERTYPE'
-        }
-        getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.orderType = response.data.Rows
+          code: "ORDERTYPE"
+        };
+        getDictionaryValueList(params).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            this.orderType = response.data.Rows;
           }
-        })
-      })
+        });
+      });
     },
     // 获取支付方式
     getPayType() {
-      return new Promise((resolve) => {
+      return new Promise(resolve => {
         const params = {
           isleaf: true,
-          code: 'PayType'
-        }
-        getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            this.payTypeList = response.data.Rows
+          code: "PayType"
+        };
+        getDictionaryValueList(params).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            this.payTypeList = response.data.Rows;
           }
-        })
-      })
+        });
+      });
     },
     // 获取物流状态
     getOrderF_State() {
-      return new Promise((resolve) => {
+      return new Promise(resolve => {
         const params = {
           isleaf: true,
-          code: 'OrderF_State'
-        }
-        getDictionaryValueList(params).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            const res = response.data.Rows
+          code: "OrderF_State"
+        };
+        getDictionaryValueList(params).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data.Rows;
             res.forEach((e, i) => {
-              if (e.F_Remark === '未签收') {
-                this.logisticsList.push(e)
-              } else if (e.F_Remark === '签收') {
-                this.logisticsList.push(e)
-              } else if (e.F_Remark === '拒收') {
-                this.logisticsList.push(e)
-              } else if (e.F_Remark === '未发出') {
-                this.logisticsList.push(e)
+              if (e.F_Remark === "未签收") {
+                this.logisticsList.push(e);
+              } else if (e.F_Remark === "签收") {
+                this.logisticsList.push(e);
+              } else if (e.F_Remark === "拒收") {
+                this.logisticsList.push(e);
+              } else if (e.F_Remark === "未发出") {
+                this.logisticsList.push(e);
               }
-            })
+            });
           }
-        })
-      })
+        });
+      });
     },
     handleTabClick(tab, event) {
-      this.$refs.multipleTable.clearSelection()
-      this.pageParams.pageindex = 1
-      if (this.activeName == '1') {
-        this.searchData.State = this.activeName
-        this.searchData.F_State = ''
+      this.$refs.multipleTable.clearSelection();
+      this.pageParams.pageindex = 1;
+      if (this.activeName == "1") {
+        this.searchData.State = this.activeName;
+        this.searchData.F_State = "";
       } else {
-        this.searchData.F_State = this.activeName
-        this.searchData.State = ''
+        this.searchData.F_State = this.activeName;
+        this.searchData.State = "";
       }
-      this.getList()
+      this.getList();
     },
     handle(ordercode) {
       this.$layer.iframe({
           parent: this, // 当前的vue对象
           data: { rowid: ordercode } // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
+        area: ["80%", "90%"],
+        title: "订单详情"
+      });
     },
     btn_search() {
-      this.pageParams.pageindex = 1
-      this.getList()
+      this.pageParams.pageindex = 1;
+      this.getList();
     },
     // 添加备注
     btn_add_remark(id) {
           parent: this, // 当前的vue对象
           data: { rowid: id } // props
         },
-        area: ['40%', '50%'],
-        title: '添加备注'
-      })
+        area: ["40%", "50%"],
+        title: "添加备注"
+      });
     },
     // 编辑
     btn_edit(editId) {
           parent: this, // 当前的vue对象
           data: { rowid: editId } // props
         },
-        area: ['80%', '90%'],
-        title: '编辑订单'
-      })
+        area: ["80%", "90%"],
+        title: "编辑订单"
+      });
     },
     // 售后
     btn_afterSale(id) {
           parent: this, // 当前的vue对象
           data: { rowid: id } // props
         },
-        area: ['80%', '90%'],
-        title: '售后'
-      })
+        area: ["80%", "90%"],
+        title: "售后"
+      });
     },
     // 导出
     btn_export() {},
         content: {
           content: importAuth, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: '' } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          data: { rowid: "" } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
         },
-        area: ['40%', '380px'],
+        area: ["40%", "380px"],
         shadeClose: false,
-        title: '导入订单信息'
-      })
+        title: "导入订单信息"
+      });
     },
     // 撤回
     btn_cancel(orderId) {
-      this.isDisable = true
+      this.isDisable = true;
       setTimeout(() => {
-        this.$confirm('您确定撤回吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定撤回吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
           .then(() => {
-            this.isDisable = false
+            this.isDisable = false;
             const data = {
               orderids: orderId,
               state: 0 // 撤回 0
-            }
-            cancelOrder(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('撤回成功!')
+            };
+            cancelOrder(data).then(response => {
+              if (response.state.toLowerCase() === "success") {
+                this.getList();
+                this.$message.success("撤回成功!");
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消撤回'
-            })
-          })
-        this.isDisable = false
-      }, 300)
+              type: "info",
+              message: "已取消撤回"
+            });
+          });
+        this.isDisable = false;
+      }, 300);
     },
     // 提交
     btn_submit(orderId) {
-      this.isDisable = true
+      this.isDisable = true;
       setTimeout(() => {
-        this.$confirm('您确定提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定提交吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
           .then(() => {
-            this.isDisable = false
+            this.isDisable = false;
             const data = {
               orderids: orderId
-            }
-            orderBulkSubmit(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('提交成功!')
+            };
+            orderBulkSubmit(data).then(response => {
+              if (response.state.toLowerCase() === "success") {
+                this.getList();
+                this.$message.success("提交成功!");
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消提交'
-            })
-          })
-        this.isDisable = false
-      }, 300)
+              type: "info",
+              message: "已取消提交"
+            });
+          });
+        this.isDisable = false;
+      }, 300);
     },
     // 合并
     btn_merge() {
       if (this.selectOrderId.length < 2) {
         this.$message({
-          message: '最少选择两条订单！',
-          type: 'warning'
-        })
-        return
+          message: "最少选择两条订单！",
+          type: "warning"
+        });
+        return;
       }
       this.$layer.iframe({
         content: {
           parent: this, // 当前的vue对象
           data: { rowid: this.selectOrderId } // props
         },
-        area: ['80%', '90%'],
-        title: '合并订单'
-      })
+        area: ["80%", "90%"],
+        title: "合并订单"
+      });
     },
     // 批量提交
     btn_bulk_submit() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
-        })
-        return
+          message: "请选择订单！",
+          type: "warning"
+        });
+        return;
       }
-      this.isDisable = true
+      this.isDisable = true;
       setTimeout(() => {
-        this.$confirm('您确定提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定提交吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
           .then(() => {
-            this.isDisable = false
+            this.isDisable = false;
             const data = {
-              orderids: this.selectOrderId.join(',').replace(/\s+/g, '')
-            }
-            orderBulkSubmit(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('提交成功!')
+              orderids: this.selectOrderId.join(",").replace(/\s+/g, "")
+            };
+            orderBulkSubmit(data).then(response => {
+              if (response.state.toLowerCase() === "success") {
+                this.getList();
+                this.$message.success("提交成功!");
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消提交'
-            })
-          })
-        this.isDisable = false
-      }, 300)
+              type: "info",
+              message: "已取消提交"
+            });
+          });
+        this.isDisable = false;
+      }, 300);
     },
     // 批量撤回
     btn_bulk_revoke() {
       if (this.selectOrderId.length < 1) {
         this.$message({
-          message: '请选择订单！',
-          type: 'warning'
-        })
-        return
+          message: "请选择订单！",
+          type: "warning"
+        });
+        return;
       }
-      this.isDisable = true
+      this.isDisable = true;
       setTimeout(() => {
-        this.$confirm('您确定撤回吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
+        this.$confirm("您确定撤回吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
           .then(() => {
-            this.isDisable = false
+            this.isDisable = false;
             const data = {
-              orderids: this.selectOrderId.join(',').replace(/\s+/g, ''),
+              orderids: this.selectOrderId.join(",").replace(/\s+/g, ""),
               state: 0
-            }
-            cancelOrder(data).then((response) => {
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('撤回成功!')
+            };
+            cancelOrder(data).then(response => {
+              if (response.state.toLowerCase() === "success") {
+                this.getList();
+                this.$message.success("撤回成功!");
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消撤回'
-            })
-          })
-        this.isDisable = false
-      }, 300)
+              type: "info",
+              message: "已取消撤回"
+            });
+          });
+        this.isDisable = false;
+      }, 300);
     },
     // 支付金额
     btn_pay_money(orderId) {
           parent: this, // 当前的vue对象
           data: { rowid: orderId } // props
         },
-        area: ['80%', '80%'],
-        title: '支付金额'
-      })
+        area: ["80%", "80%"],
+        title: "支付金额"
+      });
     },
     hadndleOrderCode(ordercode) {
       this.$layer.iframe({
           parent: this, // 当前的vue对象
           data: { rowid: ordercode } // props
         },
-        area: ['80%', '90%'],
-        title: '订单详情'
-      })
+        area: ["80%", "90%"],
+        title: "订单详情"
+      });
     },
     // 选择多个
     handleSelectionChange(val) {
-      const ids = []
-      this.multipleSelection = val
+      const ids = [];
+      this.multipleSelection = val;
       for (let i = 0; i < this.multipleSelection.length; i++) {
-        ids.push(this.multipleSelection[i].F_Id)
+        ids.push(this.multipleSelection[i].F_Id);
       }
-      this.selectOrderId = ids
+      this.selectOrderId = ids;
     },
     // 撤回权限
     authority_cancel(state) {
       if (state == 1) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
     },
     authority_submit() {
         this.activeName == 2 ||
         this.activeName == 9
       ) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
     },
     // 售后权限
         this.activeName == 2 ||
         this.activeName == 9
       ) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
     },
     // 外呼权限
     authority_call_out(status) {
       if (status == 0 || status == 1) {
-        return true
+        return true;
       } else {
-        return false
+        return false;
       }
     },
     // 外呼
     clickCallOut(phoneNumber) {
-      this.callOut(phoneNumber)
+      this.callOut(phoneNumber);
     },
     // 外呼
     callOut(phoneNumber) {
       if (phoneNumber) {
-        getCallOutprefix(phoneNumber).then((response) => {
-          if (response.state.toLowerCase() === 'success') {
-            const res = response.data
+        getCallOutprefix(phoneNumber).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            const res = response.data;
             this.scoketDatas = {
-              Type: 'MakeCall',
+              Type: "MakeCall",
               AgentID: this.usercode,
               AgentExten: this.extension,
               Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
               DestinationNumber: res.phone //
-            }
-            store.dispatch('ChangeCallNum', phoneNumber)
-            Send(this.scoketDatas)
-            store.dispatch('UpdateCalloutScreen', false) // 关闭外呼面板
-            store.dispatch('UpdateOutboundScreen', false) // 关闭外呼弹屏
+            };
+            store.dispatch("ChangeCallNum", phoneNumber);
+            Send(this.scoketDatas);
+            store.dispatch("UpdateCalloutScreen", false); // 关闭外呼面板
+            store.dispatch("UpdateOutboundScreen", false); // 关闭外呼弹屏
           }
-        })
+        });
       } else {
         this.$message({
-          message: '请先输入电话号码！',
-          type: 'warning'
-        })
+          message: "请先输入电话号码！",
+          type: "warning"
+        });
       }
-    }
+    },
   }
-}
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>