From 659b6b31b695284e1d4fd21f5975f8d8dd7b863a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 23 八月 2024 16:39:15 +0800
Subject: [PATCH] 修改印章功能
---
src/components/do/b1-ins-order/add.vue | 9 +++
src/components/view/b1-report-preparation.vue | 111 +++++++++++++++++++++++++++++++-----
src/components/view/a5-laboratory-management.vue | 18 +++++-
src/assets/api/controller.js | 1
4 files changed, 119 insertions(+), 20 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 8f79f84..aa66f54 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -309,6 +309,7 @@
const sealScope = {
selectSeal: "/sealScope/selectSeal", //鏌ヨ鍗扮珷鍒楄〃
addSeal: "/sealScope/addSeal", //娣诲姞鍗扮珷鍙傛暟
+ delectSeal: "/sealScope/delectSeal", //娣诲姞鍗扮珷鍙傛暟
}
const informationNotification = {
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1eaf682..1515195 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1602,6 +1602,15 @@
this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
return
}
+ let noLaboratory = this.totalArr.filter(a => a.state == 1&&!a.sonLaboratory)
+ if(noLaboratory.length>0){
+ let str = ''
+ noLaboratory.forEach((m,j)=>{
+ str += j==noLaboratory.length-1?m.inspectionItem+'-'+m.inspectionItemSubclass:m.inspectionItem+'-'+m.inspectionItemSubclass+','
+ })
+ this.$message.error(str+'娌℃湁鍏宠仈瀹為獙瀹ゅ锛岃鑱旂郴绠＄悊鍛�')
+ return
+ }
if (!this.addObj.type) {
this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
} else if (!this.addObj.formType) {
diff --git a/src/components/view/a5-laboratory-management.vue b/src/components/view/a5-laboratory-management.vue
index b27e669..f2e5101 100644
--- a/src/components/view/a5-laboratory-management.vue
+++ b/src/components/view/a5-laboratory-management.vue
@@ -100,7 +100,7 @@
<div class="btns">
<el-button size="medium" type="primary" @click="openUpload">鏇存柊鍗扮珷</el-button>
</div>
- <ValueTable ref="ValueTable0" :url="$api.sealScope.selectSeal"
+ <ValueTable ref="ValueTable0" :url="$api.sealScope.selectSeal" :delUrl="$api.sealScope.delectSeal"
:componentData="fileComponentData" :key="upIndex" style="height: 400px;" />
</el-dialog>
<el-dialog title="鏇存柊鍗扮珷" :visible.sync="upFileVisible" width="400px">
@@ -215,7 +215,12 @@
isIndex: true,
showSelect: false,
select: false,
- do: [],
+ do: [{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy',
+ }],
tagField: {},
selectField: {
type:{
@@ -356,7 +361,8 @@
let up = false
let del = false
let add = false
- let file = false
+ let file = false
+ let delectSeal = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'upParameter') {
up = true
@@ -370,6 +376,9 @@
if (power[i].menuMethod == 'addSeal') {
file = true
}
+ if (power[i].menuMethod == 'delectSeal') {
+ delectSeal = true
+ }
}
if (!file) {
this.componentData.do.splice(2, 1)
@@ -380,6 +389,9 @@
if (!up) {
this.componentData.do.splice(0, 1)
}
+ if (!delectSeal) {
+ this.fileComponentData.do.splice(0, 1)
+ }
this.addPower = add
}
}
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 4d86d78..a99b5f8 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -57,6 +57,29 @@
.fullscreen {
height: 82vh
}
+ .img-list{
+ width: 100%;
+ display: flex;
+ }
+ .list{
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ }
+ .list-item{
+ width: 120px;
+ height: 120px;
+ margin: 4px;
+ cursor: pointer;
+ box-sizing: border-box;
+ border: 1px solid #fff;
+ }
+ .list-item:hover{
+ border: 1px solid #3A7BFA;
+ }
+ .list-item.active{
+ border: 1px solid #3A7BFA;
+ }
</style>
<template>
@@ -157,6 +180,21 @@
<span slot="footer" class="dialog-footer">
<el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
<el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鍗扮珷閫夋嫨" :visible.sync="imgVisible" width="50vw" :modal-append-to-body="false"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false">
+ <div class="img-list">
+ <label style="width: 120px;">鍗扮珷閫夋嫨锛�</label>
+ <div class="list" style="flex: 1;">
+ <div class="list-item" :class="{active:currentImg==m.id}" v-for="m in imgList" @click="currentImg = m.id">
+ <img :src="javaApi+'/img/'+m.address" alt="" style="width: 118px;height: 118px;">
+ </div>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="subApprove0" :loading="loadingApprove">纭� 璁�</el-button>
</span>
</el-dialog>
<el-dialog title="涓嶆壒鍑嗗師鍥�" :visible.sync="approveReasonVisible" width="400px" :modal-append-to-body="false">
@@ -321,7 +359,10 @@
option:null,
mutiList:[],
outLoading:false,
- inLoading:false
+ inLoading:false,
+ imgList:[],
+ imgVisible:false,
+ currentImg:null
}
},
computed: {
@@ -410,6 +451,30 @@
}else{
this.$message.error(response.message)
}
+ },
+ async selectSeal(row){
+ await this.$axios.post(this.$api.sealScope.selectSeal,{
+ entity: {
+ labId:row.labId,
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
+ },
+ page:{
+ current:-1,
+ size:-1
+ }
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res=>{
+ this.imgList = res.data.body.records.map((m,i)=>{
+ m.id = i + 1
+ return m
+ })
+ })
},
onError(err, file, fileList,type) {
this.$message.error('涓婁紶澶辫触')
@@ -589,22 +654,11 @@
this.approveVisible = true;
},
// 鎵瑰噯閫氳繃
- subApprove() {
- this.loadingApprove = true;
- this.$axios.post(this.$api.insReport.ratifyReport, {
- id: this.currentInfo.id,
- isRatify: 1
- }).then(res => {
- this.loadingApprove = false;
- if (res.code == 201) {
- this.$message.error('鎵瑰噯澶辫触')
- return
- }
- this.$message.success('宸叉壒鍑�')
- this.refreshTable('page')
- this.currentInfo = null;
- this.approveVisible = false;
- })
+ async subApprove() {
+ // this.currentInfo
+ await this.selectSeal(this.currentInfo)
+ this.approveVisible = false;
+ this.imgVisible = true;
},
// 鎻愪氦鎿嶄綔
handleSubmit(row) {
@@ -677,6 +731,29 @@
this.$message.error('鎿嶄綔澶辫触')
this.loadingIssuedReason = false;
})
+ },
+ subApprove0(){
+ if(!(this.currentImg&&this.imgList.find(m=>m.id==this.currentImg))){
+ this.$message.error('璇烽�夋嫨鍗扮珷')
+ return
+ }
+ this.loadingApprove = true;
+ this.$axios.post(this.$api.insReport.ratifyReport, {
+ id: this.currentInfo.id,
+ isRatify: 1,
+ sealUrl:this.imgList.find(m=>m.id==this.currentImg).address
+ }).then(res => {
+ this.loadingApprove = false;
+ if (res.code == 201) {
+ this.$message.error('鎵瑰噯澶辫触')
+ return
+ }
+ this.$message.success('宸叉壒鍑�')
+ this.refreshTable('page')
+ this.currentInfo = null;
+ this.currentImg = null;
+ this.imgVisible = false;
+ })
}
}
}
--
Gitblit v1.9.3