Web/operation-system
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Web:4c89454c3f37aad0dac5f91f9f4dff587de551fc
Branches Tags
Web:main
..
compare: Web:e39f94466089cf62ff3f8c12eb2422d19ff6a124
Branches Tags
Web:main

No commits in common. "4c89454c3f37aad0dac5f91f9f4dff587de551fc" and "e39f94466089cf62ff3f8c12eb2422d19ff6a124" have entirely different histories.
4c89454c3f ... e39f944660

10 changed files with 25 additions and 66 deletions
Show Stats Expand all files Collapse all files

6
src/views/order/cancelled.vue
View File

@ -48,11 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button

6
src/views/order/completed.vue
View File

@ -48,11 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button

8
src/views/order/obligation.vue
View File

@ -48,11 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -556,7 +552,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }
.send-button { .send-button {

10
src/views/order/orderDetails.vue
View File

@ -32,9 +32,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()"> <el-button type="primary" @click="submit()"> 确定 </el-button>
确定
</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -147,7 +145,7 @@
> >
订单详情<text 订单详情<text
style=" style="
color: #25bf82; color: #409eff;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
margin-left: 20px; margin-left: 20px;
@ -296,7 +294,7 @@
> >
<div <div
v-if="detailsData.orderStatus == '10'" v-if="detailsData.orderStatus == '10'"
class="button-bottom el-button-gry" class="button-bottom"
@click="agree('同意')" @click="agree('同意')"
> >
同意退款 同意退款
@ -542,7 +540,7 @@ const send = async () => {};
line-height: 40px; line-height: 40px;
font-size: 15px; font-size: 15px;
font-weight: bold; font-weight: bold;
// background-color: #409eff; background-color: #409eff;
} }
.button-bottoms { .button-bottoms {
text-align: center; text-align: center;

8
src/views/order/receivedGoods.vue
View File

@ -48,11 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -549,7 +545,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }
.send-button { .send-button {

4
src/views/order/refunded.vue
View File

@ -48,7 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button class="el-button-gry" type="primary" icon="Search" @click="onSubmit" <el-button type="primary" icon="Search" @click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -545,7 +545,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }
.send-button { .send-button {

10
src/views/order/salesService.vue
View File

@ -48,11 +48,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -559,7 +555,7 @@ onBeforeUnmount(() => {
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #fff; color: #fff;
background-color: #25bf82; background-color: #409eff;
cursor: pointer; cursor: pointer;
} }
@ -586,7 +582,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }

14
src/views/order/sendGoods.vue
View File

@ -64,9 +64,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()"> <el-button type="primary" @click="submit()"> 确定 </el-button>
确定
</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -118,11 +116,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -679,7 +673,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }
.send-button { .send-button {
@ -691,7 +685,7 @@ onBeforeUnmount(() => {
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #fff; color: #fff;
background-color: #25bf82; background-color: #409eff;
cursor: pointer; cursor: pointer;
} }
.tree-goods { .tree-goods {

13
src/views/order/sendGoodsInfo.vue
View File

@ -60,9 +60,7 @@
" "
> >
<div> <div>
<el-button class="el-button-gry" @click="send()" type="primary" <el-button @click="send()" type="primary">发货</el-button>
>发货</el-button
>
</div> </div>
</div> </div>
<div v-else class="sendGoods"> <div v-else class="sendGoods">
@ -113,10 +111,7 @@
</div> </div>
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<div v-if="index == 0" style="margin-left: 10px"> <div v-if="index == 0" style="margin-left: 10px">
<el-button <el-button type="primary" @click="addInput()"
class="el-button-gry"
type="primary"
@click="addInput()"
>新增包裹</el-button >新增包裹</el-button
> >
</div> </div>
@ -130,9 +125,7 @@
</div> </div>
<div>共计{{ inputData.length }}个包裹</div> <div>共计{{ inputData.length }}个包裹</div>
<div> <div>
<el-button class="el-button-gry" @click="send()" type="primary" <el-button @click="send()" type="primary">发货</el-button>
>发货</el-button
>
</div> </div>
</div> </div>
</div> </div>

12
src/views/order/shipped.vue
View File

@ -64,9 +64,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button> <el-button @click="dialogVisible = false">取消</el-button>
<el-button class="el-button-gry" type="primary" @click="submit()"> <el-button type="primary" @click="submit()"> 确定 </el-button>
确定
</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -118,11 +116,7 @@
</el-form> </el-form>
</div> </div>
<div class="search-bar-right"> <div class="search-bar-right">
<el-button <el-button type="primary" icon="Search" @click="onSubmit"
class="el-button-gry"
type="primary"
icon="Search"
@click="onSubmit"
>查询</el-button >查询</el-button
> >
<el-button <el-button
@ -656,7 +650,7 @@ onBeforeUnmount(() => {
line-height: 25px; line-height: 25px;
border-radius: 5px; border-radius: 5px;
font-size: 15px; font-size: 15px;
color: #25bf82; color: #409eff;
cursor: pointer; cursor: pointer;
} }
.send-button { .send-button {