隐藏顶部搜索框,订单发货按钮逻辑判断修正,优化订单待收货文本样式

main
xuechunyuan 2 years ago
parent ec2e27e5a2
commit ee2213fe0d
  1. 1
      .gitignore
  2. 2
      src/store/modules/common.js
  3. 10
      src/views/order/index.vue
  4. 2
      src/views/statistics/index.vue

1
.gitignore vendored

@ -23,3 +23,4 @@ yarn-error.log*
*.sln *.sln
*.sw* *.sw*
*.lock *.lock
*.zip

@ -18,7 +18,7 @@ const common = {
showTag: true, showTag: true,
showDebug: true, showDebug: true,
showCollapse: true, showCollapse: true,
showSearch: true, showSearch: false,
showLock: true, showLock: true,
showFullScren: true, showFullScren: true,
showTheme: true, showTheme: true,

@ -28,7 +28,7 @@
</el-select> </el-select>
</template> --> </template> -->
<template slot-scope="scope" slot="nameSearch"> <template slot-scope="scope" slot="nameSearch">
<el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input> <el-input v-model="form.name" placeholder="请输入购买人昵称"></el-input>
</template> </template>
<template slot-scope="scope" slot="phonenumberSearch"> <template slot-scope="scope" slot="phonenumberSearch">
<el-input <el-input
@ -45,7 +45,7 @@
<template slot-scope="{ row }" slot="menu"> <template slot-scope="{ row }" slot="menu">
<el-button type="text" icon="el-icon-view" size="small" @click="handleDetail(row)">查看详情</el-button> <el-button type="text" icon="el-icon-view" size="small" @click="handleDetail(row)">查看详情</el-button>
<!-- <el-button size="small" @click="handleDelete(row)">删除</el-button> --> <!-- <el-button size="small" @click="handleDelete(row)">删除</el-button> -->
<el-button type="text" icon="el-icon-s-promotion" :disabled='row.status == 1 || row.status == 3 || row.status == 4' size="small" @click="handleSend(row)">发货</el-button> <el-button type="text" icon="el-icon-s-promotion" :disabled='row.status != 2' size="small" @click="handleSend(row)">发货</el-button>
</template> </template>
<!-- <template slot-scope="scope" slot="sleepingPosture"> <!-- <template slot-scope="scope" slot="sleepingPosture">
<div v-show="scope.row.sleepingPosture == 1">仰睡</div> <div v-show="scope.row.sleepingPosture == 1">仰睡</div>
@ -54,7 +54,7 @@
<template slot-scope="scope" slot="status"> <template slot-scope="scope" slot="status">
<div v-show="scope.row.status == 1">待付款</div> <div v-show="scope.row.status == 1">待付款</div>
<div v-show="scope.row.status == 2">待发货</div> <div v-show="scope.row.status == 2">待发货</div>
<div v-show="scope.row.status == 3">待收货</div> <div style="color:#1fb24d;" v-show="scope.row.status == 3">待收货</div>
<div v-show="scope.row.status == 4">已完成</div> <div v-show="scope.row.status == 4">已完成</div>
<div v-show="scope.row.status == 0">已取消</div> <div v-show="scope.row.status == 0">已取消</div>
</template> </template>
@ -235,7 +235,7 @@ export default {
delBtn: false, delBtn: false,
column: [ column: [
{ {
label: "姓名", label: "昵称",
prop: "name", prop: "name",
search: true, search: true,
searchslot: true, searchslot: true,
@ -259,7 +259,7 @@ export default {
// searchSpan: 4, // searchSpan: 4,
}, },
{ {
label: "姓名", label: "昵称",
prop: "buyerName", prop: "buyerName",
align: "center", align: "center",
overHidden:true, overHidden:true,

@ -30,7 +30,7 @@
</el-select> </el-select>
</template> </template>
<template slot-scope="scope" slot="nameSearch"> <template slot-scope="scope" slot="nameSearch">
<el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input> <el-input v-model="form.name" placeholder="请输入购买人姓名"></el-input>
</template> </template>
<template slot-scope="scope" slot="orderNumberSearch"> <template slot-scope="scope" slot="orderNumberSearch">
<el-input v-model="form.orderNumber" placeholder="请输入订单编号"></el-input> <el-input v-model="form.orderNumber" placeholder="请输入订单编号"></el-input>

Loading…
Cancel
Save