|
@@ -29,19 +29,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
<div class="list-wrap">
|
|
<div class="list-wrap">
|
|
|
<block v-if="!$util.isEmpty(list.data)">
|
|
<block v-if="!$util.isEmpty(list.data)">
|
|
|
- <div
|
|
|
|
|
- class="list"
|
|
|
|
|
- v-for="(item, index) in list.data"
|
|
|
|
|
- :key="index"
|
|
|
|
|
- @click="
|
|
|
|
|
- pageTo({
|
|
|
|
|
- url: '/pagesOrder/detail',
|
|
|
|
|
- query: {
|
|
|
|
|
- id: item.id,
|
|
|
|
|
- },
|
|
|
|
|
- })
|
|
|
|
|
- "
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ <div class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({url: '/pagesOrder/detail',query: {id: item.id,},})">
|
|
|
<view class="order-top_box">
|
|
<view class="order-top_box">
|
|
|
<app-avatar-module :src="item.customAvatarUrl" :width="38" />
|
|
<app-avatar-module :src="item.customAvatarUrl" :width="38" />
|
|
|
<view class="tit">
|
|
<view class="tit">
|
|
@@ -89,23 +77,12 @@
|
|
|
<div class="list-bottom">
|
|
<div class="list-bottom">
|
|
|
<div class="list-button">
|
|
<div class="list-button">
|
|
|
<view v-for="s in item.buttonList" :key="s.type">
|
|
<view v-for="s in item.buttonList" :key="s.type">
|
|
|
- <button
|
|
|
|
|
- @click.stop="openBt(s, item)"
|
|
|
|
|
- v-if="s.show == 1"
|
|
|
|
|
- :disabled="s.disable === 1"
|
|
|
|
|
- class="admin-button-com bule"
|
|
|
|
|
- :class="s.disable === 1 ? 'active' : ''"
|
|
|
|
|
- >
|
|
|
|
|
- <!--{{-->
|
|
|
|
|
- <!--s.type === "item"-->
|
|
|
|
|
- <!--? "改花材"-->
|
|
|
|
|
- <!--: s.type === "selfGet"-->
|
|
|
|
|
- <!--? "自取"-->
|
|
|
|
|
- <!--: "发货"-->
|
|
|
|
|
- <!--}}-->
|
|
|
|
|
|
|
+ <button @click.stop="openBt(s, item)" v-if="s.show == 1&&s.type!='print'" :disabled="s.disable === 1" class="admin-button-com bule" :class="s.disable === 1 ? 'active' : ''">
|
|
|
{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
|
|
{{ s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" :s.type === "print" ? "打印" :s.type === "debtPay" ? "延期收款" :s.type === "hasPay" ? "已收款" : "发货" }}
|
|
|
-
|
|
|
|
|
</button>
|
|
</button>
|
|
|
|
|
+ <button @click.stop="openBt(s, item)" v-if="s.show == 1&&s.type=='print'" :disabled="s.disable === 1" class="admin-button-com bule" :class="s.disable === 1 ? 'active' : ''">
|
|
|
|
|
+ 打印{{item.printNum>0?`(${item.printNum})`:''}}
|
|
|
|
|
+ </button>
|
|
|
</view>
|
|
</view>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -168,6 +145,7 @@ export default {
|
|
|
computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
|
|
computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
|
|
+ orderId:'',
|
|
|
seekVal: "",
|
|
seekVal: "",
|
|
|
isShow: false, //是否显选择时间段
|
|
isShow: false, //是否显选择时间段
|
|
|
customizationTime: [], //时间段
|
|
customizationTime: [], //时间段
|
|
@@ -299,7 +277,8 @@ export default {
|
|
|
}
|
|
}
|
|
|
}, // 操作按钮
|
|
}, // 操作按钮
|
|
|
openBt(s, item) {
|
|
openBt(s, item) {
|
|
|
- console.log(123);
|
|
|
|
|
|
|
+ console.log(item);
|
|
|
|
|
+ this.orderId=item.id;
|
|
|
// 花材
|
|
// 花材
|
|
|
if (s.type === "item") {
|
|
if (s.type === "item") {
|
|
|
uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
|
|
uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
|
|
@@ -325,7 +304,7 @@ export default {
|
|
|
id: item.id,
|
|
id: item.id,
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
- }else if (s.type === "print") {
|
|
|
|
|
|
|
+ }else if (s.type === "print") {//打印
|
|
|
let BleVal = JSON.parse(item.printData);
|
|
let BleVal = JSON.parse(item.printData);
|
|
|
switch(uni.getSystemInfoSync().platform){
|
|
switch(uni.getSystemInfoSync().platform){
|
|
|
case 'android':
|
|
case 'android':
|