xinyilu/NurseStationUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
纪寒 2023-01-12 16:22:35 +08:00
commit 44f6083925
5 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/views/system/goodsInfo/goodsInfojs.js
View File

@ -54,22 +54,22 @@ export default {
nursetotal: 0,
nurseStationId: null,
goods: [{
value: "BUSINESS",
label: "买卖",
},
{
value: "LEASE",
label: "租赁",
},
value: "BUSINESS",
label: "买卖",
},
{
value: "LEASE",
label: "租赁",
},
],
options: [{
value: 0,
label: "否",
},
{
value: 1,
label: "是",
},
value: 0,
label: "否",
},
{
value: 1,
label: "是",
},
],
// goodAttributeDetailsLists:[],
goodDetailsLists: [],
@ -129,7 +129,10 @@ export default {
{ required: true, message: "请输入商品度量单位", trigger: "blur" },
],
goodsPictureUrl: [
{ required: true, message: "请输入选择图片", trigger: "blur" },
{ required: true, message: "请选择图片", trigger: "blur" },
],
sort: [
{ required: true, message: "请输入商品顺序", trigger: "blur" },
],
},
};
@ -193,7 +196,7 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
sort: "",
sort: null,
ids: this.ids,
};
this.goodDetailsLists.push(obj);
@ -234,7 +237,7 @@ export default {
});
}
if (this.imgsurl.pictureUrlList.length > 0) {
updatePicture(this.imgsurl).then((res) => { });
updatePicture(this.imgsurl).then((res) => {});
}
this.imgsurl = { pictureUrlList: [] };
this.open = false;
@ -246,9 +249,9 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
sort: "",
},],
},];
sort: null,
}, ],
}, ];
},
handleQuery2() {
@ -267,7 +270,7 @@ export default {
pageNum: 1,
pageSize: 10,
}),
this.handleQuery2();
this.handleQuery2();
},
addcancel() {
this.resetQuery2();
@ -298,9 +301,9 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
sort: "",
sort: null,
ids: 9999999,
},];
}, ];
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -341,9 +344,9 @@ export default {
attributePitureUrl: "",
goodsPrice: "",
goodsStock: "",
sort: "",
sort: null,
ids: 9999999,
},];
}, ];
this.open = true;
},
/** 修改按钮操作 */
@ -413,10 +416,10 @@ export default {
handleDelete(row) {
console.log("row :>> ", row);
this.$confirm("是否确认删除订单信息的数据项？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
var obj = { pictureUrlList: [] };
obj.pictureUrlList.push(row.goodsPictureUrl);
@ -430,7 +433,7 @@ export default {
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
})
.catch(() => { });
.catch(() => {});
},
// handleDelete(row) {
// const ids = row.id || this.ids;
@ -507,4 +510,4 @@ export default {
});
},
},
};
};

14
src/views/system/goodsInfo/index.vue
View File

@ -267,6 +267,13 @@
style="width: 210px"
/>
</el-form-item>
<el-form-item label="商品顺序" prop="sort">
<el-input
v-model.number="form.sort"
placeholder="值越大排名越靠前"
style="width: 210px"
/>
</el-form-item>
<el-form-item label="商品图片" prop="goodsPictureUrl">
<stationAcatar
@imgUrl="imgUrl"
@ -309,11 +316,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column label="显示顺序" align="center">
<el-table-column label="商品属性顺序" align="center">
<template slot-scope="scope">
<el-input
v-model="scope.row.attributeDetailsSort"
v-model.number="scope.row.attributeDetailsSort"
maxlength="10"
placeholder="值越大排名越靠前"
oninput="value=value.replace(/[^\d]/g,'')"
></el-input>
</template>
@ -349,7 +357,7 @@
style="margin-top: 20px"
>
<editor
@imgs="imgs"
@imgs="imgs"
:min-height="100"
style="width: 90%; margin: 0 auto"
v-model="form.goodsRemark"

24
src/views/system/goodsOrder/index.vue
View File

@ -30,7 +30,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select
v-model="queryParams.orderStatus"
@ -45,6 +44,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入联系电话"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -124,6 +131,12 @@
>
</template>
</el-table-column>
<el-table-column
label="联系电话"
align="center"
prop="phone"
width="180"
/>
<el-table-column
label="下单时间"
align="center"
@ -137,7 +150,7 @@
{{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝小程序" : "" }}
</template>
</el-table-column>
<el-table-column label="备注信息" align="center" prop="remark" />
<!-- <el-table-column label="备注信息" align="center" prop="remark" /> -->
<el-table-column label="录入物流单号" align="center" prop="remark">
<template slot-scope="scope">
<el-button
@ -310,7 +323,7 @@
style="width: 240px"
/>
</el-form-item>
<el-form-item label="综合评分" v-if="orderList.compositeScore">
<el-form-item label="综合评分" v-if="orderList.compositeScore">
<div style="width: 240px">
<el-rate
v-if="orderList.compositeScore"
@ -348,7 +361,7 @@
"
>
<img
style="width: 23%;height:100%;margin:1%"
style="width: 23%; height: 100%; margin: 1%"
v-for="(item, index) in ratelist"
:src="baseurl + item.evaluatePictureUrl"
alt=""
@ -881,13 +894,12 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
console.log(this.nurseStationlist);
console.log(this.nurseStationlist);
if (this.nurseStationlist[0]) {
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
this.queryParams.orderNo = null;
this.queryParams.orderStatus = null;
this.queryParams.phone = null;
}
// this.queryParams = {

1
src/views/system/order/index.vue
View File

@ -119,6 +119,7 @@
</el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" />
<el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column label="护理员" align="center" prop="nursePersonName" />
<el-table-column
label="操作"
align="center"

3
src/views/system/station/index.vue
View File

@ -705,6 +705,9 @@ export default {
this.imgsurl = { pictureUrlList: [] };
this.open = false;
this.reset();
this.arealist = [];
this.citylist = [];
this.streetlist = [];
},
// 表单重置
reset() {