From 4cf74834fe5ac6229035b72312b75958495e60d3 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 19 八月 2025 15:35:08 +0800
Subject: [PATCH] 1
---
src/views/doctor/check/index.vue | 1349 ++++++++++++++++++----------------------------------------
1 files changed, 423 insertions(+), 926 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 0bf9b86..39698cd 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1,77 +1,32 @@
<template>
<div>
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- style="width: 116px"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input v-model="queryParams.name" style="width: 116px" placeholder="璇疯緭鍏ュ鍚�" clearable
+ @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- style="width: 240px"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @blur="hb"
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 240px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @blur="hb" @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item>
- <el-button
- size="mini"
- type="primary"
- @click="submitForm"
- style="margin-right: 15px"
- >鎼滅储</el-button
- >
+ <el-button size="mini" type="primary" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<div style="display: flex">
- <el-radio-group
- v-model="tjStatus"
- @input="radioChange"
- style="margin-left: 30px"
- >
+ <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 30px">
<el-radio-button label="0">鏈</el-radio-button>
<el-radio-button label="1">宸叉</el-radio-button>
</el-radio-group>
</div>
<template>
- <el-table
- :data="tableList"
- v-loading="loading"
- ref="table"
- height="536px"
- style="margin: 20px; width: 98%"
- border
- :cell-class-name="myclass"
- >
+ <el-table :data="tableList" v-loading="loading" ref="table" height="536px" style="margin: 20px; width: 98%" border
+ :cell-class-name="myclass">
<!-- <template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template> -->
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- width="90px"
- />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="90px" />
<el-table-column label="鎬у埆" align="center" prop="cusSex" width="60px">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
@@ -80,119 +35,52 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</el-table-column>
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="cusBrithday"
- width="100px"
- />
- <el-table-column
- label="鐢佃瘽"
- align="center"
- prop="cusPhone"
- width="100px"
- />
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjTime"
- width="160px"
- >
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" />
+ <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" />
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="160px">
</el-table-column>
- <el-table-column
- label="浣撴鏃堕棿"
- align="center"
- prop="tjTime"
- width="100px"
- >
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" width="100px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.tjTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鏈椤�"
- prop="notCheckeds"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鏈椤�" prop="notCheckeds" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔" align="center" width="130px">
<template slot-scope="scope">
- <el-button
- type="primary"
- icon="el-icon-first-aid-kit"
- size="mini"
- @click="Changeapplyfor(scope.row)"
- title="浼氳瘖鐢宠"
- v-if="tjStatus == '1'"
- ></el-button>
- <el-button
- type="primary"
- icon="el-icon-share"
- size="mini"
- @click="handleClick(scope.row)"
- title="璇︽儏"
- ></el-button>
+ <el-button type="primary" icon="el-icon-first-aid-kit" size="mini" @click="Changeapplyfor(scope.row)"
+ title="浼氳瘖鐢宠" v-if="tjStatus == '1'"></el-button>
+ <el-button type="primary" icon="el-icon-share" size="mini" @click="handleClick(scope.row)"
+ title="璇︽儏"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pag">
<div class="pag1">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
</div>
</div>
</template>
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row>
<el-col :span="9" v-if="hzlogList.length >= 1">
<h3>浼氳瘖鐢宠璁板綍</h3>
<el-table :data="hzlogList" style="width: 100%" border>
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
<el-table-column label="绉戝" align="center" prop="hzDeptName" />
<el-table-column label="鎿嶄綔" align="center" width="150px">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click="hadleedit(scope.row)"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- >淇敼</el-button
- >
- <el-button
- type="primary"
- size="mini"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- @click="handledele(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" size="mini" @click="hadleedit(scope.row)" v-if="
+ scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ ">淇敼</el-button>
+ <el-button type="primary" size="mini" v-if="
+ scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ " @click="handledele(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -201,18 +89,10 @@
<h3 style="text-align: center">浼氳瘖璁板綍鐢宠</h3>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- disabled
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" disabled />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- v-model="form.tjNumber"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- disabled
- />
+ <el-input v-model="form.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" disabled />
</el-form-item>
<el-form-item label="浼氳瘖绉戝" prop="hzType">
<el-radio-group v-model="form.hzType">
@@ -220,42 +100,15 @@
<el-radio-button label="1">绉戝浼氳瘖</el-radio-button>
</el-radio-group>
</el-form-item>
- <el-form-item
- label="閫夋嫨绉戝"
- v-if="form.hzType == '1'"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDeptId"
- multiple
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in deptList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- ></el-option>
+ <el-form-item label="閫夋嫨绉戝" v-if="form.hzType == '1'" style="margin-top: 22px">
+ <el-select v-model="form.hzDeptId" multiple filterable style="width: 100%">
+ <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
+ :value="item.deptId"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鐢宠浜�"
- prop="hzDoctorId"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDoctorId"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ <el-form-item label="鐢宠浜�" prop="hzDoctorId" style="margin-top: 22px">
+ <el-select v-model="form.hzDoctorId" placeholder="璇烽�夋嫨" style="width: 100%" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
@@ -272,56 +125,27 @@
</div>
</el-dialog>
- <el-dialog
- :title="title"
- :visible.sync="foropen"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="foropen" width="1000px" append-to-body>
<el-row>
<el-col :span="8" v-if="hasdeptList.length >= 1">
<h3 style="text-align: center">浼氳瘖鐢宠璁板綍</h3>
- <el-table
- :data="hasdeptList"
- style="width: 100%"
- border
- ref="tab"
- @selection-change="handleSelectionChange"
- >
+ <el-table :data="hasdeptList" style="width: 100%" border ref="tab" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
- <el-table-column
- label="绉戝"
- align="center"
- prop="hzDeptName"
- width="260px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
+ <el-table-column label="绉戝" align="center" prop="hzDeptName" width="260px" />
</el-table>
</el-col>
<el-col :span="16" style="padding: 0 10px">
<h3 style="text-align: center">浼氳瘖鎰忚</h3>
<div v-if="hzReplyLogsList.length >= 1" style="margin-bottom: 10px">
- <div
- v-for="(item, index) in hzReplyLogsList"
- :key="index"
- style="padding-bottom: 5px; border-bottom: 1px solid black"
- >
+ <div v-for="(item, index) in hzReplyLogsList" :key="index"
+ style="padding-bottom: 5px; border-bottom: 1px solid black">
<!-- <div>浼氳瘖绉戝锛歿{ item.replyDeptName }}</div> -->
<div>鍖荤敓锛歿{ item.hzDoctorName }}</div>
<div>鍥炲锛歿{ item.replyContent }}</div>
</div>
</div>
- <el-input
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="textarea"
- >
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea">
</el-input>
<div style="padding: 10px 10px">
<el-button type="primary" @click="submitFormreply">鍥炲</el-button>
@@ -330,12 +154,7 @@
</el-row>
</el-dialog>
- <el-dialog
- title="濉啓鏄惁閲嶅ぇ闃虫��"
- :visible.sync="checkval"
- width="800px"
- append-to-body
- >
+ <el-dialog title="濉啓鏄惁閲嶅ぇ闃虫��" :visible.sync="checkval" width="800px" append-to-body>
<el-form ref="form" :model="formIn" label-width="100px">
<el-form-item label="濮撳悕">
<el-input v-model="formIn.cusName" disabled></el-input>
@@ -356,18 +175,8 @@
</el-radio-group>
</el-form-item>
<el-form-item label="绛夌骇">
- <el-select
- v-model="formIn.level"
- placeholder="璇烽�夋嫨"
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in dict.type.lj_positive"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="formIn.level" placeholder="璇烽�夋嫨" filterable style="width: 100%">
+ <el-option v-for="item in dict.type.lj_positive" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -381,38 +190,18 @@
</div>
</el-dialog>
- <el-dialog
- title="PDF 棰勮"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- >
+ <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
- <el-drawer
- :visible.sync="drawer"
- :with-header="false"
- size="70%"
- :before-close="handleClose"
- >
- <div
- v-loading="isLoading"
- element-loading-text="姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶅��..."
- element-loading-spinner="el-icon-loading"
- element-loading-background="rgba(255, 255, 255, 0.8)"
- style="height: 100%; padding: 20px; position: relative"
- >
+ <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
+ <div v-loading="isLoading" element-loading-text="姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶅��..." element-loading-spinner="el-icon-loading"
+ element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative">
<div style="font-size: 14px">
- <table
- style="
+ <table style="
width: 96%;
height: 70px;
margin: 10px 10px;
@@ -420,19 +209,14 @@
border: 1px solid #dfe6ec;
border-collapse: collapse;
font-size: 16px;
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<caption style="background-color: #f8f8f9; font-size: 18px">
濉啓{{
tableAll.cusName
}}鐨勪綋妫�璧勬枡
</caption>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
濮撳悕锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -444,10 +228,7 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
鎬у埆锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -455,25 +236,19 @@
tableAll.cusSex == 0
? "鐢�"
: tableAll.cusSex == 1
- ? "濂�"
- : "鏈煡"
+ ? "濂�"
+ : "鏈煡"
}}
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鍗曞彿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
{{ tableAll.tjNumber }}
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鏃堕棿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -484,158 +259,74 @@
</div>
<div style="display: flex">
<div style="margin: 10px 10px" v-if="hasdeptList.length >= 1">
- <el-button type="primary" size="mini" @click="Changeapply()"
- >浼氳瘖鐢宠</el-button
- >
+ <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="historicalreport()"
- >鍘嗗彶鎶ュ憡</el-button
- >
+ <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="jianqian"
- >妫�鍓嶉棶璇�</el-button
- >
+ <el-button type="primary" size="mini" @click="jianqian">妫�鍓嶉棶璇�</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="result"
- >妫�鏌ユ楠岀粨鏋�</el-button
- >
+ <el-button type="primary" size="mini" @click="result">妫�鏌ユ楠岀粨鏋�</el-button>
</div>
</div>
<el-row>
<el-col v-show="baogaoqian">
<template>
- <el-tabs
- v-model="radio"
- type="border-card"
- @tab-click="handleTabClick"
- style="margin-left: 10px"
- >
- <el-tab-pane
- :label="item.proName"
- :name="item.proId"
- v-for="(item, index) in Parent"
- :key="index"
- :lazy="false"
- >
- <el-table
- class="bgc"
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- :row-class-name="tableRowClassName"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="150"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
+ :lazy="false">
+ <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
</el-table-column>
- <el-table-column
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="150"
- >
+ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
<template slot-scope="{ row, $index }">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="row.proResult"
- :ref="`input-item${index}-row${$index}`"
- @keydown.enter.native="
+ <el-input type="textarea" autosize size="mini" v-model="row.proResult"
+ :ref="`input-item${index}-row${$index}`" @keydown.enter.native="
keyInputConfirm($event, index, $index)
- "
- @focus="handleFocus(row)"
- @blur="handleInputConfirm(row)"
- @input="vale($event, row)"
- :disabled="row.project.proName === 'BMI'"
- ></el-input>
+ " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)"
+ :disabled="row.project.proName === 'BMI'"></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="寮傚父"
- width="55px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
<template slot-scope="scope">
- <el-checkbox
- v-model="scope.row.exceptionDesc"
- @change="changDesc(scope.row)"
- :disabled="
- scope.row.project.sfcyyc === 1 ||
- scope.row.project.proName === 'BMI'
- "
- ></el-checkbox>
+ <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)" :disabled="scope.row.project.sfcyyc === 1 ||
+ scope.row.project.proName === 'BMI'
+ "></el-checkbox>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="70">
<template slot-scope="scope">
- <el-button
- class="blue-button"
- @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="project.proMetering"
- label="鍗曚綅"
- width="55"
- >
+ <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
</el-table-column>
<el-table-column label="鍙傝�冭寖鍥�" width="70" align="center">
<template slot-scope="scope">
{{ scope.row.project.proScope }}
</template>
</el-table-column>
- <el-table-column
- prop="conclusion"
- label="缁撴灉缁撹"
- width="200"
- >
+ <el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
<template slot-scope="scope">
- <el-input
- size="mini"
- type="textarea"
- autosize
- v-model="scope.row.conclusion"
- autocomplete="off"
- placeholder="璇疯緭鍏ョ粨鏋滅粨璁�"
- disabled
- ></el-input>
+ <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
+ placeholder="璇疯緭鍏ョ粨鏋滅粨璁�" disabled></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="澶嶈瘖"
- width="60px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="澶嶈瘖" width="60px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isPositive"
- label="閲嶅ぇ闃虫��"
- width="55"
- >
+ <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column prop="proAdvice" label="缁撴灉寤鸿">
@@ -645,146 +336,84 @@
{{ scope.row.proAdvice }}
</div>
<div slot="reference" class="jianyi">
- <el-input
- type="textarea"
- autosize
- v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
- :disabled="true"
- ></el-input>
+ <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ :disabled="true"></el-input>
</div>
</el-popover>
</template>
</el-table-column>
</el-table>
- <div
- style="font-size: 14px; overflow-y: auto; height: 286px"
- class="a"
- >
- <table
- style="
+ <div style="font-size: 14px; overflow-y: auto; height: 286px" class="a">
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
- <tr
- style="
+ " cellspacing="4">
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
鐥呯閫夋嫨锛�
</td>
- <td
- @click="bzxz"
- style="
+ <td @click="bzxz" style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-input
- type="textarea"
- placeholder="璇烽�夋嫨鍐呭"
- v-model="titles"
- rows="2"
- >
+ ">
+ <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
</el-input>
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
涓绘鍖诲笀锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ ">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+ :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
寤鸿锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- colspan="2"
- >
+ " colspan="2">
<div style="margin: 0 0px 10px 15px">
- <el-button
- type="primary"
- @click="propoChange"
- style="margin-top: 10px; height: 37px"
- >蹇嵎寤鸿</el-button
- >
- <el-button
- type="primary"
- @click="proposalChange"
- style="margin-top: 10px; height: 37px"
- >鐢熸垚寤鸿</el-button
- >
+ <el-button type="primary" @click="propoChange"
+ style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
+ <el-button type="primary" @click="proposalChange"
+ style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
</div>
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footers1">
- <el-button
- :disabled="minedis"
- type="primary"
- @click="determine"
- >鎻� 浜�</el-button
- >
+ <el-button :disabled="minedis" type="primary" @click="determine">鎻� 浜�</el-button>
</div>
</div>
</el-tab-pane>
@@ -793,114 +422,48 @@
</el-col>
<el-col :span="18" v-show="baogaohou">
<template>
- <el-tabs
- v-model="radio"
- type="border-card"
- @tab-click="handleTabClick"
- style="margin-left: 10px"
- >
- <el-tab-pane
- :label="item.proName"
- :name="item.proId"
- v-for="(item, index) in Parent"
- :key="index"
- :lazy="false"
- >
- <el-table
- class="bgc"
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- :row-class-name="tableRowClassName"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="100"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index"
+ :lazy="false">
+ <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="100">
</el-table-column>
- <el-table-column
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="150"
- >
+ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
<template slot-scope="{ row, $index }">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="row.proResult"
- :ref="`input-item${index}-row${$index}`"
- @keydown.enter.native="
+ <el-input type="textarea" autosize size="mini" v-model="row.proResult"
+ :ref="`input-item${index}-row${$index}`" @keydown.enter.native="
keyInputConfirm($event, index, $index)
- "
- @focus="handleFocus(row)"
- @blur="handleInputConfirm(row)"
- @input="vale($event, row)"
- :disabled="row.project.proName === 'BMI'"
- ></el-input>
+ " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)"
+ :disabled="row.project.proName === 'BMI'"></el-input>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="70">
<template slot-scope="scope">
- <el-button
- class="blue-button"
- @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="project.proMetering"
- label="鍗曚綅"
- width="55"
- >
+ <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
</el-table-column>
- <el-table-column
- prop="project.proScope"
- label="鍙傝�冭寖鍥�"
- width="80"
- >
+ <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�" width="80">
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="寮傚父"
- width="55px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
<template slot-scope="scope">
- <el-checkbox
- v-model="scope.row.exceptionDesc"
- :disabled="scope.row.project.sfcyyc === 1"
- ></el-checkbox>
+ <el-checkbox v-model="scope.row.exceptionDesc"
+ :disabled="scope.row.project.sfcyyc === 1"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="澶嶈瘖"
- width="55px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="澶嶈瘖" width="55px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isPositive"
- label="閲嶅ぇ闃虫��"
- width="55"
- >
+ <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
<el-table-column prop="proAdvice" label="缁撴灉寤鸿">
@@ -910,13 +473,8 @@
{{ scope.row.proAdvice }}
</div>
<div slot="reference" class="jianyi">
- <el-input
- type="textarea"
- autosize
- v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
- :disabled="true"
- ></el-input>
+ <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ :disabled="true"></el-input>
</div>
</el-popover>
</template>
@@ -924,41 +482,27 @@
</el-table>
<div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table
- style="
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
- <tr
- style="
+ " cellspacing="4">
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
鐥呯閫夋嫨锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-input
- type="textarea"
- placeholder="璇烽�夋嫨鍐呭"
- v-model="titles"
- rows="2"
- >
+ ">
+ <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
</el-input>
<!-- <el-select
v-model="value"
@@ -978,91 +522,52 @@
</el-option>
</el-select> -->
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
涓绘鍖诲笀锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ ">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+ :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
<div style="margin: 0 0px 10px 15px">
- <el-button
- type="primary"
- @click="propoChange"
- style="margin-top: 10px; height: 37px"
- >蹇嵎寤鸿</el-button
- >
- <el-button
- type="primary"
- @click="proposalChange"
- style="margin-top: 10px; height: 37px"
- >鐢熸垚寤鸿</el-button
- >
+ <el-button type="primary" @click="propoChange"
+ style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
+ <el-button type="primary" @click="proposalChange"
+ style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
</div>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
寤鸿锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- colspan="2"
- >
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ " colspan="2">
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footers">
- <el-button
- :disabled="minedis"
- type="primary"
- @click="determine"
- >鎻� 浜�</el-button
- >
+ <el-button :disabled="minedis" type="primary" @click="determine">鎻� 浜�</el-button>
</div>
</div>
</el-tab-pane>
@@ -1070,26 +575,15 @@
</template>
</el-col>
<el-col :span="6" style="margin-top: 15px">
- <Historicalreport
- v-show="lishi"
- :reportHistorydata="reportHistorydata"
- ></Historicalreport>
+ <Historicalreport v-show="lishi" :reportHistorydata="reportHistorydata"></Historicalreport>
</el-col>
</el-row>
</div>
</el-drawer>
<Public ref="aaa" :row="row" @add="handleChanges" />
<jianceResult ref="bbb" @add="handleChangesZt" />
- <el-dialog
- title="鎻愮ず"
- :visible.sync="jianqians"
- width="1000px"
- :before-close="handleClose1"
- >
- <jianqianwenzhen
- :jianqianwenzhendata="jianqianwenzhendata"
- v-if="flags"
- ></jianqianwenzhen>
+ <el-dialog title="鎻愮ず" :visible.sync="jianqians" width="1000px" :before-close="handleClose1">
+ <jianqianwenzhen :jianqianwenzhendata="jianqianwenzhendata" v-if="flags"></jianqianwenzhen>
<span slot="footer" class="dialog-footer">
<el-button @click="jianqians = false">鍙� 娑�</el-button>
</span>
@@ -1099,49 +593,19 @@
<!-- 妫�鏌ユ楠岀粨鏋滄寜閽殑寮规 -->
<el-dialog title="妫�鏌ユ楠岀粨鏋�" :visible.sync="openOne" width="80%">
- <div
- style="
+ <div style="
width: 100%;
margin-left: 10px;
display: flex;
justify-content: space-around;
- "
- >
+ ">
<div style="width: 44%">
- <el-table
- v-loading="loading"
- border
- :data="xiangmuList"
- height="520"
- ref="tab1"
- highlight-current-row
- >
- <el-table-column
- label="绉戝"
- align="center"
- prop="deptName"
- width="100"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="椤圭洰"
- align="center"
- prop="proName"
- width="150"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="type"
- :show-overflow-tooltip="true"
- width="100"
- >
+ <el-table v-loading="loading" border :data="xiangmuList" height="520" ref="tab1" highlight-current-row>
+ <el-table-column label="绉戝" align="center" prop="deptName" width="100" :show-overflow-tooltip="true" />
+ <el-table-column label="椤圭洰" align="center" prop="proName" width="150" :show-overflow-tooltip="true" />
+ <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
- <span
- v-if="scope.row.type == '0'"
- :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }"
- >
+ <span v-if="scope.row.type == '0'" :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }">
{{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }}
</span>
<span v-if="scope.row.type == '1'">宸插畬鎴�</span>
@@ -1150,12 +614,7 @@
</template>
</el-table-column>
- <el-table-column
- label="妫�鏌ユ椂闂�"
- align="center"
- prop="bcupdateTime"
- width="160"
- />
+ <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" width="160" />
<el-table-column label="鎿嶄綔" align="center" width="120px">
<template slot-scope="scope">
@@ -1167,13 +626,8 @@
>{{ scope.row.type === 0 ? "寮冩" : "鎭㈠" }}</el-button
> -->
- <el-button
- size="mini"
- type="text"
- :disabled="scope.row.type === 0 || scope.row.type === 2"
- @click="queryResultone(scope.row)"
- >缁撴灉鏌ヨ</el-button
- >
+ <el-button size="mini" type="text" :disabled="scope.row.type === 0 || scope.row.type === 2"
+ @click="queryResultone(scope.row)">缁撴灉鏌ヨ</el-button>
</template>
</el-table-column>
</el-table>
@@ -1184,15 +638,8 @@
</div>
<div class="a">
<div v-if="jyjc == 0">
- <el-table
- :data="jieguoList"
- border
- :row-style="changRed"
- height="520"
- highlight-current-row
- style="width: 100%"
- :header-cell-style="{ background: '#AAD8DF' }"
- >
+ <el-table :data="jieguoList" border :row-style="changRed" height="520" highlight-current-row
+ style="width: 100%" :header-cell-style="{ background: '#AAD8DF' }">
<el-table-column label="妫�娴嬮」鐩�" prop="pro_name">
</el-table-column>
<el-table-column label="妫�娴嬬粨鏋�" prop="pro_result">
@@ -1207,20 +654,14 @@
<div class="check-result-container">
<div class="check-item">
<div class="check-title">妫�鏌ユ墍瑙侊細</div>
- <div
- class="check-description"
- :style="{ color: isRed ? 'red' : '' }"
- >
+ <div class="check-description" :style="{ color: isRed ? 'red' : '' }">
{{ jieguoList[0].pro_result }}
</div>
</div>
<div class="check-item">
<div class="check-title">妫�鏌ョ粨璁猴細</div>
- <div
- class="check-description"
- :style="{ color: isRed ? 'red' : '' }"
- >
+ <div class="check-description" :style="{ color: isRed ? 'red' : '' }">
{{ jieguoList[0].yxzd || "鏆傛棤缁撹" }}
</div>
</div>
@@ -1231,78 +672,32 @@
</div>
</el-dialog>
- <el-dialog
- title="閫夋嫨鐥呯"
- :visible.sync="taocan"
- width="80%"
- height="700px"
- :close-on-click-modal="false"
- >
- <el-tabs
- type="border-card"
- style="min-height: 538px; margin: 0 10px; width: 100%"
- @tab-click="handleClick"
- v-model="activeNames"
- >
+ <el-dialog title="閫夋嫨鐥呯" :visible.sync="taocan" width="80%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="min-height: 538px; margin: 0 10px; width: 100%" @tab-click="handleClick"
+ v-model="activeNames">
<el-tab-pane label="鐥呯" name="first">
<div class="tab8">
<div class="tab3">
- <el-form
- @submit.native.prevent
- :model="queryParam1"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form @submit.native.prevent :model="queryParam1" ref="tableList" :inline="true" label-width="76px"
+ style="margin-top: 10px">
<el-form-item>
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="queryParam1.nr"
- clearable
- >
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="queryParam1.nr" clearable>
</el-input>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuerys"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">鎼滅储</el-button>
</el-form-item>
</el-form>
- <el-table
- ref="multipleTable"
- border
- :data="deptAdviceList"
- height="430px"
- @selection-change="handleSelectionChanges"
- >
+ <el-table ref="multipleTable" border :data="deptAdviceList" height="430px"
+ @selection-change="handleSelectionChanges">
<el-table-column type="selection" width="40"> </el-table-column>
- <el-table-column
- prop="title"
- label="鐥呯鍚嶇О"
- align="center"
- width="130px"
- ></el-table-column>
- <el-table-column
- prop="advice"
- label="寤鸿"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column prop="title" label="鐥呯鍚嶇О" align="center" width="130px"></el-table-column>
+ <el-table-column prop="advice" label="寤鸿" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
- <pagination
- v-show="total1 > 0"
- :total="total1"
- :page.sync="queryParam1.page"
- :limit.sync="queryParam1.pageSize"
- @pagination="getbzlist"
- />
+ <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParam1.page"
+ :limit.sync="queryParam1.pageSize" @pagination="getbzlist" />
</div>
<div class="tab4">
<div class="tab4_txt">
@@ -1312,21 +707,11 @@
<el-table border :data="deptAdviceList1" height="430px">
<el-table-column prop="title" label="鐥呯鍚嶇О" align="center">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -1648,8 +1033,6 @@
this.focusrow = row;
this.proResult = row;
const pattern3 = new RegExp("[0-9]+");
- if (row.proResult) {
- }
if (pattern3.test(row.proResult)) {
let data = {
proId: this.focusrow.proId,
@@ -1687,6 +1070,18 @@
});
}
});
+ } else {
+ if (this.focusrow.proResult != this.focusrow.project.proDefault) {
+ const substrings = ["姝ｅ父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+ let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
+ if (containsAllSubstrings) {
+ this.focusrow.exceptionDesc = false;
+ } else {
+ this.focusrow.exceptionDesc = true;
+ }
+ } else {
+ this.focusrow.exceptionDesc = false;
+ }
}
},
@@ -1716,6 +1111,7 @@
// 鐜版湁鐨勮鍒欐鏌ラ�昏緫淇濇寔涓嶅彉
this.focusrow = row;
this.proResult = row;
+
const pattern3 = new RegExp("[0-9]+");
if (pattern3.test(row.proResult)) {
let data = {
@@ -1754,6 +1150,19 @@
});
}
});
+ } else {
+ if (this.focusrow.proResult != this.focusrow.project.proDefault) {
+ const substrings = ["姝ｅ父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"];
+ let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub));
+ if (containsAllSubstrings) {
+ this.focusrow.exceptionDesc = false;
+ } else {
+ this.focusrow.exceptionDesc = true;
+ }
+ } else {
+ this.focusrow.exceptionDesc = false;
+ }
+
}
this.rows.push(row);
},
@@ -1764,7 +1173,6 @@
tjNumber: this.tjNumber,
proParentId: this.nums,
};
- console.log(data, 8888);
getParentId(data).then((response) => {
if (response.data != {}) {
@@ -1792,7 +1200,6 @@
this.loading = false;
this.value = [];
- console.log(this.proParentList.xiaoJieIds, 2222333);
if (this.proParentList.xiaoJieIds != null) {
if (this.proParentList.xiaoJieIds.length != 0) {
@@ -1857,6 +1264,7 @@
handleChangesZt(params) {
this.curindex.proResult = params.map((item) => item.ruleStr).join(",");
+
this.handleInputConfirm(this.curindex, params);
},
@@ -1912,46 +1320,46 @@
var deptAdviceList1 = []
// let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
// getAdviceByTjNumAndPro(data).then((res) => {
- // if (res.data) {
- // this.deptAdviceList3 = res.data;
- if (this.proParentList.xiaoJieIds.length != 0) {
- if (this.vaids.length != 0) {
- const result = this.vaids.reduce((acc, item) => {
- const matches = this.deptAdviceList.filter(items => {
- return item == items.id; // 鎴� === 鏍规嵁闇�姹�
- });
- return acc.concat(matches);
- }, []);
- deptAdviceList1 = result;
+ // if (res.data) {
+ // this.deptAdviceList3 = res.data;
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ if (this.vaids.length != 0) {
+ const result = this.vaids.reduce((acc, item) => {
+ const matches = this.deptAdviceList.filter(items => {
+ return item == items.id; // 鎴� === 鏍规嵁闇�姹�
+ });
+ return acc.concat(matches);
+ }, []);
+ deptAdviceList1 = result;
- return this.deptAdviceList1 = [
- ...new Set(deptAdviceList1),
- ];
- } else {
- this.proParentList.xiaoJieIds.forEach(item => {
- this.deptAdviceList.forEach((items) => {
- if (item == items.id) {
- deptAdviceList1.push(items)
- }
- });
- })
- return this.deptAdviceList1 = [
- ...new Set(deptAdviceList1),
- ];
- }
+ return this.deptAdviceList1 = [
+ ...new Set(deptAdviceList1),
+ ];
+ } else {
+ this.proParentList.xiaoJieIds.forEach(item => {
+ this.deptAdviceList.forEach((items) => {
+ if (item == items.id) {
+ deptAdviceList1.push(items)
+ }
+ });
+ })
+ return this.deptAdviceList1 = [
+ ...new Set(deptAdviceList1),
+ ];
+ }
- } else if (this.proParentList.xiaoJieIds == null) {
- this.deptAdviceList1 = []
- }
+ } else if (this.proParentList.xiaoJieIds == null) {
+ this.deptAdviceList1 = []
+ }
- // this.deptAdviceList1 = [
- // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
- // ];
- // this.deptAdviceList3.forEach((items) => {
- // this.idss.push(items.id);
- // this.remakes += items.advice + ",";
- // });
+ // this.deptAdviceList1 = [
+ // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+ // ];
+ // this.deptAdviceList3.forEach((items) => {
+ // this.idss.push(items.id);
+ // this.remakes += items.advice + ",";
+ // });
// }
// });
},
@@ -2019,9 +1427,9 @@
// selection.forEach((item) => this.deptAdviceList1.push(item));
// }
},
- quxiao(){
- this.taocan = false;
- this.deptAdviceList1 = []
+ quxiao() {
+ this.taocan = false;
+ this.deptAdviceList1 = []
},
queding() {
if (this.proParentList.xiaoJie.length != 0) {
@@ -2061,7 +1469,7 @@
this.proParentList.remark = this.remakes;
}
this.taocan = false;
-
+
}
},
@@ -2102,7 +1510,6 @@
},
sel(val) {
- console.log(val, 1212);
if (this.proParentList.xiaoJie.length != 0) {
this.deptAdviceList.forEach((item) => {
@@ -2202,7 +1609,7 @@
});
},
- hb() {},
+ hb() { },
propoChange() {
this.cusobj = { sex: this.tableAll.cusSex, isZj: 1 };
@@ -2608,36 +2015,86 @@
// rulesList: item.rulesList,
// });
});
- for (var i = 0; i < this.proParentList.sons.length; i++) {
- //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
- if (
- this.proParentList.sons[i].proResult == "" ||
- this.proParentList.sons[i].proResult == null
- ) {
- this.radio = this.lastClickedTab.name;
- this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
- this.minedis = true;
- return;
- } else if (this.proParentList.sons[i].proResult.includes(" ")) {
- this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸");
- this.radio = this.lastClickedTab.name;
- this.minedis = true;
- return;
- } else {
+ // for (var i = 0; i < this.proParentList.sons.length; i++) {
+ // //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
+ // if (
+ // this.proParentList.sons[i].project.proDefault != null || this.proParentList.sons[i].project.proDefault != ""
+ // ) {
+ // console.log(1111, this.proParentList.sons[i].project.proDefault)
+
+ // if (this.proParentList.sons[i].proResult == "" ||
+ // this.proParentList.sons[i].proResult == null) {
+ // this.radio = this.lastClickedTab.name;
+ // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
+ // this.minedis = true;
+ // return;
+ // } else if (this.proParentList.sons[i].proResult.includes(" ")) {
+ // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸");
+ // this.radio = this.lastClickedTab.name;
+ // this.minedis = true;
+ // return;
+ // }
+ // } else if (
+ // this.proParentList.sons[i].project.proDefault == null || this.proParentList.sons[i].project.proDefault == ""
+ // ) {
+ // console.log(2222, this.tjOrderDetail)
+ // this.minedis = false;
+ // this.tjOrderDetail.push({
+ // proAdvice: this.proParentList.sons[i].proAdvice,
+ // proName: this.proParentList.sons[i].project.proName,
+ // proId: this.proParentList.sons[i].project.proId,
+ // orderDetailId: this.proParentList.sons[i].orderDetailId,
+ // flowingWaterId: this.proParentList.sons[i].flowingWaterId,
+ // proResult: this.proParentList.sons[i].proResult,
+ // tjStatus: 1,
+ // isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
+ // exceptionDesc:
+ // this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
+ // conclusion: this.proParentList.sons[i].conclusion,
+ // rulesList: this.proParentList.sons[i].rulesList,
+ // });
+ // }
+ // }
+ // 浼樺寲鍚庣殑琛ㄥ崟楠岃瘉閫昏緫
+ for (const item of this.proParentList.sons) {
+ const { project, proResult } = item;
+
+ // 蹇呭～椤归獙璇�
+ if (project.proDefault) {
+ console.log('蹇呭～椤规鏌�:', project.proDefault);
+
+ if (!proResult || proResult.trim() === '') {
+ this.radio = this.lastClickedTab.name;
+ this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
+ this.minedis = true;
+ return;
+ }
+
+ if (proResult.includes(' ')) {
+ this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸");
+ this.radio = this.lastClickedTab.name;
+ this.minedis = true;
+ return;
+ }
+ }
+
+ // 闈炲繀濉」鏁版嵁澶勭悊
+ if (!project.proDefault) {
+ console.log('闈炲繀濉」澶勭悊:', this.tjOrderDetail);
this.minedis = false;
+
this.tjOrderDetail.push({
- proAdvice: this.proParentList.sons[i].proAdvice,
- proName: this.proParentList.sons[i].project.proName,
- proId: this.proParentList.sons[i].project.proId,
- orderDetailId: this.proParentList.sons[i].orderDetailId,
- flowingWaterId: this.proParentList.sons[i].flowingWaterId,
- proResult: this.proParentList.sons[i].proResult,
+ proAdvice: item.proAdvice,
+ proName: project.proName,
+ proId: project.proId,
+ orderDetailId: item.orderDetailId,
+ flowingWaterId: item.flowingWaterId,
+ proResult: proResult,
tjStatus: 1,
- isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
- exceptionDesc:
- this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
- conclusion: this.proParentList.sons[i].conclusion,
- rulesList: this.proParentList.sons[i].rulesList,
+ isReturn: item.isReturn ? 1 : 0,
+ exceptionDesc: item.exceptionDesc ? 1 : 0,
+ conclusion: item.conclusion,
+ rulesList: item.rulesList
});
}
}
@@ -2672,6 +2129,7 @@
this.nums = tab.name;
this.proId = tab.name;
this.lastClickedTab = tab;
+ this.minedis = false
this.getParentIdsss();
this.getbzlist();
});
@@ -2690,38 +2148,77 @@
});
}
});
- for (var i = 0; i < this.proParentList.sons.length; i++) {
- //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
- if (
- this.proParentList.sons[i].proResult == "" ||
- this.proParentList.sons[i].proResult == null
- ) {
- this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
- this.minedis = true;
- return;
- } else if (this.proParentList.sons[i].proResult.includes(" ")) {
- this.$modal.msgError("璇锋鏌ュ～鍐欓」鐩腑鏄惁鏈夌┖鏍�");
- this.minedis = true;
- return;
- } else {
+ // for (var i = 0; i < this.proParentList.sons.length; i++) {
+ // //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓�
+ // if (
+ // this.proParentList.sons[i].proResult == "" ||
+ // this.proParentList.sons[i].proResult == null
+ // ) {
+ // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
+ // this.minedis = true;
+ // return;
+ // } else if (this.proParentList.sons[i].proResult.includes(" ")) {
+ // this.$modal.msgError("璇锋鏌ュ～鍐欓」鐩腑鏄惁鏈夌┖鏍�");
+ // this.minedis = true;
+ // return;
+ // } else {
+ // this.minedis = false;
+ // this.tjOrderDetail.push({
+ // proAdvice: this.proParentList.sons[i].proAdvice,
+ // proName: this.proParentList.sons[i].project.proName,
+ // proId: this.proParentList.sons[i].project.proId,
+ // orderDetailId: this.proParentList.sons[i].orderDetailId,
+ // flowingWaterId: this.proParentList.sons[i].flowingWaterId,
+ // proResult: this.proParentList.sons[i].proResult,
+ // tjStatus: 1,
+ // isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
+ // exceptionDesc:
+ // this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
+ // conclusion: this.proParentList.sons[i].conclusion,
+ // rulesList: this.proParentList.sons[i].rulesList,
+ // });
+ // }
+ // }
+ for (const item of this.proParentList.sons) {
+ const { project, proResult } = item;
+
+ // 蹇呭～椤归獙璇�
+ if (project.proDefault) {
+ console.log('蹇呭～椤规鏌�:', project.proDefault);
+
+ if (!proResult || proResult.trim() === '') {
+ this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀～鍐欏畬鎴�");
+ this.minedis = true;
+ return;
+ }
+
+ if (proResult.includes(' ')) {
+ this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸");
+ this.minedis = true;
+ return;
+ }
+ }
+
+ // 闈炲繀濉」鏁版嵁澶勭悊
+ if (!project.proDefault) {
+ console.log('闈炲繀濉」澶勭悊:', this.tjOrderDetail);
this.minedis = false;
this.tjOrderDetail.push({
- proAdvice: this.proParentList.sons[i].proAdvice,
- proName: this.proParentList.sons[i].project.proName,
- proId: this.proParentList.sons[i].project.proId,
- orderDetailId: this.proParentList.sons[i].orderDetailId,
- flowingWaterId: this.proParentList.sons[i].flowingWaterId,
- proResult: this.proParentList.sons[i].proResult,
+ proAdvice: item.proAdvice,
+ proName: project.proName,
+ proId: project.proId,
+ orderDetailId: item.orderDetailId,
+ flowingWaterId: item.flowingWaterId,
+ proResult: proResult,
tjStatus: 1,
- isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0,
- exceptionDesc:
- this.proParentList.sons[i].exceptionDesc === true ? 1 : 0,
- conclusion: this.proParentList.sons[i].conclusion,
- rulesList: this.proParentList.sons[i].rulesList,
+ isReturn: item.isReturn ? 1 : 0,
+ exceptionDesc: item.exceptionDesc ? 1 : 0,
+ conclusion: item.conclusion,
+ rulesList: item.rulesList
});
}
}
-
+
if (this.minedis == false) {
let data = [
{
@@ -2831,7 +2328,7 @@
/* 杞诲井鐨勭孩鑹茶儗鏅� */
}
-::v-deep .bgc .el-table__body tr:hover > td {
+::v-deep .bgc .el-table__body tr:hover>td {
background-color: #ffe6e6 !important;
}
--
Gitblit v1.8.0