Explorar o código

销售一览表、退货一览表和经销商促销新增选择客户

chenrui hai 1 ano
pai
achega
3a120f5ba1

BIN=BIN
public/templ/参与客户导入列表模板.xlsx


+ 11 - 0
src/api/promotion.js

@@ -147,3 +147,14 @@ export const downSpecialFail = (params) => {
     responseType: 'blob'
   })
 }
+
+// 导入参与客户   导出错误项
+export const downDealerFail = (params) => {
+  const url = `/promotion/downDealerFail`
+  return axios.request({
+    url: url,
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  })
+}

+ 28 - 8
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -36,12 +36,21 @@
         <a-form-model-item label="费用所属部门" prop="expenseDepartmentSn">
           <department style="width: 100%;" @change="departementChange" id="promotionList-basicInfo-activeDate" v-model="form.expenseDepartmentSn"></department>
         </a-form-model-item>
-        <a-form-model-item label="参与客户" prop="dealerSnList">
+        <a-form-model-item label="参与客户" prop="dealerScope">
           <a-row :gutter="15">
-            <a-col :md="3" :sm="24">
+            <a-col :md="12" :sm="24">
+              <a-select v-model="form.dealerScope" placeholder="请选择参与客户">
+                <a-select-option value="ALL_DEALER">全部客户</a-select-option>
+                <a-select-option value="SOME_DEALER">部分客户</a-select-option>
+              </a-select>
+            </a-col>
+            <a-col :md="3" :sm="24" v-show="form.dealerScope &&form.dealerScope!='ALL_DEALER' ">
               <a-button type="primary" :loading="spinning" @click="handleDealerModal">选择</a-button>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="chooseDealerList && chooseDealerList.length>0">
+            <a-col :md="4" :sm="24" v-show="form.dealerScope &&form.dealerScope!='ALL_DEALER' ">
+              <a-button type="primary" :loading="spinning" @click="openGuideModal=true" ghost>导入客户</a-button>
+            </a-col>
+            <a-col :md="5" :sm="24" v-show="chooseDealerList && chooseDealerList.length>0">
               已{{ chooseDealerList.length }}选项
             </a-col>
             <a-col :md="24" :sm="24" v-show="chooseDealerList && chooseDealerList.length>0">
@@ -96,6 +105,8 @@
         <chooseDealer ref="dealerChoose" pageType="dealerPromotion" @plAdd="handleAddDealer"></chooseDealer>
       </div>
     </a-modal>
+    <!-- 导入参与客户 -->
+    <importDealerModa :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
   </a-modal>
 </template>
 
@@ -106,11 +117,12 @@ import department from '@/views/expenseManagement/expenseReimbursement/departmen
 import warehouse from '@/views/common/chooseWarehouse.js'
 import moment from 'moment'
 import chooseDealer from '../promotionManagement/chooseDealer'
+import importDealerModa from './importDealerModa.vue'
 import { dealerPromotionSave, dealerPromotionInfo, dealerPromotionEdit } from '@/api/promotion'
 export default {
   name: 'PromotionListBasicInfoModal',
   mixins: [commonMixin],
-  components: { Upload, department, warehouse, chooseDealer },
+  components: { Upload, department, warehouse, chooseDealer, importDealerModa },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,
@@ -136,7 +148,8 @@ export default {
         description: '', // 活动简称
         content: '', // 活动描述
         attachmentList: '', // 附件
-        dealerSnList: []// 参与客户
+        dealerSnList: [], // 参与客户
+        dealerScope: undefined // 全部客户   部分客户
       },
       openDealerModal: false,
       chooseDealerList: [],
@@ -146,11 +159,12 @@ export default {
         title: [{ required: true, message: '请输入促销名称', trigger: 'blur' }],
         activeDate: [{ required: true, message: '请选择促销时间', trigger: 'change' } ],
         expenseDepartmentSn: [{ required: true, message: '请选择费用所属部门', trigger: 'change' }],
-        dealerSnList: [{ required: true, message: '请选择参与客户', trigger: 'change' }],
+        dealerScope: [{ required: true, message: '请选择参与客户', trigger: 'change' }],
         description: [{ required: true, message: '请输入促销简称', trigger: 'blur' }],
         content: [{ required: true, message: '请输入促销描述', trigger: 'blur' }]
       },
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo',
+      openGuideModal: false
     }
   },
   methods: {
@@ -197,6 +211,7 @@ export default {
     },
     // 添加经销商
     handleAddDealer (list) {
+      debugger
       this.chooseDealerList = list
       this.openDealerModal = false
       // 移除表单必填项
@@ -242,7 +257,8 @@ export default {
         description: '', // 活动简称
         content: '', // 活动描述
         attachmentList: '', // 附件
-        dealerSnList: []// 参与客户
+        dealerSnList: [], // 参与客户
+        dealerScope: undefined
       }
       this.attachList = []
       this.chooseDealerList = []
@@ -272,6 +288,10 @@ export default {
     // 不可选日期
     disabledDate (date, dateStrings) {
       return date && date.valueOf('day') < moment().subtract(1, 'day') // 今天以后,包含今天
+    },
+    // 导入参与客户
+    hanldeOk (arr) {
+      this.chooseDealerList = this.chooseDealerList.concat(arr)
     }
   },
   watch: {

+ 184 - 0
src/views/promotionRulesManagement/dealerPromotions/chooseImportDealerModal.vue

@@ -0,0 +1,184 @@
+<template>
+  <a-modal
+    centered
+    class="chooseImport-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="确认导入"
+    v-model="isShow"
+    @cancel="isShow=false"
+    width="80%">
+    <div class="chooseImport-con">
+      <!-- 可导入数据 -->
+      <p class="">可导入数据{{ loadData.length }}条</p>
+      <a-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.allocateSn"
+        :columns="nowColumns"
+        :dataSource="loadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+      </a-table>
+      <a-divider />
+      <!-- 不可导入数据 -->
+      <p class="red">不可导入数据{{ unLoadData.length }}条</p>
+      <a-table
+        class="unTable"
+        ref="unTable"
+        size="small"
+        :rowKey="(record) => record.errorDesc"
+        :columns="nowUnColumns"
+        :dataSource="unLoadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+      </a-table>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="chooseImport-submit"
+          size="large"
+          class="button-primary"
+          @click="handleSubmit"
+          style="padding: 0 40px;">确认导入</a-button>
+        <a-button
+          id="chooseImport-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 40px;margin-left: 15px;">取消</a-button>
+        <a-button
+          type="primary"
+          id="chooseImport-error"
+          size="large"
+          class="button-error"
+          @click="handleError"
+          style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { hdExportExcel } from '@/libs/exportExcel'
+import {downDealerFail } from '@/api/promotion'
+export default {
+  name: 'ChooseImportModal',
+  mixins: [commonMixin],
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    paramsData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      loadData: [],
+      unLoadData: [],
+      loading: false
+    }
+  },
+  computed: {
+    nowColumns () {
+      const _this = this
+      let columnsArr = [
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '90%', align: 'center', customRender: function (text) { return text || '--' } }
+      ]
+      return columnsArr
+    },
+    nowUnColumns () {
+      const _this = this
+      const unColumnsArr = [
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '50%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true },
+        { title: '备注',dataIndex: 'remarks',  width: '40%', align: 'center', customRender: function (text) { return text || '--' } ,ellipsis: true}
+      ]
+      return unColumnsArr
+    }
+  },
+  methods: {
+    getData () {
+      const paramsData = JSON.parse(JSON.stringify(this.paramsData))
+      this.loadData = paramsData.rightList || []
+      this.unLoadData = paramsData.errorList || []
+      this.loadData.map((item, index) => {
+        item.no = index + 1
+      })
+      this.unLoadData.map((item, index) => {
+        item.no = index + 1
+        item.importErrorMsgSet = item.remarks.split(',')
+      })
+    },
+    // 确认导入
+    handleSubmit () {
+      if (this.loadData.length == 0) {
+        this.$message.warning('没有可导入的数据!')
+      } else {
+        const data = this.paramsData.rightList
+        this.$emit('ok', data)
+        this.isShow = false
+      }
+    },
+    // 导出错误项
+    handleError () {
+      const _this = this
+      if (_this.unLoadData.length < 1) {
+        _this.$message.info('暂无可导出的错误项~')
+        return
+      }
+      _this.spinning = true
+      hdExportExcel(downDealerFail, _this.unLoadData, '导出参与客户错误项', function () {
+        _this.spinning = false
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.loadData = []
+        this.unLoadData = []
+      } else {
+        this.getData()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .chooseImport-modal{
+    .chooseImport-con{
+      .red{
+        color: #f30;
+      }
+      .btn-con{
+        text-align: center;
+        margin: 30px 0 20px;
+        .button-cancel,.button-error{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 192 - 0
src/views/promotionRulesManagement/dealerPromotions/importDealerModa.vue

@@ -0,0 +1,192 @@
+<template>
+  <a-modal
+    centered
+    class="importGuide-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="导入"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="800">
+    <div class="importGuide-con">
+      <div class="explain-con">
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>1</span>准备导入
+          </div>
+          <ul>
+            <li>1)请先下载导入模板,模板中已标示出必填项 </li>
+            <li>2) “经销商名称”具有唯一性,需输入完整经销商名称,不能为空,不可重复,需是系统中已存在的经销商</li>
+            <li>
+              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+                <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+              </a>
+            </li>
+          </ul>
+        </div>
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>2</span>上传数据文件
+          </div>
+          <p>目前支持的文件类型*.xls,*.xlsx.</p>
+          <div style="overflow: hidden;padding-left: 23px;">
+            <Upload
+              id="importGuide-attachList"
+              ref="importUpload"
+              :maxNums="1"
+              fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+              uploadType="attach"
+              :action="attachAction"
+              upText="选择导入文件"
+              @remove="resetSearchForm"
+              @change="changeImport"></Upload>
+          </div>
+        </div>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="importGuide-nextStep"
+          size="large"
+          class="button-primary"
+          @click="handlerNextStep"
+          style="padding: 0 60px;">下一步</a-button>
+        <a-button
+          id="importGuide-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+      </div>
+    </div>
+    <!-- 导入 -->
+    <chooseImportModal ref="chooseImportBox" :openModal="openImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
+  </a-modal>
+</template>
+
+<script>
+import ChooseImportModal from './chooseImportDealerModal.vue'
+import { Upload } from '@/components'
+export default {
+  name: 'ImportGuideModal',
+  components: { ChooseImportModal, Upload },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    params: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      openImportModal: false, //  导入
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/promotion/importDealer', // 导入门槛、正价、促销产品
+      paramsData: null,
+      filePath: ''
+    }
+  },
+  methods: {
+    // 清空数据
+    resetSearchForm () {
+      this.$refs.importUpload.setFileList() //  清空导入文件
+      this.paramsData = null //  清空上传数据
+    },
+    // 下一步
+    handlerNextStep () {
+      if (this.paramsData) {
+        this.openImportModal = true
+      } else {
+        this.$message.warning('添加文件后再进行下一步操作!')
+      }
+    },
+    // 上传文件  change
+    changeImport (file) {
+      if (file && JSON.parse(file).length > 0) {
+        this.paramsData = Object.assign({}, JSON.parse(file)[0] || null, this.params)
+      } else {
+        this.paramsData = null
+      }
+    },
+    // 导入
+    hanldeOk (obj) {
+      if (obj && obj.length > 0) {
+        this.$emit('ok', obj)
+        this.isShow = false
+      }
+    },
+    // 关闭
+    handleClose () {
+      this.openImportModal = false
+      this.isShow = false
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.resetSearchForm()
+      } else {
+        this.filePath = location.protocol + '//' + location.host + '/templ/参与客户导入列表模板.xlsx'
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .importGuide-modal{
+    .importGuide-con{
+      .explain-con{
+        .explain-item{
+          margin-bottom: 10px;
+          .explain-tit{
+            font-weight: bold;
+            span{
+              display: inline-block;
+              width: 18px;
+              height: 18px;
+              line-height: 16px;
+              text-align: center;
+              margin-right: 5px;
+              border-radius: 50%;
+              border: 1px solid rgba(0, 0, 0, 0.3);
+            }
+          }
+          p{
+            margin: 8px 0;
+            padding-left: 23px;
+          }
+          ul{
+            list-style: none;
+            padding: 0;
+            padding-left: 23px;
+            margin: 0;
+            li{
+              line-height: 26px;
+            }
+          }
+        }
+        #importGuide-attachList{
+          width: 100%;
+        }
+      }
+      .btn-con{
+        margin: 10px 0 20px;
+        text-align: center;
+        .button-cancel{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 9 - 7
src/views/salesManagement/salesList/list.vue

@@ -83,12 +83,11 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="超时环节提醒">
-                  <v-select
-                    v-model="queryParam.sendFlag"
-                    id="outboundOrderList-sendFlag"
-                    code="SEND_FLAG"
-                    placeholder="请选择提醒环节"
-                    allowClear></v-select>
+                  <a-select v-model="queryParam.timeoutflag" placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="NOT_SENDGOODS">未发货</a-select-option>
+                    <a-select-option value="NOT_STOCK">未备货</a-select-option>
+                    <a-select-option value=" NOT_COLLECTION">未收款</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -223,7 +222,8 @@ export default {
         endDate: undefined,
         billStatus: undefined, //  业务状态
         sendFlag: '', // 发货状态
-        provinceSn: undefined// 省份
+        provinceSn: undefined, // 省份
+        timeoutflag: undefined// 超时环节提醒
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -384,6 +384,8 @@ export default {
       this.queryParam.billStatus = undefined
       this.queryParam.sendFlag = ''
       this.queryParam.provinceSn = undefined
+      this.queryParam.timeoutflag = undefined
+
       this.examineTime = []
       this.paymentTime = []
       this.$refs.subarea.clearData()

+ 28 - 28
src/views/salesManagement/salesQueryNew/detail.vue

@@ -58,8 +58,8 @@
             <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="改单时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="最新提交时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="改单时间">{{ detailData&&detailData.submitDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="最新提交时间">{{ detailData&&detailData.firstSubmitDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
           </a-descriptions>
         </div>
@@ -114,15 +114,15 @@
         </div>
         <!-- 产品列表 -->
         <div>
-          <detailProductList 
-          ref="productList" 
-          :detailData="detailData" 
-          :warehouseSn="warehouseSn"
-          :salesBillSn="$route.params.sn || bizSn" 
-          :authCode="authCode"
-          :maxHeight="pageHeight"
-          :showCityPrice="isCityPrice">
-        </detailProductList> 
+          <detailProductList
+            ref="productList"
+            :detailData="detailData"
+            :warehouseSn="warehouseSn"
+            :salesBillSn="$route.params.sn || bizSn"
+            :authCode="authCode"
+            :maxHeight="pageHeight"
+            :showCityPrice="isCityPrice">
+          </detailProductList>
         </div>
       </a-card>
     </a-spin>
@@ -205,16 +205,16 @@ import stockOutDetail from './stockOutDetailModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import detailProductList from './comps/detailProductList.vue'
 // 接口
-import { 
-  salesDetailBySn, 
-  salesDetailPrint, 
-  salesDetailExcel, 
-  salesDetailTypeExcel, 
-  salesWriteAuditPass, 
-  salesWriteAuditReject, 
-  salesWriteAuditPush 
+import {
+  salesDetailBySn,
+  salesDetailPrint,
+  salesDetailExcel,
+  salesDetailTypeExcel,
+  salesWriteAuditPass,
+  salesWriteAuditReject,
+  salesWriteAuditPush
 } from '@/api/salesNew'
- 
+
 export default {
   name: 'SalesDetailNew',
   mixins: [commonMixin],
@@ -231,7 +231,7 @@ export default {
       disabled: false,
       showDsModal: false,
       showStockOut: false,
-      authCode: '',  // 权限码
+      authCode: '', // 权限码
       hasData: false, // 是否有数据
       showDetail: false,
       openModal: false,
@@ -259,7 +259,7 @@ export default {
         return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
       }
     },
-    pageHeight(){
+    pageHeight () {
       return window.innerHeight - 330
     }
   },
@@ -276,12 +276,12 @@ export default {
     //  重置
     resetSearchForm () {
       this.warehouseSn = undefined
-      setTimeout(()=>{
+      setTimeout(() => {
         this.searchTable()
-      },100)
+      }, 100)
     },
     // 查询数据
-    searchTable(){
+    searchTable () {
       this.$refs.productList.searchTable()
     },
     //  详情
@@ -289,7 +289,7 @@ export default {
       salesDetailBySn({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data || null
-          this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount||0) - Number(this.detailData.totalAmount||0)
+          this.detailData.totalDiscountAmount = Number(this.detailData.totalOrigAmount || 0) - Number(this.detailData.totalAmount || 0)
         }
         this.$refs.productList.pageInit()
       })
@@ -309,7 +309,7 @@ export default {
     // 打开审核/一键审核弹框
     handleAudit (isBatch) {
       if (isBatch) { // 一键审核
-        if(this.detailData&&this.detailData.promoFlag==1&&this.$refs.productList.outStockStr != ''){
+        if (this.detailData && this.detailData.promoFlag == 1 && this.$refs.productList.outStockStr != '') {
           this.$info({
             title: '提示',
             content: '参加促销活动的销售单,有缺货产品,不可一键审核!',
@@ -346,7 +346,7 @@ export default {
     // 审核
     auditOrder (billStatus) {
       this.spinningAudit = true
-      const auditFun = billStatus =='AUDIT_PASS' ? salesWriteAuditPass : salesWriteAuditReject
+      const auditFun = billStatus == 'AUDIT_PASS' ? salesWriteAuditPass : salesWriteAuditReject
       auditFun({
         salesBillSn: this.bizSn || this.$route.params.sn,
         billStatus: billStatus

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -417,7 +417,7 @@ export default {
       const arr = [
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'submitDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },

+ 7 - 7
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -67,12 +67,10 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="超时环节提醒">
-                  <v-select
-                    v-model="queryParam.sendFlag"
-                    id="outboundOrderList-sendFlag"
-                    code="SEND_FLAG"
-                    placeholder="请选择提醒环节"
-                    allowClear></v-select>
+                  <a-select v-model="queryParam.checkflag" placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="oneouttime">!未清点</a-select-option>
+                    <a-select-option value="twoouttime">!!未清点</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
             </template>
@@ -165,7 +163,8 @@ export default {
         billStatus: undefined, //  业务状态
         provinceName: undefined,
         provinceSn: undefined,
-        salesReturnType: undefined// 退货类别
+        salesReturnType: undefined, // 退货类别
+        checkflag: undefined// 超时环节提醒
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成时间', trigger: 'change' }]
@@ -295,6 +294,7 @@ export default {
       this.queryParam.provinceName = undefined
       this.queryParam.salesReturnType = undefined
       this.queryParam.goodFlag = undefined
+      this.queryParam.checkflag = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.$refs.table.refresh(true)
     },

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.103/ocs-admin',
+        // target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布s
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {