diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js
index 83b3fa1..f1a3e2a 100644
--- a/src/api/manage/signRecord.js
+++ b/src/api/manage/signRecord.js
@@ -50,4 +50,13 @@ export function updateSignStatus(data) {
method: 'post',
data: data
})
+}
+
+//服务包list
+export function servicepackageinfo(query) {
+ return request({
+ url: `/manage/servicepackage/getList`,
+ method: 'get',
+ params: query
+ })
}
\ No newline at end of file
diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue
index f003f4e..06056e3 100644
--- a/src/views/manage/continueSigning/index.vue
+++ b/src/views/manage/continueSigning/index.vue
@@ -53,8 +53,8 @@
-
-
+
+
-
@@ -166,7 +166,7 @@ export default {
informeds: []
},
rules: {
- packageId: [
+ packageName: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
@@ -198,6 +198,7 @@ export default {
getByRecordId(this.$route.query.patientSignRecordId).then(res => {
this.list = res.data
this.signPackage.packageName = this.list.packageName
+ this.signPackage.packageId = this.list.servicePackageId
this.signPackage.serviceCycle = this.list.serviceCycle
this.signPackage.serviceStartTime = this.list.serviceStartTime
this.signPackage.serviceEndTime = this.list.serviceEndTime
@@ -215,7 +216,6 @@ export default {
} else {
this.uploadsave();
}
- console.log(this.signPackage)
},
//文件上传完成
handleSuccess(response, file, fileList) {
diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue
index 6968681..be4bcee 100644
--- a/src/views/manage/newSigning/index.vue
+++ b/src/views/manage/newSigning/index.vue
@@ -23,9 +23,6 @@
{{ $route.query.inHospitalNumber }}
{{ $route.query.hospitalAgencyName }}
{{ $route.query.departmentName }}
- {{ $route.query.paymentStatus == 'PAID' ? '已缴费' : '' }}
- {{ $route.query.paymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }}
-
@@ -41,8 +38,49 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 年
+ 月
+ 日
+
+
+
+
+
+
+ 至
+
+
+
+
@@ -89,6 +127,9 @@
import {
addsign
} from '@/api/manage/newSigning.js'
+import {
+ servicepackageinfo
+} from '@/api/manage/signRecord.js'
import { getToken } from '@/utils/auth'
export default {
dicts: ['hardware_type'],
@@ -96,7 +137,8 @@ export default {
data() {
return {
signPackage: {
- packageName: undefined
+ packageName: undefined,
+ packagePaymentStatus: '',
},
form: {
record: {
@@ -112,7 +154,10 @@ export default {
informeds: []
},
rules: {
- packageId: [
+ packagePaymentStatus: [
+ { required: true, message: '缴费状态不能为空', trigger: 'change' }
+ ],
+ servicePackageld: [
{ required: true, message: '请选择服务包', trigger: 'change' }
],
devices: {
@@ -132,25 +177,41 @@ export default {
Authorization: 'Bearer ' + getToken(),
},
url: process.env.VUE_APP_BASE_API + '/manage/file/uploadFile'
- }
+ },
+ packagelist: [],
};
},
created() {
this.form.record = this.$route.query
+ this.signPackage.packagePaymentStatus = this.form.record.paymentStatus
+ servicepackageinfo({ departmentId: this.$route.query.departmentId }).then(res => {
+ this.packagelist = res.data
+ })
},
methods: {
+ tappackage(id) {
+ this.signPackage = { ...this.signPackage, ...this.packagelist.find(e => e.id == id) }
+ let currentDate = new Date();
+ let year = currentDate.getFullYear();
+ let month = currentDate.getMonth() + 1;
+ let day = currentDate.getDate();
+ month >= 1 && month <= 9 ? (month = "0" + month) : "";
+ day >= 0 && day <= 9 ? (day = "0" + day) : "";
+ this.signPackage.serviceStartTime = `${year}-${month}-${day}`
+ },
//签约
signupload() {
- this.$refs.upload.submit();
+ const files = this.$refs.upload.uploadFiles
+ if (files.length > 0) {
+ this.$refs.upload.submit();
+ } else {
+ this.uploadsave();
+ }
},
- //文件上传完成
- handleSuccess(response, file, fileList) {
- this.form.informeds = []
- fileList.forEach(e => {
- this.form.informeds.push({
- informedFilePath: e.response.imgUrl,
- })
- })
+ uploadsave() {
+ if (this.signPackage.servicePackageld) {
+ this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName
+ }
this.form.signPackage = this.signPackage
addsign(this.form).then(res => {
this.$confirm('签约成功, 是否返回上一页?', '提示', {
@@ -164,6 +225,15 @@ export default {
});
})
},
+ //文件上传完成
+ handleSuccess(response, file, fileList) {
+ this.form.informeds = []
+ fileList.forEach(e => {
+ this.form.informeds.push({
+ informedFilePath: e.response.imgUrl,
+ })
+ })
+ },
//新增硬件
addhardware() {
this.form.devices.push({
diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue
index b743400..245e7df 100644
--- a/src/views/manage/signRecord/index.vue
+++ b/src/views/manage/signRecord/index.vue
@@ -410,26 +410,11 @@ export default {
this.queryParams.signTimeEnd = null
this.getList();
},
- // 格式化日期格式如：2017-9-19 18:04:33
- formatDate(value) {
- if (!value) {
- return
- }
- // 计算日期相关值
- let time = new Date(value)
- let Y = time.getFullYear();
- let M = time.getMonth() + 1;
- let D = time.getDate();
- let h = time.getHours();
- let m = time.getMinutes();
- let s = time.getSeconds();
- // 如果传递了type的话
- return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
- },
handlenewsign(row) {
this.$router.push({
path: "/patient/newSigning",
query: {
+ departmentId: row.departmentId,
patientName: row.patientName,
patientPhone: row.patientPhone,
visitMethod: row.visitMethod,
@@ -541,6 +526,22 @@ export default {
},
});
},
+ // 格式化日期格式如：2017-9-19 18:04:33
+ formatDate(value) {
+ if (!value) {
+ return
+ }
+ // 计算日期相关值
+ let time = new Date(value)
+ let Y = time.getFullYear();
+ let M = time.getMonth() + 1;
+ let D = time.getDate();
+ let h = time.getHours();
+ let m = time.getMinutes();
+ let s = time.getSeconds();
+ // 如果传递了type的话
+ return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+ },
}
};