1

src/views/system/goofish/erpGoofishOrder/index.vue

@@ -19,6 +19,52 @@
           <el-option label="失败" :value="2" />
         </el-select>
       </el-form-item>
+      <el-form-item label="退款状态" prop="refundStatus">
+        <el-select v-model="queryParams.refundStatus" placeholder="全部" clearable filterable style="width: 150px">
+          <el-option v-for="o in refundStatusFilterOptions" :key="'rs-' + o.v" :label="o.l" :value="o.v" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="买家昵称" prop="buyerNick">
+        <el-input v-model="queryParams.buyerNick" placeholder="模糊" clearable style="width: 120px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="商品标题" prop="goodsTitle">
+        <el-input v-model="queryParams.goodsTitle" placeholder="模糊" clearable style="width: 160px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="运单号" prop="waybillKeyword">
+        <el-input v-model="queryParams.waybillKeyword" placeholder="平台或本地运单模糊" clearable style="width: 150px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="内部单备注" prop="jdRemark">
+        <el-input v-model="queryParams.jdRemark" placeholder="京东单据 remark 模糊" clearable style="width: 130px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="京东三方单号" prop="jdThirdPartyOrderNo">
+        <el-input v-model="queryParams.jdThirdPartyOrderNo" placeholder="模糊" clearable style="width: 140px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="卖家账号" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="用户名模糊" clearable style="width: 120px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="收件手机" prop="receiverMobile">
+        <el-input v-model="queryParams.receiverMobile" placeholder="模糊" clearable style="width: 120px" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="关联京东" prop="jdLinkFilter">
+        <el-select v-model="queryParams.jdLinkFilter" placeholder="全部" clearable style="width: 114px">
+          <el-option label="已关联" :value="1" />
+          <el-option label="未关联" :value="0" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="平台更新时间">
+        <el-date-picker
+          v-model="modifyTimeRange"
+          type="datetimerange"
+          size="small"
+          value-format="timestamp"
+          range-separator="至"
+          start-placeholder="开始"
+          end-placeholder="结束"
+          style="width: 340px"
+          clearable
+          @change="onModifyTimeRangeChange"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -333,13 +379,25 @@ export default {
       showSearch: true,
       total: 0,
       list: [],
+      modifyTimeRange: null,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         appKey: undefined,
         orderNo: undefined,
         orderStatus: undefined,
-        shipStatus: undefined
+        refundStatus: undefined,
+        shipStatus: undefined,
+        buyerNick: undefined,
+        goodsTitle: undefined,
+        waybillKeyword: undefined,
+        jdRemark: undefined,
+        jdThirdPartyOrderNo: undefined,
+        userName: undefined,
+        receiverMobile: undefined,
+        jdLinkFilter: undefined,
+        modifyTimeBegin: undefined,
+        modifyTimeEnd: undefined
       },
       orderStatusOptions: [
         { v: 11, l: '待付款' },
@@ -366,6 +424,13 @@ export default {
     }
   },
   computed: {
+    /** 退款状态下拉（与开放平台 refund_status 一致） */
+    refundStatusFilterOptions() {
+      return Object.keys(GOOFISH_REFUND_STATUS).map(k => ({
+        v: Number(k),
+        l: GOOFISH_REFUND_STATUS[k]
+      }))
+    },
     refreshLogisticsCompareRows() {
       const b = this.refreshLogisticsBefore
       const a = this.refreshLogisticsAfter
@@ -667,7 +732,20 @@ export default {
       this.queryParams.pageNum = 1
       this.getList()
     },
+    /** 开放平台 modify_time 为秒级；日期控件为毫秒时间戳 */
+    onModifyTimeRangeChange(val) {
+      if (val && val.length === 2) {
+        this.queryParams.modifyTimeBegin = Math.floor(val[0] / 1000)
+        this.queryParams.modifyTimeEnd = Math.floor(val[1] / 1000)
+      } else {
+        this.queryParams.modifyTimeBegin = undefined
+        this.queryParams.modifyTimeEnd = undefined
+      }
+    },
     resetQuery() {
+      this.modifyTimeRange = null
+      this.queryParams.modifyTimeBegin = undefined
+      this.queryParams.modifyTimeEnd = undefined
       this.resetForm('queryForm')
       this.handleQuery()
     },

src/views/system/jdorder/orderList.vue

@@ -66,6 +66,9 @@
                   <el-form-item label="型号">
                     <el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
                   </el-form-item>
+                  <el-form-item label="型号不含">
+                    <el-input v-model="queryParams.modelNumberExclude" placeholder="排除含此片段，如 130" clearable size="small" @keyup.enter.native="handleQuery" />
+                  </el-form-item>
                   <el-form-item label="下单人">
                     <el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
                   </el-form-item>
@@ -1265,6 +1268,7 @@ export default {
         orderSearch: undefined,
         distributionMark: undefined,
         modelNumber: undefined,
+        modelNumberExclude: undefined,
         link: undefined,
         buyer: undefined,
         address: undefined,
@@ -1837,6 +1841,7 @@ export default {
         orderSearch: undefined,
         distributionMark: undefined,
         modelNumber: undefined,
+        modelNumberExclude: undefined,
         link: undefined,
         buyer: undefined,
         address: undefined,