修复 搜索手机号只输入数字，除充值订单显示商品id、商品名称

src/views/order/list/index.vue

@@ -9,7 +9,7 @@
         <el-input v-model="form.userName" placeholder="请输入用户账户" clearable />
       </el-form-item>
       <el-form-item label="用户手机号:">
-        <el-input v-model="form.phone" placeholder="请输入用户手机号" clearable />
+        <el-input-number v-model="form.phone" step-strictly :controls="false" placeholder="请输入用户手机号" />
       </el-form-item>
       <!-- 流量订单 -->
       <span v-if="form.searchType === '2'">
@@ -23,19 +23,19 @@
         </el-form-item>
       </span>
       <!-- 除充值订单 -->
-      <span v-if="form.searchType === '3'">
+      <span v-if="form.searchType !== '3'">
         <el-form-item label="商品ID:">
           <el-input v-model="form.goodsid" placeholder="请输入商品ID" />
         </el-form-item>
         <el-form-item label="商品名称:">
           <el-input v-model="form.goodsName" placeholder="请输入商品名称" />
         </el-form-item>
-        <el-form-item label="操作系统">
-          <el-select v-model="form.platform" placeholder="请选择操作系统">
-            <el-option v-for="item in systemOptions" :key="item.value" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
       </span>
+      <el-form-item label="操作系统" v-else>
+        <el-select v-model="form.platform" placeholder="请选择操作系统">
+          <el-option v-for="item in systemOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <!-- 会员订单 -->
       <el-form-item v-if="form.searchType === '4'" label="资源平台:">
         <el-select v-model="form.platformId" placeholder="请选择资源平台">
@@ -54,24 +54,32 @@
       </el-form-item>
       <el-form-item label="下单时间:">
         <el-date-picker v-model="form.listDate" type="datetimerange" start-placeholder="开始日期" end-placeholder="结束日期"
-          value-format="yyyy-MM-dd HH:mm:ss" />
+          value-format="yyyy-MM-dd HH:mm:ss" :picker-options="pickerOptions" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="getRefresh">重置</el-button>
-        <el-button type="primary" icon="el-icon-download" @click="handleExport" v-hasPermi="['order:list:export']">导出</el-button>
+        <el-button type="primary" icon="el-icon-download" @click="handleExport"
+          v-hasPermi="['order:list:export']">导出</el-button>
         <el-button type="primary" @click="getDialog" v-hasPermi="['order:list:export']">查看</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <el-table :data="tableData" v-loading="loading">
       <el-table-column label="订单编号" prop="orderCode" key="orderCode" align="center" />
-      <el-table-column v-if="form.searchType === '2'" label="第三方订单编号" prop="thirdOrderId" key="thirdOrderId"
-        align="center" />
+      <el-table-column v-if="form.searchType === '2'" label="第三方订单编号" key="thirdOrderId" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.thirdOrderId | empty(scope.row.thirdOrderId) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="商品ID" prop="goodsid" key="goodsid" align="center" />
       <el-table-column label="商品名称" prop="goodsName" key="goodsName" align="center" show-overflow-tooltip />
       <el-table-column label="订单金额 / 元" prop="amount" key="amount" align="center" :formatter="amountFormatter" />
-      <el-table-column v-if="form.searchType === '2'" label="SIM卡号" prop="simCode" key="simCode" align="center" />
+      <el-table-column v-if="form.searchType === '2'" label="SIM卡号" prop="simCode" key="simCode" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.simCode | empty(scope.row.simCode) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-if="form.searchType === '1'" label="购买类型" prop="charging" key="charging" align="center"
         :formatter="chargingFormatter" />
       <el-table-column v-if="form.searchType === '3'" label="订单来源" prop="platform" key="platform" align="center"
@@ -87,10 +95,18 @@
       <el-table-column label="支付状态" prop="status" key="status" align="center" :formatter="statusFormatter" />
       <el-table-column label="支付时间" prop="goodsUpdateTime" key="goodsUpdateTime" align="center" />
       <el-table-column label="用户账号" prop="userName" key="userName" align="center" />
-      <el-table-column label="支付流水号" prop="payId" key="payId" align="center" />
+      <el-table-column label="支付流水号" key="payId" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.payId | empty(scope.row.payId) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-if="form.searchType === '2'" label="生效状态" prop="flowStatus" key="flowStatus" align="center"
         :formatter="flowFormatter" />
-      <el-table-column v-if="form.searchType === '2'" label="生效时间" prop="effectTime" key="effectTime" align="center" />
+      <el-table-column v-if="form.searchType === '2'" label="生效时间" key="effectTime" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.effectTime | empty(scope.row.effectTime) }}</span>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
       @pagination="getList" />
@@ -102,6 +118,7 @@
         <el-table-column label="任务名称" prop="jobName" align="center" />
         <el-table-column label="任务类型" prop="jobType" align="center" />
         <el-table-column label="导出时间" prop="updateTime" align="center" />
+        <el-table-column label="操作人" prop="useName" align="center" />
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="getDownLoad(scope.row)" :disabled="scope.row.status === 1">下载</el-button>
@@ -109,7 +126,7 @@
         </el-table-column>
       </el-table>
       <pagination v-show="dialogTotal > 0" :total="dialogTotal" :page.sync="form.pageNum" :limit.sync="form.pageSize"
-        @pagination="getList" />
+        @pagination="getDialogList" />
     </el-dialog>
   </div>
 </template>
@@ -140,7 +157,8 @@ export default {
       // 弹窗表单
       dialogForm: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        searchType: this.$route.query.searchType
       },
       // 弹窗列表
       dialogTable: [],
@@ -153,12 +171,6 @@ export default {
       }, {
         value: 2,
         label: '支付宝'
-      }, {
-        value: 3,
-        label: '苹果支付'
-      }, {
-        value: 4,
-        label: '猫币支付'
       }],
       // 支付状态
       statusOptions: [{
@@ -196,12 +208,37 @@ export default {
       }, {
         value: 10,
         label: '爱听音乐'
-      }]
+      }],
+      // 时间搜索不超过1个月
+      selectDate: '',
+      pickerOptions: {
+        onPick: ({ maxDate, minDate }) => {
+          this.selectDate = minDate.getTime()
+          if (maxDate) {
+            this.selectDate = ''
+          }
+        },
+        disabledDate: (time) => {
+          if (this.selectDate !== '') {
+            const one = 30 * 24 * 3600 * 1000
+            const minTime = this.selectDate - one
+            const maxTime = this.selectDate + one
+            return time.getTime() < minTime || time.getTime() > maxTime
+          }
+        }
+      }
     }
   },
   mounted() {
     this.getScene()
     this.getList()
+    this.payOptions.push(this.form.searchType === '3' ? {
+      value: 3,
+      label: '苹果支付'
+    } : {
+      value: 4,
+      label: '猫币支付'
+    })
   },
   methods: {
     // 列表
@@ -314,12 +351,18 @@ export default {
     },
 
     flowFormatter(row) {
-      return this.selectDictLabel(this.flowOptions, row.flowStatus)
+      return row.flowStatus === null ? '-' : this.selectDictLabel(this.flowOptions, row.flowStatus)
     },
 
     amountFormatter(row) {
       return row.amount.toFixed(2)
     }
+  },
+  // 过滤器
+  filters: {
+    empty(row) {
+      return !row ? '-' : row
+    }
   }
 }
 </script>