diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue index 7411927..52fe75e 100644 --- a/src/views/manage/Auditing/index.vue +++ b/src/views/manage/Auditing/index.vue @@ -263,9 +263,9 @@ export default { portaitCheckRemark: value, portaitCheckStatus: 'DISAGREE', signPatientRecordId: this.$route.query.signRecordId, - labelFieldContentList: [], + labelFieldAndPartitionDictList: [], } - obj.labelFieldContentList = this.portraitlistdata + obj.labelFieldAndPartitionDictList = this.portraitlistdata updatePortaitCheckStatus(obj).then(res => { this.$notify({ type: 'success', @@ -317,9 +317,9 @@ export default { portaitCheckRemark: value, portaitCheckStatus: 'AGREE', signPatientRecordId: this.$route.query.signRecordId, - labelFieldContentList: [], + labelFieldAndPartitionDictList: [], } - obj.labelFieldContentList = this.portraitlistdata + obj.labelFieldAndPartitionDictList = this.portraitlistdata console.log(obj, 'tijiao') // return updatePortaitCheckStatus(obj).then(res => { diff --git a/src/views/manage/Portraitedit/index.vue b/src/views/manage/Portraitedit/index.vue index 5eb9d0f..f883bfa 100644 --- a/src/views/manage/Portraitedit/index.vue +++ b/src/views/manage/Portraitedit/index.vue @@ -32,66 +32,57 @@ taskid == ulitem.taskPartitionDictId ? 'allactive' : 'all' " > - {{ulitem.taskTypeName}}|{{ ulitem.taskPartitionDictName }} + {{ ulitem.taskTypeName + }}|{{ ulitem.taskPartitionDictName }} -
-
-
- - +
+ + +
{{ aitem.taskPartitionDictName }}
+
- - - - - + + + + + + + +
+ + +
+
-
- - - -
@@ -145,20 +136,7 @@ export default { console.log(this.$route.query, 'this.$route.query') this.qurelist.patientId = this.$route.query.patientId this.getAllNodeBy() - // console.log(this.DepartmentoList) - // var querytParams={ - // taskPartitionDictId: this.DepartmentoList[0].taskPartitionDictId, - // patientId: this.$route.query.patientId, - // } - // groupingValue(querytParams).then(res => { - // console.log(res, 'res') - - // this.moban = JSON.parse(JSON.stringify(res)) - // this.getParamslistData = res - // // console.log(this.getParamslistData, '009090') - - // }) }, beforeDestroy() { }, watch: { @@ -195,7 +173,6 @@ export default { } }, bottomclickevent(ulitem) { - console.log(ulitem, '9999') this.taskid = ulitem.taskPartitionDictId // this.querytParams.signPatientManageRouteNodeId = ulitem.taskPartitionDictId this.querytParams.taskPartitionDictId = ulitem.taskPartitionDictId @@ -215,14 +192,15 @@ export default { //保存 TemporaryStorage() { + // console.log(this.getParamslistData,'this.getParamslistData') var emptyItems = [] - var form={ - groupingValues:[] + var form = { + labelFieldAndPartitionDictList: [] } - form.groupingValues=this.getParamslistData + form.labelFieldAndPartitionDictList = this.getParamslistData // emptyItems = form.groupingValues.flat().filter(f => f.fieldValue == "" || !f.fieldValue) - // console.log(form, 'this.form') + console.log(this.form, 'this.form') // console.log(emptyItems, 'emptyItems') // return @@ -230,50 +208,45 @@ export default { // this.$modal.msgError("请填写完整,再进行提交"); // } else { - this.$confirm('是否确认提交?', '提示', { - confirmButtonText: '确认', - cancelButtonText: '取消', - }).then(() => { - const loading = this.$loading({ - lock: true, - text: '提交中', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + this.$confirm('是否确认提交?', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + }).then(() => { + const loading = this.$loading({ + lock: true, + text: '提交中', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); - insertLabelField(form).then(res => { - if (res.code == 200) { - this.$modal.msgSuccess("提交成功!"); - this.indexdata = null - loading.close(); - } - else { - loading.close(); - } - }).catch(() => { + insertLabelField(form).then(res => { + if (res.code == 200) { + this.$modal.msgSuccess("提交成功!"); + this.indexdata = null loading.close(); - }); - }) + } + else { + loading.close(); + } + }).catch(() => { + loading.close(); + }); + }) // } }, - - additem(index) { - this.moban[0].forEach(e => { + additem(aindex, bindex) { + // console.log(this.form.list,'this.form.list') + const newVal = JSON.parse(JSON.stringify(this.moban[aindex].portraitSnVOList[0])) + newVal.groupingValues.forEach(e => { e.fieldValue = "" - e.portraitSn = '' - // e.id = "" - }) - const newVal = JSON.parse(JSON.stringify(this.moban[0])) - // const newVal = JSON.parse(JSON.stringify(this.getParamslistData[0])) - // newVal.forEach(i => { - // // i.sn = this.getParamslistData.length +1 - // i.sn = this.getParamslistData[this.getParamslistData.length - 1][0].sn + 1 - // }) - this.getParamslistData.push(newVal) + + }); + + this.getParamslistData[aindex].portraitSnVOList.push(newVal) }, - delitem(index, item) { - this.getParamslistData.splice(index, 1) + delitem(aindex, bindex) { + this.getParamslistData[aindex].portraitSnVOList.splice(bindex, 1) }, } }; @@ -302,19 +275,25 @@ export default { .dialog-footer { padding: 2px 44px 0; text-align: right; + position: relative; + bottom: 66px; } .texts { // overflow-y: scroll; overflow-x: hidden; width: 72%; - height: calc(100vh - 30px); + height: calc(100vh - 200px); background-color: #fff; .topform { width: 100%; position: relative; height: calc(100% - 177px); - overflow-y: auto; + // overflow-y: auto; padding: 15px 70px 30px 15px; + .toptitle { + font-weight: 600; + font-size: 18px; + } .box-card { // width:calc(100% - 149px); width: 85%; @@ -355,7 +334,7 @@ export default { .list { margin: 20px auto; width: 100%; - height: calc(100% - 80px); + height: calc(100% - 11px); background-color: #f2f4f5; display: flex; padding-top: 15px; @@ -367,6 +346,7 @@ export default { width: 25%; background-color: #fff; padding: 17px 20px; + height: calc(100% - 56px); // height: 680px; // height: calc(100vh - 294px); overflow-y: scroll; @@ -384,10 +364,9 @@ export default { width: 100%; height: 50px; border-bottom: 1px solid #dcdfe6; - .spanitme{ + .spanitme { padding: 10px; - color: #A8A8A8; - + color: #a8a8a8; } .count { diff --git a/src/views/manage/components/portrait.vue b/src/views/manage/components/portrait.vue index facad34..696ebfd 100644 --- a/src/views/manage/components/portrait.vue +++ b/src/views/manage/components/portrait.vue @@ -1,9 +1,8 @@