|
|
@@ -47,18 +47,15 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="收件人" prop="realName">
|
|
|
<el-input
|
|
|
-
|
|
|
v-model="queryParams.realName"
|
|
|
placeholder="请输入收件人姓名"
|
|
|
clearable
|
|
|
size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ @keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+
|
|
|
<el-form-item label="员工姓名" prop="companyUserNickName">
|
|
|
<el-input
|
|
|
-
|
|
|
v-model="queryParams.companyUserNickName"
|
|
|
placeholder="请输入员工姓名"
|
|
|
clearable
|
|
|
@@ -66,16 +63,6 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="产品" prop="productName">
|
|
|
- <el-input
|
|
|
-
|
|
|
- v-model="queryParams.productName"
|
|
|
- placeholder="请输入产品名"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="订单类型" prop="orderType">
|
|
|
<el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable size="small" >
|
|
|
<el-option
|
|
|
@@ -105,16 +92,6 @@
|
|
|
:value="item.dictValue"
|
|
|
/>
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="支付方式" prop="payType">
|
|
|
- <el-select style="width: 200px" v-model="queryParams.payType" placeholder="请选择支付方式" clearable size="small" >
|
|
|
- <el-option
|
|
|
- v-for="item in payTypeOptions"
|
|
|
- :key="item.dictValue"
|
|
|
- :label="item.dictLabel"
|
|
|
- :value="item.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="下单时间" prop="createTimeRange">
|
|
|
<el-date-picker
|
|
|
@@ -196,7 +173,7 @@
|
|
|
v-hasPermi="['store:storeOrder:exportItems']"
|
|
|
>导出订单明细</el-button>
|
|
|
</el-col>
|
|
|
-
|
|
|
+
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
<el-tabs type="card" v-model="activeName" @tab-click="handleClick">
|
|
|
@@ -233,7 +210,7 @@
|
|
|
<div class="sku">{{ JSON.parse(item.jsonInfo).sku}}</div>
|
|
|
<div class="price">￥{{JSON.parse(item.jsonInfo).price}}×{{item.num}}</div>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
@@ -276,7 +253,7 @@
|
|
|
<el-tag prop="status" v-for="(item, index) in deliveryPayStatusOptions" v-if="scope.row.deliveryPayStatus==item.dictValue">{{item.dictLabel}}</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
<el-table-column label="操作" fixed="right" width="80px" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -294,7 +271,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<pagination
|
|
|
v-show="total>0"
|
|
|
:total="total"
|
|
|
@@ -462,7 +439,7 @@
|
|
|
<div class="import-msg" v-html="importMsg">
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -604,7 +581,7 @@ export default {
|
|
|
isRemind: null,
|
|
|
isSysDel: null,
|
|
|
deptId:null,
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
@@ -619,7 +596,7 @@ export default {
|
|
|
addressId: [
|
|
|
{ required: true, message: "收货信息不能为空" }
|
|
|
],
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
upload: {
|
|
|
// 是否显示弹出层（用户导入）
|
|
|
@@ -663,7 +640,7 @@ export default {
|
|
|
this.getDicts("store_delivery_pay_status").then((response) => {
|
|
|
this.deliveryPayStatusOptions = response.data;
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -802,7 +779,7 @@ export default {
|
|
|
else{
|
|
|
this.queryParams.deliverySendTimeRange=null;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
listStoreOrder(this.queryParams).then(response => {
|
|
|
this.storeOrderList = response.rows;
|
|
|
this.total = response.total;
|
|
|
@@ -819,7 +796,7 @@ export default {
|
|
|
this.form = {
|
|
|
addressId:null,
|
|
|
userId:null,
|
|
|
-
|
|
|
+
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -868,7 +845,7 @@ export default {
|
|
|
this.getList();
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -876,7 +853,7 @@ export default {
|
|
|
handleDelete(row) {
|
|
|
this.products.splice(this.products.findIndex(item => item.id === row.id), 1)
|
|
|
this.compute();
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
@@ -973,7 +950,7 @@ export default {
|
|
|
// });
|
|
|
this.getList();
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
|
var that=this;
|
|
|
@@ -1015,7 +992,7 @@ export default {
|
|
|
max-width: 200px;
|
|
|
text-align: left;
|
|
|
.goods-title{
|
|
|
-
|
|
|
+
|
|
|
overflow:hidden;
|
|
|
white-space: nowrap;
|
|
|
text-overflow: ellipsis;
|
|
|
@@ -1038,4 +1015,4 @@ export default {
|
|
|
}
|
|
|
|
|
|
</style>
|
|
|
-
|
|
|
+
|
wansfa