Merge remote-tracking branch 'origin/dev'

This commit is contained in:
纪寒 2023-03-15 14:39:58 +08:00
commit a0a03c2641
9 changed files with 707 additions and 888 deletions

View File

@ -11,8 +11,7 @@
style="display: none"
ref="upload"
v-if="this.type == 'url'"
>
</el-upload>
></el-upload>
<div class="editor" ref="editor" :style="styles"></div>
</div>
</template>
@ -30,32 +29,32 @@ export default {
/* 编辑器的内容 */
value: {
type: String,
default: "",
default: ""
},
/* 高度 */
height: {
type: Number,
default: null,
default: null
},
/* 最小高度 */
minHeight: {
type: Number,
default: null,
default: null
},
/* 只读 */
readOnly: {
type: Boolean,
default: false,
default: false
},
// (MB)
fileSize: {
type: Number,
default: 5,
default: 5
},
/* 类型base64格式、url格式 */
type: {
type: String,
default: "url",
default: "url"
}
},
data() {
@ -73,21 +72,21 @@ export default {
modules: {
//
toolbar: [
["bold", "italic", "underline", "strike"], // 线 线
["blockquote", "code-block"], //
[{ list: "ordered" }, { list: "bullet" }], //
[{ indent: "-1" }, { indent: "+1" }], //
[{ size: ["small", false, "large", "huge"] }], //
[{ header: [1, 2, 3, 4, 5, 6, false] }], //
[{ color: [] }, { background: [] }], //
[{ align: [] }], //
["clean"], //
["link", "image"] //
],
["bold", "italic", "underline", "strike"], // 线 线
["blockquote", "code-block"], //
[{ list: "ordered" }, { list: "bullet" }], //
[{ indent: "-1" }, { indent: "+1" }], //
[{ size: ["small", false, "large", "huge"] }], //
[{ header: [1, 2, 3, 4, 5, 6, false] }], //
[{ color: [] }, { background: [] }], //
[{ align: [] }], //
["clean"], //
["link", "image"] //
]
},
placeholder: "请输入内容",
readOnly: this.readOnly,
},
readOnly: this.readOnly
}
};
},
computed: {
@ -100,7 +99,7 @@ export default {
style.height = `${this.height}px`;
}
return style;
},
}
},
watch: {
value: {
@ -112,8 +111,8 @@ export default {
}
}
},
immediate: true,
},
immediate: true
}
},
mounted() {
this.init();
@ -126,9 +125,9 @@ export default {
const editor = this.$refs.editor;
this.Quill = new Quill(editor, this.options);
//
if (this.type == 'url') {
if (this.type == "url") {
let toolbar = this.Quill.getModule("toolbar");
toolbar.addHandler("image", (value) => {
toolbar.addHandler("image", value => {
this.uploadType = "image";
if (value) {
this.$refs.upload.$children[0].$refs.input.click();
@ -176,10 +175,12 @@ export default {
//
let length = quill.getSelection().index;
// res.url
quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
quill.insertEmbed(
length,
"image",
process.env.VUE_APP_BASE_API + res.fileName
);
this.$emit("imgs", res.fileName);
//
quill.setSelection(length + 1);
} else {
@ -188,13 +189,14 @@ export default {
},
handleUploadError() {
this.$message.error("图片插入失败");
},
},
}
}
};
</script>
<style>
.editor, .ql-toolbar {
.editor,
.ql-toolbar {
white-space: pre-wrap !important;
line-height: normal !important;
}

View File

@ -25,8 +25,7 @@ export default {
innerrefund: false,
orderList: [],
refundlist: [],
orderTypelist: [
{
orderTypelist: [{
value: "INTEGRAL_EXCHANGE",
label: "积分兑换",
},
@ -40,45 +39,45 @@ export default {
],
ratelist: {}, //评分list
orderStatuslist: [{
value: "WAIT_PAY",
label: "待付款",
},
{
value: "PAY",
label: "待发货",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
},
{
value: "RECEIVED_GOODS",
label: "待评价",
},
{
value: "EVALUATED",
label: "交易完成",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RETURNED_GOODS",
label: "已退货",
},
{
value: "WAIT_REFUND",
label: "退款中",
},
{
value: "REFUNDED",
label: "退款成功",
},
value: "WAIT_PAY",
label: "待付款",
},
{
value: "PAY",
label: "待发货",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
},
{
value: "RECEIVED_GOODS",
label: "待评价",
},
{
value: "EVALUATED",
label: "交易完成",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RETURNED_GOODS",
label: "已退货",
},
{
value: "WAIT_REFUND",
label: "退款中",
},
{
value: "REFUNDED",
label: "退款成功",
},
],
// 遮罩层
loading: true,
@ -157,13 +156,6 @@ export default {
this.queryParams.nurseStationId = item.id;
this.nurseStationshow = false;
},
//护理站list
info() {
getListByUser(this.getListByUserquery).then((res) => {
this.nurseStationlist = res.rows;
this.stationtotal = res.total;
});
},
//页面所属护理站
ParamsStation(item) {
console.log(this.getListByUserquery)
@ -224,7 +216,6 @@ export default {
return "微信小程序";
case "ALI_PAY_APPLET":
return "支付宝小程序";
default:
break;
}
@ -236,6 +227,8 @@ export default {
return "护理站";
case "SHOPPING_MALL":
return "商城";
case "HEALTH_CONSULTATION":
return "健康咨询";
default:
break;
}
@ -258,7 +251,7 @@ export default {
this.ratelist = {}
if (row.orderStatus == 'EVALUATED') {
this.ratelist = res.data.orderEvaluatePictureInfoList
} else { }
} else {}
});
},
// 查看录入物流单号弹框
@ -298,7 +291,7 @@ export default {
//确认退款 确定按钮
submitRefundOrder() {
var obj = {};
obj.orderType=this.refundlist.orderType;
obj.orderType = this.refundlist.orderType;
obj.orderNo = this.refundlist.goOrderNo;
obj.refundReason = this.refundlist.dictLabel;
obj.refundPrice = this.refundlist.godTotalPrice;
@ -419,21 +412,21 @@ export default {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除商品订单编号为"' + ids + '"的数据项?')
.then(function () {
.then(function() {
return delGoodsOrder(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => { });
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download(
"system/goodsOrder/export", {
...this.queryParams,
},
...this.queryParams,
},
`goodsOrder_${new Date().getTime()}.xlsx`
);
},

View File

@ -116,31 +116,34 @@
/>
<!-- 添加或修改医院信息管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
<el-form-item label="医院名称" prop="hospitalName">
<el-input v-model="form.hospitalName" style="width:200px" placeholder="请输入医院名称" />
<el-input v-model="form.hospitalName" style="width:200px" maxlength="50" placeholder="请输入医院名称" />
</el-form-item>
<!-- <el-form-item label="医院编码" prop="hospitalCode">
<el-input v-model="form.hospitalCode" placeholder="请输入医院编码" />
</el-form-item> -->
<el-form-item label="医院地址" prop="hospitalAddress">
<el-input style="width:200px" v-model="form.hospitalAddress" placeholder="请输入医院地址" />
<el-input style="width:200px" v-model="form.hospitalAddress" maxlength="300" placeholder="请输入医院地址" />
</el-form-item>
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" maxlength="11" style="width:200px" placeholder="请输入联系电话" />
<el-input v-model="form.phone" maxlength="11"
oninput="value=value.replace(/[^\d]/g,'')" style="width:200px" placeholder="请输入联系电话" />
</el-form-item>
<el-form-item label="显示顺序" prop="hospitalSort">
<el-input v-model="form.hospitalSort" maxlength="5" style="width:200px" placeholder="请输入显示顺序" />
<el-input v-model.number="form.hospitalSort" maxlength="5" style="width:200px" placeholder="请输入显示顺序" />
</el-form-item>
<el-form-item label="医院简介" prop="hospitalIntroduce">
<editor
@imgs="imgs"
:min-height="100"
v-model="form.hospitalIntroduce"
style="width:1000px;"
></editor>
<!-- <el-input v-model="form.hospitalIntroduce" type="textarea" placeholder="请输入内容" /> -->
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -159,16 +162,16 @@ export default {
components: { editor },
name: "Hospital",
data() {
//
var checkMobile = (rule, value, cb) => {
//
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
if (regMobile.test(value)) {
return cb();
}
cb(new Error("请输入正确的联系电话"));
};
// //
// var checkMobile = (rule, value, cb) => {
// //
// const regMobile =
// /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
// if (regMobile.test(value)) {
// return cb();
// }
// cb(new Error(""));
// };
return {
//
loading: true,
@ -221,7 +224,7 @@ export default {
phone: [
{
required: true,
validator: checkMobile,
// validator: checkMobile,
message: "",
trigger: "blur",
},
@ -339,7 +342,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除医院信息管理编号为"' + ids + '"的数据项').then(function() {
this.$modal.confirm('是否确认删除医院信息?').then(function() {
return delHospital(ids);
}).then(() => {
this.getList();

View File

@ -8,7 +8,6 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="医院名称" prop="hospitalName">
<el-input
v-model="queryParams.hospitalName"
@ -30,6 +29,7 @@
v-model="queryParams.departmentName"
placeholder="请输入科室名称"
clearable
maxlength="50"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -113,17 +113,17 @@
align="center"
prop="departmentPerson"
/>
<el-table-column
<!-- <el-table-column
label="科室地址"
align="center"
prop="departmentAddress"
/>
/> -->
<!-- <el-table-column label="科室显示级别" align="center" prop="departmentLevel" /> -->
<el-table-column
<!-- <el-table-column
label="科室显示顺序"
align="center"
prop="departmentSort"
/>
/> -->
<el-table-column
label="操作"
align="center"
@ -162,7 +162,7 @@
<el-dialog
:title="title"
:visible.sync="addopen"
width="900px"
width="1200px"
append-to-body
:before-close="cancel"
>
@ -220,6 +220,7 @@
style="width: 250px"
v-model="item.departmentName"
placeholder="请输入科室名称"
maxlength="50"
/>
</el-form-item>
<el-form-item
@ -228,8 +229,9 @@
:prop="`hospitalDepartmentInfoList.${index}.departmentPhone`"
>
<el-input
maxlength="11"
maxlength="11"
style="width: 250px"
oninput="value=value.replace(/[^\d]/g,'')"
v-model="item.departmentPhone"
placeholder="请输入科室联系电话"
/>
@ -241,6 +243,7 @@
>
<el-input
style="width: 250px"
maxlength="20"
v-model="item.departmentPerson"
placeholder="请输入科室负责人名称"
/>
@ -252,6 +255,7 @@
>
<el-input
style="width: 250px"
maxlength="300"
v-model="item.departmentAddress"
placeholder="请输入科室地址"
/>
@ -262,10 +266,11 @@
:prop="`hospitalDepartmentInfoList.${index}.departmentSort`"
>
<el-input
maxlength="5"
v-model="item.departmentSort"
maxlength="5"
oninput="value=value.replace(/[^\d]/g,'')"
v-model.number="item.departmentSort"
placeholder="请输入科室显示顺序"
style="width:250px"
style="width: 250px"
/>
</el-form-item>
<el-button
@ -399,8 +404,19 @@
/>
</el-dialog>
<!-- 修改护理站部门信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-dialog
:title="title"
:visible.sync="open"
width="1200px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="110px"
:inline="true"
>
<el-form-item label="所属医院" prop="hospitalName">
<el-input
v-model="form.hospitalName"
@ -415,13 +431,14 @@
v-model="form.departmentName"
placeholder="请输入科室名称"
style="width: 250px"
maxlength="15"
maxlength="50"
/>
</el-form-item>
<el-form-item label="科室负责人" prop="departmentPerson">
<el-input
v-model="form.departmentPerson"
placeholder="请输入科室负责人"
maxlength="20"
style="width: 250px"
/>
</el-form-item>
@ -429,6 +446,7 @@
<el-input
v-model="form.departmentPhone"
placeholder="请输入联系电话"
oninput="value=value.replace(/[^\d]/g,'')"
maxlength="11"
style="width: 250px"
/>
@ -438,12 +456,14 @@
v-model="form.departmentAddress"
placeholder="请输入科室地址"
style="width: 250px"
maxlength="300"
/>
</el-form-item>
<el-form-item label="科室显示顺序" prop="departmentSort">
<el-input
maxlength="5"
v-model="form.departmentSort"
oninput="value=value.replace(/[^\d]/g,'')"
maxlength="5"
v-model.number="form.departmentSort"
placeholder="请输入科室显示顺序"
style="width: 250px"
/>
@ -472,15 +492,15 @@ export default {
name: "HospitalDepartment",
data() {
//
var checkMobile = (rule, value, cb) => {
//
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
if (regMobile.test(value)) {
return cb();
}
cb(new Error("请输入正确的联系电话"));
};
// var checkMobile = (rule, value, cb) => {
// //
// const regMobile =
// /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
// if (regMobile.test(value)) {
// return cb();
// }
// cb(new Error(""));
// };
return {
//
loading: true,
@ -489,8 +509,8 @@ export default {
hospitalqueryParams: {
pageNum: 1,
pageSize: 10,
hospitalCode:"",
hospitalName:"",
hospitalCode: "",
hospitalName: "",
},
infolist: [],
//
@ -568,7 +588,7 @@ export default {
departmentPhone: [
{
required: true,
validator: checkMobile,
// validator: checkMobile,
trigger: "blur",
message: "",
},
@ -599,7 +619,7 @@ export default {
departmentPhone: [
{
required: true,
validator: checkMobile,
// validator: checkMobile,
trigger: "blur",
message: "",
},
@ -617,10 +637,8 @@ export default {
required: true,
message: "请输入科室显示顺序",
trigger: "blur",
message: "",
},
],
},
};
},
@ -647,11 +665,10 @@ export default {
// this.form.hospitalName = row.hospitalName;
// this.form.hospitalId = row.id;
// } else {
this.form.hospitalDepartmentInfoList[
this.nnerVisibleindex
].hospitalName = row.hospitalName;
this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId =
row.id;
this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalName =
row.hospitalName;
this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId =
row.id;
// }
this.innerVisible = false;
},
@ -694,8 +711,8 @@ export default {
this.hospitalqueryParams = {
pageNum: 1,
pageSize: 10,
hospitalCode:"",
hospitalName:"",
hospitalCode: "",
hospitalName: "",
};
this.info();
},
@ -709,9 +726,9 @@ export default {
});
},
info() {
list(this.hospitalqueryParams,).then((response) => {
list(this.hospitalqueryParams).then((response) => {
this.infolist = response.rows;
console.log(this.infolist)
console.log(this.infolist);
this.total2 = response.total;
this.loading = false;
});
@ -751,9 +768,9 @@ export default {
this.queryParams = {
pageNum: 1,
pageSize: 10,
hospitalName:"",
departmentCode:"",
departmentName:"",
hospitalName: "",
departmentCode: "",
departmentName: "",
};
this.handleQuery();
},
@ -804,7 +821,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除科室信息管理编号为"' + ids + '"的数据项?')
.confirm("是否确认删除此科室的信息?")
.then(function () {
return delHospitalDepartment(ids);
})

File diff suppressed because it is too large Load Diff

View File

@ -223,8 +223,7 @@ export default {
appointmentOrderDetails(id).then((res) => {
res.data.forEach((e) => {
if (e.serviceDate) {
e.time =
e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
e.time = e.serviceDate + "-" + e.serviceStartTime;
}
});
this.query = res.data[0];
@ -415,4 +414,4 @@ export default {
);
},
},
};
};

View File

@ -674,6 +674,7 @@ export default {
},
//
choicenurseItem(e) {
console.log(e)
this.nurseitemid = e.id;
if (this.homenumber) {
this.queryParams.nurseItemName = e.nurseItemName;
@ -704,6 +705,8 @@ export default {
},
//
ParamsStation(item) {
this.queryParams.nurseItemName="";
this.form.nurseItemName="请选择所属护理项目";
this.info();
this.nurseStationshow = true;
this.homenumber = item;
@ -715,6 +718,7 @@ export default {
},
//
ParamsStationxm(item) {
console.log(item)
if (this.nurseItemquery.nurseStationId) {
this.nurseItemlistInfo();
this.homenumber = item;
@ -803,6 +807,7 @@ export default {
this.open = false;
});
}
this.nurseItemquery.nurseStationId = null;
this.imgs = { pictureUrlList: [] };
this.open = false;
@ -910,7 +915,7 @@ export default {
}
});
},
/** 删除按钮操作 */
/** 删除按钮操作 */
handleDelete(row) {
var ids = row.id || this.ids;
var nurseStationIds = row.nurseStationId || this.nurseStationIds;

View File

@ -437,7 +437,7 @@ export default {
settingsName: [
{
required: true,
message: "请输入系统设置名称",
message: "请输入规则名称",
trigger: "blur",
},
],
@ -451,7 +451,7 @@ export default {
settingsType: [
{
required: true,
message: "请选择系统设置类型",
message: "请选择规则类型",
trigger: "blur",
},
],
@ -487,14 +487,7 @@ export default {
},
};
},
// computed: {
// label() {
// let label = "";
// if (this.form.settingsType == "INVITE_FRIENDS") label = "";
// if (this.form.settingsType == "SIGN_IN_RULE") label = "";
// return label;
// },
// },
created() {
this.getList();
@ -594,6 +587,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
console.log(row)
const ids = row.id || this.ids;
const settingsNames=row.settingsName||this.settingsNames
this.$modal

View File

@ -80,6 +80,7 @@
<br />
<el-row>
<el-col :lg="2" :md="2">
<el-upload
action="#"
:http-request="requestUpload"
@ -307,6 +308,12 @@ export default {
if(this.types == "certificateUrl"){
this.items.certificateUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items));
console.log(this.item)
}
if(this.types == "personPictureUrl"){
// this.items.personPictureUrl = response.imgUrl;
this.$emit("item", JSON.stringify(this.items));
}
this.openimg = false;
});