From 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 02 三月 2026 16:40:54 +0800
Subject: [PATCH] 合并
---
admin/src/views/business/goodsorder.vue | 137 +++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 66 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index c01082a..cad9df0 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -2,72 +2,76 @@
<TableLayout :permissions="['business:goodsorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <!-- 0寰呮敮浠� 1寰呭彂璐� 2寰呮敹璐� 3浜ゆ槗瀹屾垚 4宸插叧闂� 5閮ㄥ垎鍙戣揣 -->
- <el-tabs v-model="status" @tab-click="handleClick">
- <el-tab-pane
- v-for="tab in statusList"
- :key="tab.name"
- :name="tab.name"
- >
- <template #label>
- <span>{{ tab.label }}</span>
- <el-badge
- v-if="tab.count > 0"
- :value="tab.count"
- class="tab-badge"
- />
- </template>
- </el-tab-pane>
- </el-tabs>
- <el-form-item label="璁㈠崟缂栧彿" prop="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" type="number" clearable @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏀惰揣浜�" prop="nickName">
- <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" clearable @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍙栬揣鏂瑰紡" prop="receiveType">
- <el-select v-model="searchForm.receiveType" placeholder="璇烽�夋嫨鍙栬揣鏂瑰紡" clearable @change="search" >
- <el-option :key="0" :value="0" label="蹇�掗厤閫�"></el-option>
- <el-option :key="1" :value="1" label="鑷彁"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍟嗗搧鍚嶇О" prop="shopName">
- <el-input v-model="searchForm.goodsName" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" clearable @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="褰掑睘缁忛攢鍟�" prop="shopName">
- <el-input v-model="searchForm.shopName" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" clearable @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏀粯鍗曞彿" prop="payOrderId">
- <el-input v-model="searchForm.payOrderId" placeholder="璇疯緭鍏ユ敮浠樺崟鍙�" clearable @keypress.enter.native="search"></el-input>
- </el-form-item>
- <div class="date-style" style="display: inline">
- <el-form-item label="璁㈠崟鏃堕棿" prop="starttime" >
- <el-date-picker
- style="width: 180px"
- clearable
- @change="search"
- v-model="searchForm.starttime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- placeholder="寮�濮嬫椂闂�"
- ></el-date-picker>
- </el-form-item>
- <el-form-item label="-" label-width="10px" prop="endtime" >
- <el-date-picker
- style="width: 180px"
- clearable
- v-model="searchForm.endtime"
- type="datetime"
- @change="search"
- value-format="yyyy-MM-dd HH:mm:ss"
- format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- placeholder="鎴鏃堕棿"
- ></el-date-picker>
- </el-form-item>
+ <div>
+ <el-tabs v-model="status" @tab-click="handleClick">
+ <el-tab-pane
+ v-for="tab in statusList"
+ :key="tab.name"
+ :name="tab.name"
+ >
+ <template #label>
+ <span>{{ tab.label }}</span>
+ <el-badge
+ v-if="tab.count > 0"
+ :value="tab.count"
+ class="tab-badge"
+ />
+ </template>
+ </el-tab-pane>
+ </el-tabs>
</div>
+ <div>
+ <el-form-item label="璁㈠崟缂栧彿" prop="code">
+ <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" type="number" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鏀惰揣浜�" prop="nickName">
+ <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍙栬揣鏂瑰紡" prop="receiveType">
+ <el-select v-model="searchForm.receiveType" placeholder="璇烽�夋嫨鍙栬揣鏂瑰紡" clearable @change="search" >
+ <el-option :key="0" :value="0" label="蹇�掗厤閫�"></el-option>
+ <el-option :key="1" :value="1" label="鑷彁"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍟嗗搧鍚嶇О" prop="shopName">
+ <el-input v-model="searchForm.goodsName" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="褰掑睘缁忛攢鍟�" prop="shopName">
+ <el-input v-model="searchForm.shopName" placeholder="璇疯緭鍏ョ粡閿�鍟嗗悕绉�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鏀粯鍗曞彿" prop="payOrderId">
+ <el-input v-model="searchForm.payOrderId" placeholder="璇疯緭鍏ユ敮浠樺崟鍙�" clearable @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <div class="date-style" style="display: inline">
+ <el-form-item label="璁㈠崟鏃堕棿" prop="starttime" >
+ <el-date-picker
+ style="width: 180px"
+ clearable
+ @change="search"
+ v-model="searchForm.starttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="寮�濮嬫椂闂�"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="-" label-width="10px" prop="endtime" >
+ <el-date-picker
+ style="width: 180px"
+ clearable
+ v-model="searchForm.endtime"
+ type="datetime"
+ @change="search"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="鎴鏃堕棿"
+ ></el-date-picker>
+ </el-form-item>
+ </div>
+ </div>
+
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -107,7 +111,8 @@
<div class="attr">x{{ goods.goodsNum }}</div>
</div>
</div>
- <div class="mark" v-if="item.sysInfo&& item.sysInfo.length" >澶囨敞锛歿{item.sysInfo}}</div>
+ <div class="mark" v-if="item.sysInfo&& item.sysInfo.length" >骞冲彴澶囨敞锛歿{item.sysInfo}}</div>
+ <div class="mark" v-if="item.memberInfo&& item.memberInfo.length" >瀹㈡埛澶囨敞锛歿{item.memberInfo}}</div>
</div>
<div class="member-message right-border">
<div class="el-icon-user" style="padding: 5px 5px;width: 100%;">{{ item.linkname }}</div>
--
Gitblit v1.9.3