From 7f95ba9ac493c69d7bf913d7b925c087fb3a0490 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 18:04:57 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 23 --
src/views/hosp/history/index.vue | 60 ++++---
src/views/doctor/checkAll/index.vue | 270 +++++++++++++++++++++++++++++++--
src/views/login.vue | 7
vue.config.js | 2
src/components/Historicalreport/index.vue | 108 +++++++++++++
src/api/hosp/history.js | 4
7 files changed, 403 insertions(+), 71 deletions(-)
diff --git a/src/api/hosp/history.js b/src/api/hosp/history.js
index 56b4980..41013dd 100644
--- a/src/api/hosp/history.js
+++ b/src/api/hosp/history.js
@@ -44,9 +44,9 @@
}
//鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅
-export function getInfoById(userId) {
+export function getInfoById(tjNumber) {
return request({
- url: '/hosp/history/getInfoById?userId=' + userId ,
+ url: '/hosp/history/getInfoById?tjNumber=' + tjNumber ,
method: 'get',
})
}
diff --git a/src/components/Historicalreport/index.vue b/src/components/Historicalreport/index.vue
new file mode 100644
index 0000000..ef36f12
--- /dev/null
+++ b/src/components/Historicalreport/index.vue
@@ -0,0 +1,108 @@
+<template>
+ <div>
+ <div>
+ <el-table v-if="fList.length >= 1" v-loading="loading" :data="fList" border style="margin-top: 30px;">
+ <el-table-column prop="createTime" label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="130px">
+ <template slot-scope="scope">
+ <el-button type="primary" icon="el-icon-share" size="mini" @click="viewReport(scope.row)"
+ title="鏌ョ湅"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div v-else>鏆傛棤鍘嗗彶鎶ュ憡</div>
+ </div>
+
+
+ <el-dialog class="dia" title="PDF 棰勮" :visible.sync="dialogVisible" :before-close="handleClose" :modal="false">
+ <div class="main">
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { getPdf } from "@/api/hosp/order";
+export default {
+ name: 'Historicalreport',
+
+ props: {
+ reportHistorydata: {
+ type: Array,
+ }
+
+ },
+ data() {
+ return {
+ loading: true,
+ url: "",
+ fList: [],
+ dialogVisible: false,
+ };
+ },
+ watch: {
+ 'reportHistorydata'(val, newVla) {
+ if (val) {
+ this.loading = false
+ this.fList = val
+ }
+
+ // if (this.fList) {
+ // this.getList()
+ // }
+ }
+ },
+ mounted() {
+
+ },
+
+ created() {
+
+ },
+ methods: {
+ handleClose() {
+
+
+ this.dialogVisible = false;
+ },
+ viewReport(row) {
+ const tjNumber = row.tjNumber;
+ const flag = true;
+ getPdf(tjNumber, flag).then((response) => {
+ if (response.size === 0) {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+ setTimeout(() => {
+ loading.close();
+ }, 3000);
+ this.$message.msgSuccess("鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+
+ } else {
+ this.dialogVisible = true;
+
+ this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ }
+ });
+ },
+ handleOk() {
+ if (this.form.desc) {
+ this.$emit('add', this.form.desc, this.list);
+ }
+ }
+ }
+}
+</script>
+
+<style scoped>
+.main {
+ height: 700px;
+ overflow: hidden;
+}
+</style>
+
\ No newline at end of file
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 191b98f..49aa703 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -372,20 +372,8 @@
</div>
</div>
</el-col>
- <el-col :span="6" v-if="reportHistorydata.length >= 1">
- <el-table v-loading="loading" :data="reportHistorydata" border style="margin-top: 46px;">
- <el-table-column prop="createTime" label="妫�娴嬫椂闂�">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="130px">
- <template slot-scope="scope">
- <el-button type="primary" icon="el-icon-share" size="mini" @click="handlecan(scope.row)"
- title="鏌ョ湅"></el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-col>
- <el-col :span="6" v-else>
- <div>鏆傛棤鍘嗗彶鎶ュ憡</div>
+ <el-col :span="6">
+ <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
</el-col>
</el-row>
@@ -439,6 +427,7 @@
import Public from "@/components/public";
import { getPdf } from "@/api/hosp/order";
import { getInfo } from "@/api/login";
+import Historicalreport from "@/components/Historicalreport";
import {
getProList,
getSons,
@@ -461,7 +450,7 @@
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
name: "check",
- components: { Public },
+ components: { Public ,Historicalreport},
data() {
return {
selected: false,
@@ -752,7 +741,7 @@
// 鎼滅储
submitForm() {
- this.queryParams.pageNum = 1;
+ this.queryParams.page = 1;
this.getList();
// this.loading = true;
// (this.queryParams = {
@@ -1132,7 +1121,7 @@
if (this.proParentList.xiaoJie.length != 0) {
this.Parent.forEach((item3) => {
if (item3.proId === this.nums) {
- this.proParentList.remark = item.remark;
+ this.proParentList.remark = item3.remark;
}
});
} else {
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index d8501c3..e9c4083 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -58,7 +58,11 @@
</template>
</el-table-column>
<el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" />
-
+ <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_tjtype" :value="scope.row.tjCategory" />
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
<template slot-scope="scope">
<el-button fixed="right" title="璇︽儏" type="text" size="mini" @click="handleClick(scope.row)"
@@ -129,7 +133,7 @@
<div style="margin: 10px 10px;">
<el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
</div>
- <div style="margin: 10px 10px;">
+ <div style="margin: 10px 10px;" v-if="tableAll.tjCategory == '02'">
<el-button type="primary" size="mini" @click="medicalhistory()">鑱屼笟鐥呭彶</el-button>
</div>
</div>
@@ -294,24 +298,208 @@
</div>
</div>
</el-col>
- <el-col :span="6" >
- <el-table v-if="reportHistorydata.length >= 1" v-loading="loading" :data="reportHistorydata" border style="margin-top: 30px;">
- <el-table-column prop="createTime" label="妫�娴嬫椂闂�">
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="130px">
- <template slot-scope="scope">
- <el-button type="primary" icon="el-icon-share" size="mini" @click="viewReport(scope.row)"
- title="鏌ョ湅"></el-button>
- </template>
- </el-table-column>
- </el-table>
- <div v-else>鏆傛棤鍘嗗彶鎶ュ憡</div>
+ <el-col :span="6">
+ <div v-if="hosproy">
+ <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
+ </div>
+
+ <div class="hist3" v-if="wenzhen">
+ <span class="txt">闂瘖淇℃伅</span>
+ <el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini">
+ <el-collapse class="coll" v-model="activeName" accordion>
+ <el-collapse-item class="coll" title="鍩烘湰淇℃伅" name="1" style="width: 100%; font-weight: 600">
+ <div style="width: 100%">
+ <el-form-item label="濮撳悕" prop="cusName">
+ <el-input v-model="formobj.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+ </el-form-item>
+ <el-form-item label="鑱屼笟" prop="work">
+ <el-select filterable v-model="formobj.work" placeholder="璇烽�夋嫨鑱屼笟" clearable style="width: 150px">
+ <el-option v-for="dict in dict.type.tj_work" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヤ綔鐘舵��" prop="workStatus">
+ <el-select filterable v-model="formobj.workStatus" placeholder="璇烽�夋嫨宸ヤ綔鐘舵��" clearable
+ style="width: 150px">
+ <el-option v-for="dict in dict.type.tj_work_status" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
+ <el-input type="textarea" rows="4" v-model="formobj.contactPoison" placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
+ style="width: 700px" />
+ </el-form-item>
+ <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+ <el-input type="textarea" rows="4" v-model="formobj.medicalHistory" placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
+ style="width: 700px" />
+ </el-form-item>
+ </div>
+ </el-collapse-item>
+ <el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
+ <div style="width: 100%">
+ <el-form-item label="鍒濇疆(宀�)" prop="chuchao">
+ <el-input v-model="formobj.chuchao" style="width: 70px" />
+ </el-form-item>
+ <el-form-item label="缁忔湡" prop="jingqi">
+ <el-input v-model="formobj.jingqi" style="width: 70px" />澶�
+ </el-form-item>
+ <el-form-item label="鍛ㄦ湡" prop="zhouqi">
+ <el-input v-model="formobj.zhouqi" style="width: 70px" />澶�
+ </el-form-item>
+ <el-form-item label="鏈鏈堢粡" prop="mociage">
+ <el-input v-model="formobj.mociage" style="width: 100px" />
+ </el-form-item>
+ </div>
+ </el-collapse-item>
+ <el-collapse-item title="鐢熻偛鍙�" name="3" v-show="sex">
+ <div style="width: 100%">
+ <el-form-item label="鐜版湁瀛愬コ(浜�)" prop="zinv">
+ <el-input v-model="formobj.zinv" style="width: 70px" />
+ </el-form-item>
+ <el-form-item label="娴佷骇(娆�)" prop="liuchan">
+ <el-input v-model="formobj.liuchan" style="width: 70px" />
+ </el-form-item>
+ <el-form-item label="鏃╀骇(娆�)" prop="zaochan">
+ <el-input v-model="formobj.zaochan" style="width: 70px" />
+ </el-form-item>
+ <el-form-item label="姝讳骇(娆�)" prop="sichan">
+ <el-input v-model="formobj.sichan" style="width: 70px" />
+ </el-form-item>
+ <el-form-item label="寮傚父鑳�(娆�)" prop="yichangtai">
+ <el-input v-model="formobj.yichangtai" style="width: 70px" />
+ </el-form-item>
+ </div>
+ </el-collapse-item>
+ <el-collapse-item title="鐑熼厭鍙�" name="4">
+ <div style="width: 100%">
+ <el-form-item label="鏄惁鍚哥儫" prop="xiyan">
+ <!-- <el-input v-model="form.xiyanpinlv" placeholder="璇疯緭鍏ュ惛鐑熼鐜�" /> -->
+ <el-select filterable v-model="formobj.xiyan" placeholder="璇烽�夋嫨鏄惁鍚哥儫" clearable style="width: 150px">
+ <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍚哥儫棰戠巼" prop="xiyanpinlv">
+ <el-input v-model="formobj.xiyanpinlv" style="width: 70px" />鏀�/澶�
+ </el-form-item>
+ <el-form-item label="鍚哥儫鏃堕棿" prop="xiyanyear">
+ <el-input v-model="formobj.xiyanyear" style="width: 70px" />骞� </el-form-item><br />
+ <el-form-item label="鏄惁楗厭" prop="yinjiu">
+ <!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> -->
+ <el-select filterable v-model="formobj.yinjiu" placeholder="璇烽�夋嫨鏄惁楗厭" clearable style="width: 150px">
+ <el-option v-for="dict in dict.type.tj_smoking_pinlv" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="楗厭棰戠巼" prop="yinjiupinlv">
+ <el-input v-model="formobj.yinjiupinlv" style="width: 70px" />ml/澶�
+ </el-form-item>
+ <el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
+ <el-input v-model="formobj.yinjiuyear" style="width: 70px" />骞�
+ </el-form-item>
+ <el-form-item label="鍏朵粬" prop="qita">
+ <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" type="textarea" style="width: 600px" rows="2" />
+ </el-form-item>
+ </div>
+ </el-collapse-item>
+ <el-collapse-item title="鎬ユ參鎬ц亴涓氱梾鍙蹭俊鎭�" name="5">
+ <div style="width: 100%">
+ <el-table border :data="formobj.tjAskHistorysList" ref="tjAskHistorys" style="width: 98%">
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.diseaseName" placeholder="璇疯緭鍏ョ柧鐥呭悕绉�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
+ <template slot-scope="scope">
+ <el-date-picker size="mini" v-model="scope.row.diseaseData" align="right" type="date"
+ placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column label="璇婃柇鍗曚綅" prop="diseaseCompany">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.diseaseCompany" placeholder="璇疯緭鍏ヨ瘖鏂崟浣�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁鐥婃剤" prop="isOk">
+ <template slot-scope="scope">
+ <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
+ <el-select filterable size="mini" v-model="scope.row.isOk" placeholder="璇烽�夋嫨鏄惁鐥婃剤" clearable>
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.remark" placeholder="璇疯緭鍏ュ娉�" />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-collapse-item>
+
+ <el-collapse-item title="鑱屼笟鍙�" name="7">
+ <div style="width: 100%">
+ <el-table border :data="formobj.workLogs" style="width: 98%">
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
+ <template slot-scope="scope">
+ <el-date-picker size="mini" v-model="scope.row.beginTime" align="right" type="date"
+ placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撴潫鏃堕棿" prop="endTime">
+ <template slot-scope="scope">
+ <el-date-picker size="mini" v-model="scope.row.endTime" align="right" type="date"
+ placeholder="閫夋嫨鏃ユ湡" :picker-options="pickerOptions" style="width: 130px"
+ value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column label="宸ヤ綔鍗曚綅" prop="workCompany">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.workCompany" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="閮ㄩ棬" prop="workDept">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.workDept" placeholder="璇疯緭鍏ラ儴闂�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="宸ョ" prop="workType">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
+ <template slot-scope="scope">
+ <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
+ <el-select filterable size="mini" v-model="scope.row.harmTypeLogs" multiple
+ placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
+ <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
+ :value="dict.aid" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="闃叉姢鎺柦" prop="fangHu">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.fangHu" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ </div>
</el-col>
</el-row>
-
-
-
-
</el-drawer>
<el-dialog class="dia" title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
@@ -335,19 +523,30 @@
gettoPdf,
getModified,
} from "@/api/doctor/checkAll";
+import {
+ getInfoById,
+} from "@/api/hosp/history";
import { getInfo } from "@/api/login";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import { reportHistory } from "@/api/doctor/check";
import { getPdf, revoke } from "@/api/hosp/order";
import ViewPdf from "@/components/ViewPdf";
+import Historicalreport from "@/components/Historicalreport";
export default {
components: {
- ViewPdf,
+ ViewPdf, Historicalreport
},
+ dicts: [
+ "dict_tjtype","sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"
+ ],
name: "checkAll",
data() {
return {
+ sex: true,
+ activeName: "1",
+ wenzhen:false,
+ hosproy:true,
remarks: "",
remark: "",
proIds: "",
@@ -428,7 +627,7 @@
name: null,
checkStatus: null,
},
-
+ formobj: {},
// 鏌ヨ鍙傛暟
queryParam: {
pageNum: 1,
@@ -559,6 +758,8 @@
historicalreport() {
this.loading = true
+ this.wenzhen = false
+ this.hosproy = true
let data = {
cusId: this.tableAll.cusId
}
@@ -566,12 +767,37 @@
this.loading = false
if (res.data[0] != null) {
this.reportHistorydata = res.data
+ }else{
+ this.reportHistorydata = []
}
})
},
- medicalhistory(){
-
+ medicalhistory() {
+ this.wenzhen = true
+ this.hosproy = false
+ let tjNumber = this.tableAll.tjNumber
+ getInfoById(tjNumber).then((response) => {
+ this.formobj = response.data;
+ if (this.formobj.xiyan == null) {
+ this.formobj.xiyan = "1"
+ }
+ if (this.formobj.xiyanpinlv == null) {
+ this.formobj.xiyanpinlv = "0"
+ }
+ if (this.formobj.xiyanyear == null) {
+ this.formobj.xiyanyear = "0"
+ }
+ if (this.formobj.yinjiu == null) {
+ this.formobj.yinjiu = "1"
+ }
+ if (this.formobj.yinjiupinlv == null) {
+ this.formobj.yinjiupinlv = "0"
+ }
+ if (this.formobj.yinjiuyear == null) {
+ this.formobj.yinjiuyear = "0"
+ }
+ });
},
// viewReport(row) {
// const tjNumber = row.tjNumber;
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index 9645e50..f8d2b97 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -255,12 +255,12 @@
<el-input size="mini" v-model="scope.row.workType" placeholder="璇疯緭鍏ュ伐绉�" />
</template>
</el-table-column>
- <el-table-column label="鏈夊鍥犵礌" prop="workLogs">
+ <el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
- <el-select filterable size="mini" v-model="scope.row.workLogs" placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
- <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select filterable size="mini" v-model="scope.row.harmTypeLogs" multiple placeholder="璇烽�夋嫨鏈夊鍥犵礌" clearable>
+ <el-option v-for="dict in harmTypeList" :key="dict.aid" :label="dict.harmtype"
+ :value="dict.aid" />
</el-select>
</template>
</el-table-column>
@@ -293,13 +293,16 @@
} from "@/api/hosp/history";
import { Message } from "element-ui";
import { getOrderList } from "@/api/hosp/order";
-
+import {
+ listHarmType,
+} from "@/api/hosp/harmType";
export default {
name: "History",
dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work", "dict_ageunit", "dict_job"],
data() {
return {
selectList: [],
+ dataList:[],
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
@@ -362,6 +365,7 @@
pageSize: 20,
cusName: null,
},
+ harmTypeList:[],
// 琛ㄥ崟鍙傛暟
form: {},
chageall: [],
@@ -401,6 +405,10 @@
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
this.loading = true;
+ listHarmType().then(response => {
+ this.harmTypeList = response.rows;
+ this.loading = false;
+ });
getOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
if (this.orderList) {
@@ -417,7 +425,9 @@
this.orderList[0],
true
);
+
});
+ this.dataList = this.orderList[0]
} else {
this.$refs.multipleTable.clearSelection();
}
@@ -480,6 +490,7 @@
},
// 鍗曢�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.dataList = []
this.selectList = selection;
// this.ids = selection.map((item) => item.askId);
// this.single = selection.length !== 1;
@@ -501,8 +512,8 @@
this.sex = false;
}
})
- let userId = selection.map((item) => item.userId);
- getInfoById(userId).then((response) => {
+ let tjNumber = selection.map((item) => item.tjNumber);
+ getInfoById(tjNumber).then((response) => {
this.form = response.data;
if (this.form.xiyan == null) {
this.form.xiyan = "1"
@@ -570,18 +581,18 @@
},
delemembers() {
- this.form.tjAskHistorysList.forEach((item, index) => {
- this.bingshiall.forEach((item1, index1) => {
- if (item.id == item1.id) {
- if (this.bingshiall.length == 1) {
- this.form.tjAskHistorysList.splice(index, 1)
- } else {
- this.form.tjAskHistorysList.splice(index, index1)
+ let that = this
+ if (that.form.tjAskHistorysList.length == that.bingshiall.length) {
+ that.form.tjAskHistorysList = []
+ } else {
+ that.bingshiall.forEach((item1, index1) => {
+ that.form.tjAskHistorysList.forEach((item, index) => {
+ if (item == item1) {
+ that.form.tjAskHistorysList.splice(index, 1)
}
-
- }
+ })
})
- })
+ }
},
@@ -590,30 +601,29 @@
if (!this.form.workLogs) {
this.form.workLogs = [];
this.form.workLogs.push({
- id: parseInt(this.form.workLogs.length + 1),
+ id: parseInt(length),
beginTime: "",
endTime: "",
workCompany: "",
workDept: "",
workType: "",
- workLogs: "",
+ harmTypeLogs: "",
fangHu: "",
Selection,
});
} else {
this.form.workLogs.push({
- id: parseInt(this.form.workLogs.length + 1),
+ id: parseInt(length),
beginTime: "",
endTime: "",
workCompany: "",
workDept: "",
workType: "",
- workLogs: "",
+ harmTypeLogs: "",
fangHu: "",
Selection,
});
}
- console.log(that.form.workLogs)
} else {
Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
}
@@ -628,15 +638,12 @@
delememberss() {
let that = this
- console.log(that.chageall)
-
if (that.form.workLogs.length == that.chageall.length) {
that.form.workLogs = []
} else {
that.chageall.forEach((item1, index1) => {
that.form.workLogs.forEach((item, index) => {
- if (item.id == item1.id) {
- console.log(111111)
+ if (item == item1) {
that.form.workLogs.splice(index, 1)
}
})
@@ -646,6 +653,7 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
+ this.form.tjNum = this.dataList[0].tjNumber
updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
});
diff --git a/src/views/login.vue b/src/views/login.vue
index 05e30c4..1b6f2f0 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,8 @@
<template>
<div class="login">
<!-- <div style="padding-top: 130px;"> -->
- <h2>鍏村钩鍏村寲绀惧尯鏈嶅姟绔�</h2>
+ <!-- <h2>鍏村钩鍏村寲绀惧尯鏈嶅姟绔�</h2> -->
+ <h1>娉惧窛鍘夸汉姘戝尰闄�</h1>
<h1>鏅鸿兘鍋ュ悍浣撴绠＄悊绯荤粺</h1>
<!-- </div> -->
@@ -59,8 +60,8 @@
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <!-- <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span> -->
- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span>
+ <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span>
+ <!-- <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span> -->
</div>
</div>
</template>
diff --git a/vue.config.js b/vue.config.js
index 65ccafb..2bf47cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.0.101:5011`,
+ target: `http://192.168.0.111:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
changeOrigin: true,
--
Gitblit v1.8.0