From 40475c63a8dc78b31e5104ac03b03934a6a6e9e1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 13 九月 2024 17:00:18 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master
---
src/components/view/b1-report-preparation.vue | 133 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 110 insertions(+), 23 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 64633d0..9b5d017 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>
@@ -64,10 +87,15 @@
<div style="width: 100%;height: 100%;">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;text-align: left;">鎶ュ憡缂栧埗</el-col>
+ <el-col :span="12" style="text-align: left;">
+ <el-radio-group v-model="radio"size="medium" fill="#3A7BFA">
+ <el-radio-button label="0">鎶ュ憡缂栧埗</el-radio-button>
+ <el-radio-button label="1">璁㈠崟</el-radio-button>
+ </el-radio-group>
+ </el-col>
</el-row>
</div>
- <div class="search" style="position: relative;">
+ <div class="search" style="position: relative;" v-if="radio==0">
<div class="search_thing">
<div class="search_label">鎶ュ憡缂栧彿锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
@@ -101,13 +129,13 @@
</el-upload>
</div>
</div>
- <!-- <input id="input" type="file" accept=".doc,.docx"></input> -->
- <div class="table">
+ <div class="table" v-if="radio==0">
<ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport"
:isColumnWidth="true"
:componentData="componentData"
:key="upIndex" />
</div>
+ <Order v-if="radio==1"/>
</div>
<el-dialog title="鍦ㄧ嚎缂栧埗" :visible.sync="claimVisible" width="22cm" :modal-append-to-body="false"
:fullscreen="fullscreen">
@@ -128,7 +156,7 @@
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
</div>
- <div style="height: 80vh;">
+ <div style="height: 80vh;" v-if="issuedVisible">
<onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
</div>
<span slot="footer" class="dialog-footer">
@@ -159,6 +187,21 @@
<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">
<div class="search_thing">
<div class="search_label">涓嶆壒鍑嗗師鍥狅細</div>
@@ -175,13 +218,16 @@
<script>
import ValueTable from '../tool/value-table.vue'
import onlyoffice from '../tool/onlyoffice.vue'
+ import Order from '../do/b1-report-preparation/order.vue'
export default {
components: {
ValueTable,
- onlyoffice
+ onlyoffice,
+ Order
},
data() {
return {
+ radio:0,
componentData: {
entity: {
entrustCode: null,
@@ -321,7 +367,10 @@
option:null,
mutiList:[],
outLoading:false,
- inLoading:false
+ inLoading:false,
+ imgList:[],
+ imgVisible:false,
+ currentImg:null
}
},
computed: {
@@ -406,9 +455,34 @@
this.inLoading = false;
if (response.code == 200) {
this.$message.success('瀵煎叆鎴愬姛')
+ this.refreshTable()
}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('涓婁紶澶辫触')
@@ -420,6 +494,7 @@
refresh() {
this.componentData.entity = this.HaveJson(this.entityCopy)
this.upIndex++
+ this.$refs['ValueTable'].selectList(e)
},
async handleWeave(row) {
let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
@@ -588,22 +663,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) {
@@ -676,6 +740,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