合并master

This commit is contained in:
lemon橪
2021-06-29 12:00:05 +08:00
14 changed files with 288 additions and 170 deletions

View File

@@ -344,6 +344,7 @@ export default {
callback(val, index) {
this.$set(val, "___selected", !val.___selected);
console.log(val.___selected);
console.log(this.selectMember);
let findUser = this.selectMember.find((item) => {
return item.id == val.id;
});

View File

@@ -137,7 +137,7 @@
<Form-item label="订单类型" prop="orderType">
<Select v-model="orderSearchForm.orderType" placeholder="请选择" clearable style="width: 200px">
<Option value="NORMAL">普通订单</Option>
<Option value="FICTITIOUS">虚拟订单</Option>
<Option value="VIRTUAL">虚拟订单</Option>
<Option value="GIFT">赠品订单</Option>
<Option value="PINTUAN">拼团订单</Option>
</Select>
@@ -479,7 +479,7 @@
render: (h, params) => {
if (params.row.orderType == "NORMAL") {
return h('div', [h('span', {}, '普通订单'),]);
} else if (params.row.orderType == "FICTITIOUS") {
} else if (params.row.orderType == "VIRTUAL") {
return h('div', [h('span', {}, '虚拟订单'),]);
} else if (params.row.orderType == "GIFT") {
return h('div', [h('span', {}, '赠品订单'),]);