diff --git a/src/api/manage/continueSigning.js b/src/api/manage/continueSigning.js new file mode 100644 index 0000000..b101213 --- /dev/null +++ b/src/api/manage/continueSigning.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + + +//续约界面查询签约详情 +export function getByRecordId(patientSignRecordId) { + return request({ + url: `/manage/signRecord/getByRecordId/${patientSignRecordId}`, + method: 'get', + }) +} diff --git a/src/api/manage/newSigning.js b/src/api/manage/newSigning.js new file mode 100644 index 0000000..f706f96 --- /dev/null +++ b/src/api/manage/newSigning.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 签约 +export function addsign(data) { + return request({ + url: '/manage/signRecord/sign', + method: 'post', + data + }) +} \ No newline at end of file diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js index 65094a4..83b3fa1 100644 --- a/src/api/manage/signRecord.js +++ b/src/api/manage/signRecord.js @@ -42,3 +42,12 @@ export function delSignRecord(id) { method: 'delete' }) } + +//解约 +export function updateSignStatus(data) { + return request({ + url: '/manage/signRecord/updateSignStatus', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/views/manage/blacklist/index.vue b/src/views/manage/blacklist/index.vue index 22a3e53..8d26afc 100644 --- a/src/views/manage/blacklist/index.vue +++ b/src/views/manage/blacklist/index.vue @@ -135,15 +135,14 @@ - + - + + + + + + + + + + + + + + + + + 至 + + + + + + + + + +
+ + + + + + + + + + 删除 + +
+ 新增硬件 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index e396fd8..5919bee 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -1,44 +1,175 @@ - - + - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index 41f0a2f..057350f 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -70,7 +70,7 @@ --> - + diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index b2bc84e..1ecfa27 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -89,7 +89,7 @@ --> diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index e10c3e7..fa93e56 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -103,10 +103,10 @@ size="mini" @click="handleAdd" v-hasPermi="['manage:servicewaycontent:add']" - >新增新增服务内容配置 - + +
+ + + + +
+
+ + + + + + + + + +
+ + + + + + - + - - + 数字 -
文本
-
- - - - - -
确 定 @@ -462,7 +508,11 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + serviceFrequencyType: [ + { required: true, message: "请选中服务频次", trigger: "blur" }, + ], + }, itemname: null, querydepartmen: { serviceWayName: "", @@ -470,11 +520,11 @@ export default { disabled: true, disabledb: false, disableda: false, + valuePlus:'', }; }, watch: { name(val) { - // console.log(val,'55') this.querydepartmen.serviceWayName = val; this.mentlist(); }, @@ -482,12 +532,18 @@ export default { created() { this.getList(); this.mentlist(); - - // listMessage(this.queryParams).then(response => { - // this.count = response.total; - // }); }, methods: { + getSuppliers(e) { + console.log(e); + }, + blurInput(val) { + console.log(val, "555"); + }, + blurInputs(val) { + console.log(val, "666"); + this.form.id = val; + }, textlist(e) { if (e == true) { this.disableda = true; @@ -575,6 +631,10 @@ export default { this.loading = true; listServicewaycontent(this.queryParams).then((response) => { this.servicewaycontentList = response.rows; + this.servicewaycontentList.forEach((e) => { + this.serviceFrequencyType = e.serviceFrequencyType; + }); + this.total = response.total; this.loading = false; }); @@ -632,19 +692,37 @@ export default { }, /** 修改按钮操作 */ handleUpdate(row) { - // this.reset(); - console.log(row); + this.reset(); + console.log(row,'99999'); // const id = row.id - row.serviceWayFrequencyList.forEach((e) => { + + // -------------- + if(!this.form.id){ + row.serviceWayFrequencyList.forEach((e) => { this.form.id = e.id; }); + } + getServicewaycontent(this.form.id).then((response) => { this.form = response.data; this.form.id = response.data.serviceFrequencyId; + // ---------- + if (response.data.serviceFrequencyType == "DIGIT") { + this.DIGIT = true; + this.TEXT = false; + + }else{ + this.TEXT=true + this.DIGIT = false; + + } + + // --------------- this.open = true; this.title = "修改服务方式内容"; }); + // ----------- }, /** 提交按钮 */ submitForm() { @@ -787,4 +865,7 @@ export default { top: 16px; left: 12px; } +.el-button--success.is-plain { + font-size: 10px; +} \ No newline at end of file diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 568e8cf..b743400 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -4,7 +4,7 @@ - + - + @@ -113,7 +113,7 @@ - + @@ -128,12 +128,14 @@ + + @@ -144,6 +146,7 @@ + + +