From b6b6a0fd01cb3fa1055407a0600902c770fe380e Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 26 五月 2025 17:00:56 +0800
Subject: [PATCH] qx
---
src/views/system/comp/index.vue | 11
src/views/jmreport/jmreport/clinical.vue | 65 +++++
src/views/reservation/resercopy/index.vue | 334 ++++++-----------------------
src/views/jmreport/bztj/index.vue | 43 +++
src/views/reservation/career/index.vue | 191 +++++++++++++---
src/router/index.js | 6
src/views/sampling/sampling/index.vue | 10
7 files changed, 358 insertions(+), 302 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index aaaa00e..b024307 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -145,6 +145,12 @@
name: 'DailyReportReport',
meta: { title: '', activeMenu: '/bre/zongjianjiankangzheng ' },
},
+ {
+ path: 'clinical',
+ component: () => import('@/views/jmreport/jmreport/clinical'),
+ name: 'DailyReportReport',
+ meta: { title: '妫�楠岀瀵兼鍗�', activeMenu: '/bre/clinical' },
+ },
]
},
{
diff --git a/src/views/jmreport/bztj/index.vue b/src/views/jmreport/bztj/index.vue
new file mode 100644
index 0000000..ffd03ab
--- /dev/null
+++ b/src/views/jmreport/bztj/index.vue
@@ -0,0 +1,43 @@
+<template>
+ <div v-loading="loading" :style="'height:' + height">
+ <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
+ </div>
+</template>
+<script>
+import {
+ getToken
+} from '@/utils/auth'
+import { view } from "@/api/jmreport/jimu";
+export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+ viewNum:"1042322631512850432"
+ };
+ },
+ created() {
+ view().then((res) => {
+ this.src =
+ res +
+ "/" +
+ this.viewNum +
+ "?token=Bearer " +
+ getToken();
+ });
+ // this.src = "http://192.168.0.99:8080/ltkj-admin/jmreport/view/803795472456839168?token=Bearer " + getToken();
+ },
+
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/jmreport/jmreport/clinical.vue b/src/views/jmreport/jmreport/clinical.vue
new file mode 100644
index 0000000..9b22759
--- /dev/null
+++ b/src/views/jmreport/jmreport/clinical.vue
@@ -0,0 +1,65 @@
+<template>
+ <div v-loading="loading" :style="'height:' + height" class="app-container">
+ <!-- <el-row style="margin-bottom: 10px;">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="el-icon-refresh-right" size="mini" @click="handleRefresh">鍒锋柊</el-button>
+ </el-col>
+ </el-row> -->
+
+ <iframe
+ :src="src"
+ id="reportView"
+ frameborder="no"
+ style="width: 100%; height: 100%"
+ scrolling="auto"
+ />
+ </div>
+</template>
+ <script>
+import { getToken } from "@/utils/auth";
+import { view } from "@/api/jmreport/jimu";
+export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+ viewNum: "",
+ tj_number: "",
+ };
+ },
+ created() {
+ console.log(this.$route.query)
+ //鎶ヨ〃妯℃澘缂栧彿
+ this.viewNum = this.$route.query.viewNum;
+ //浣撴鍙�
+ this.tj_number = this.$route.query.tjnumber;
+ view().then((res) => {
+ this.src =
+ res +
+ "/" +
+ this.viewNum +
+ "?tj_number=" +
+ this.tj_number +
+ "&token=Bearer " +
+ getToken();
+ });
+ },
+ methods: {
+ handleRefresh() {
+ document.getElementById("reportView").src =
+ document.getElementById("reportView").src;
+ },
+ },
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/reservation/career/index.vue b/src/views/reservation/career/index.vue
index fcdd1c8..b4f1091 100644
--- a/src/views/reservation/career/index.vue
+++ b/src/views/reservation/career/index.vue
@@ -129,34 +129,145 @@
<div class="dia">
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
- <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
- <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+ <el-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="cnName"
+
+ >
+ <el-input
+ v-model="form.cnName"
+ placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"
+ />
+ </el-form-item>
+ <el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="taxNumber">
+ <el-input
+ v-model="form.taxNumber"
+ placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜"
+ />
+ </el-form-item>
+ <el-form-item label="娉曚汉浠ｈ〃" prop="legalPerson">
+ <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="鑱旂郴浜�" prop="contactPerson">
<el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
- <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <el-input
+ v-model="form.contactPhone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
- <el-form-item label="绋庡彿" prop="taxNumber">
- <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
</el-form-item>
- <el-form-item label="娉曚汉" prop="legalPerson">
- <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
- </el-form-item>
+
+ <!-- <el-form-item label="缂栫爜" prop="code">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
+ </el-form-item> -->
+
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
+ <el-input
+ v-model="form.registerAddress"
+ placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+ />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
+ <el-input
+ v-model="form.mailingAddress"
+ placeholder="璇疯緭鍏ラ�氳鍦板潃"
+ />
+ </el-form-item>
+ <el-form-item label="鎵�灞炲湴鍖�" prop="ssdq" >
+ <el-input v-model="form.ssdq" placeholder="璇疯緭鍏ユ墍灞炲湴鍖�" />
+ </el-form-item>
+ <el-form-item
+ label="闅跺睘鍏崇郴"
+ prop="lsgx"
+
+ >
+ <!-- <el-input
+ v-model="form.industryType"
+ placeholder="璇疯緭鍏ラ毝灞炲叧绯�"
+ /> -->
+ <el-select
+ filterable
+ v-model="form.lsgx"
+ placeholder="璇烽�夋嫨闅跺睘鍏崇郴"
+ clearable
+ style="width: 183px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁忔祹绫诲瀷" prop="jjlx" >
+ <el-select
+ filterable
+ v-model="form.jjlx"
+ placeholder="璇烽�夋嫨缁忔祹绫诲瀷"
+ clearable
+ style="width: 183px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浼佷笟瑙勬ā" prop="qygm">
+ <el-input v-model="form.qygm" placeholder="璇疯緭鍏ヤ紒涓氳妯�" />
+ </el-form-item>
+ <el-form-item label="琛屼笟鍒嗙被" prop="hyfl" >
+ <el-select
+ filterable
+ v-model="form.hyfl"
+ placeholder="璇烽�夋嫨琛屼笟鍒嗙被"
+ clearable
+ style="width: 183px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椋庨櫓璇勪及" prop="fxpg">
+ <el-select
+ filterable
+ v-model="form.fxpg"
+ placeholder="璇烽�夋嫨椋庨櫓璇勪及"
+ clearable
+ style="width: 183px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
- <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ <el-input
+ v-model="form.bankAccount"
+ placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
+ />
</el-form-item>
<el-form-item label="閾惰璐︽埛" prop="countNum">
- <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+ <el-input
+ v-model="form.countNum"
+ placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
+ />
</el-form-item>
- <el-form-item label="閭" prop="email">
+ <el-form-item label="鑱旂郴閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
</el-form-item>
<el-form-item label="璐熻矗浜�" prop="principal">
@@ -165,22 +276,34 @@
<el-form-item label="缃戝潃" prop="url">
<el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
</el-form-item>
- <el-form-item label="浼犵湡" prop="faxNumber">
- <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
- </el-form-item>
+
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
- <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+ <el-select
+ filterable
+ v-model="form.areaName"
+ placeholder="璇烽�夋嫨琛屾斂鍖哄垝鍚嶇О"
+ clearable
+ style="width: 186px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鎺掑簭" prop="orderNum">
- <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
- </el-form-item>
- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
- <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
- </el-date-picker> </el-form-item><br />
+
<el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
- style="width: 830px" resize="none"></el-input>
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :rows="2"
+ label-width="400px"
+ style="width: 770px"
+ resize="none"
+ ></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
@@ -258,7 +381,6 @@
}
};
return {
-
leftList: "",
isdisabled: true,
setDisabled: {
@@ -277,14 +399,6 @@
fileList: [], //涓婁紶鏂囦欢鍒楄〃
tableHead: [], //琛ㄥご
tableData: [], // 琛ㄦ暟鎹�
- form: {
- company: "",
- payType: "",
- name: "",
- phoe: "",
- signingPic: "",
- discount: "",
- },
formLabelWidth: "120px",
imageUrl: "",
size: "",
@@ -302,9 +416,7 @@
dwId: "",
dwDeptId: "",
dwName: "",
-
},
-
objs: {
drugManufacturerId: "",
reservationTime: "",
@@ -366,7 +478,9 @@
payType: undefined,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ dwlx: 1
+ },
// 琛ㄥ崟鏍￠獙
rules: {
@@ -652,6 +766,7 @@
submitFormS() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ this.form.dwlx= 1
addComp(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 90f4dc9..f05c814 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -1,31 +1,11 @@
<template>
<div class="app-container">
- <el-form
- :model="objs"
- :rules="rules"
- ref="form"
- size="small"
- :inline="true"
- label-width="100px"
- >
+ <el-form :model="objs" :rules="rules" ref="form" size="small" :inline="true" label-width="100px">
<el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
- <el-select
- :remote-method="getRemoteData"
- v-model="objs.drugManufacturerId"
- remote
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @clear="getCompanyList"
- @change="idFn"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.cnName"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
+ <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+ style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn">
+ <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+ :value="dict.drugManufacturerId" />
</el-select>
<i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
</el-form-item>
@@ -52,143 +32,61 @@
</el-select>
</el-form-item> -->
<el-form-item label="棰勭害鏃堕棿" prop="reservationTime">
- <el-date-picker
- clearable
- v-model="objs.reservationTime"
- type="date"
- format="yyyy-MM-dd"
- value-format="yyyy-MM-dd"
- style="width: 130px"
- placeholder="璇烽�夋嫨棰勭害鏃ユ湡"
- @change="selectTime"
- :picker-options="setDisabled"
- >
+ <el-date-picker clearable v-model="objs.reservationTime" type="date" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 130px" placeholder="璇烽�夋嫨棰勭害鏃ユ湡" @change="selectTime"
+ :picker-options="setDisabled">
</el-date-picker>
</el-form-item>
<el-form-item label="鏈夋晥澶╂暟" prop="yxts">
- <el-input
- style="width: 100px"
- v-model="objs.yxts"
- placeholder="鏈夋晥澶╂暟"
- />澶�(鍙嚜瀹氫箟)
+ <el-input style="width: 100px" v-model="objs.yxts" placeholder="鏈夋晥澶╂暟" />澶�(鍙嚜瀹氫箟)
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8" style="margin: 5px 20px">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-upload2"
- size="mini"
- @click="handleImport"
- >瀵煎叆</el-button
- >
+ <el-button type="primary" icon="el-icon-upload2" size="mini" @click="handleImport">瀵煎叆</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-upload2"
- size="mini"
- @click="importTemplate"
- >涓嬭浇妯℃澘</el-button
- >
+ <el-button type="primary" icon="el-icon-upload2" size="mini" @click="importTemplate">涓嬭浇妯℃澘</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- class="btn"
- icon="el-icon-thumb"
- :disabled="isdisabled"
- size="mini"
- @click="submitForm"
- >
- 纭</el-button
- >
+ <el-button type="primary" class="btn" icon="el-icon-thumb" :disabled="isdisabled" size="mini"
+ @click="submitForm">
+ 纭</el-button>
</el-col>
</el-row>
<div style="margin: 5px 20px; width: 94%">
- <el-table
- v-loading="loading"
- :data="userList"
- :summary-method="getSummaries"
- show-summary
- border
- >
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="company"
- width="200"
- >
+ <el-table v-loading="loading" :data="userList" :summary-method="getSummaries" show-summary border>
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" width="200">
</el-table-column>
- <el-table-column
- label="鍗曚綅閮ㄩ棬"
- align="center"
- prop="department"
- width="200"
- >
+ <el-table-column label="鍗曚綅閮ㄩ棬" align="center" prop="department" width="200">
</el-table-column>
<!-- <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" /> -->
<el-table-column label="濮撳悕" align="center" prop="name" width="75" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="75">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column
- label="韬唤璇佸彿"
- align="center"
- prop="idCard"
- width="200"
- />
+ <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="200" />
<el-table-column label="骞撮緞" align="center" prop="age" width="75" />
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="birthday"
- width="100"
- />
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="birthday" width="100" />
<!-- <el-table-column label="鑱屼綅" align="center" prop="position" /> -->
<!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" /> -->
<!-- <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" /> -->
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="phoe"
- width="140"
- />
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="140" />
<el-table-column label="鍦板潃" align="center" prop="address" />
- <el-table-column
- label="濠氬Щ鐘跺喌"
- align="center"
- prop="marriage"
- key="marriage"
- >
+ <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_marry"
- :value="scope.row.marriage"
- />
+ <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
</template>
</el-table-column>
<el-table-column label="姘戞棌" align="center" prop="nation" key="nation">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_national"
- :value="scope.row.nation"
- />
+ <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
</template>
</el-table-column>
<!-- <el-table-column label="鑱旂郴閭" align="center" prop="email" /> -->
@@ -200,26 +98,10 @@
</div>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="400px"
- append-to-body
- >
- <el-upload
- ref="upload"
- :limit="1"
- :key="uploadKey"
- accept=".xls"
- :headers="upload.headers"
- :data="data"
- :action="upload.url"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- :auto-upload="false"
- drag
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+ <el-upload ref="upload" :limit="1" :key="uploadKey" accept=".xls" :headers="upload.headers" :data="data"
+ :action="upload.url" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress"
+ :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
<div class="el-upload__tip text-center" slot="tip">
@@ -245,19 +127,8 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
<div class="dia">
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
</el-form-item>
@@ -265,10 +136,7 @@
<el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
- <el-input
- v-model="form.contactPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
+ <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
<el-form-item label="绋庡彿" prop="taxNumber">
<el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
@@ -277,16 +145,10 @@
<el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input
- v-model="form.registerAddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- />
+ <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input
- v-model="form.mailingAddress"
- placeholder="璇疯緭鍏ラ�氳鍦板潃"
- />
+ <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
<el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
@@ -307,34 +169,18 @@
<el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
</el-form-item>
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
- <el-input
- v-model="form.areaName"
- placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
- />
+ <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
</el-form-item>
<el-form-item label="鎺掑簭" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
- <el-date-picker
- clearable
- v-model="form.validTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
- >
- </el-date-picker> </el-form-item
- ><br />
+ <el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
+ </el-date-picker> </el-form-item><br />
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- v-model="form.remark"
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- :rows="2"
- label-width="400px"
- style="width: 830px"
- resize="none"
- ></el-input>
+ <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+ style="width: 770px" resize="none"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
@@ -346,47 +192,20 @@
<!-- 娣诲姞鎴栦慨鏀归儴闂ㄤ俊鎭淮鎶ゅ璇濇 -->
<div class="dia">
- <el-dialog
- :title="title"
- :visible.sync="open1"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
- <el-select
- :remote-method="getRemoteData"
- v-model="objs.drugManufacturerId"
- remote
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @clear="getCompanyList"
- @change="idFn1"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.cnName"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
+ <el-select :remote-method="getRemoteData" v-model="objs.drugManufacturerId" remote filterable
+ style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @clear="getCompanyList" @change="idFn1">
+ <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
+ :value="dict.drugManufacturerId" />
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
<el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
</el-form-item>
<el-form-item label="绛剧害閲戦" prop="signingPrice">
- <el-input
- v-model="form.signingPrice"
- placeholder="璇疯緭鍏ョ绾﹂噾棰�"
- />
+ <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
@@ -439,7 +258,7 @@
}
};
return {
-
+
leftList: "",
isdisabled: true,
setDisabled: {
@@ -458,14 +277,6 @@
fileList: [], //涓婁紶鏂囦欢鍒楄〃
tableHead: [], //琛ㄥご
tableData: [], // 琛ㄦ暟鎹�
- form: {
- company: "",
- payType: "",
- name: "",
- phoe: "",
- signingPic: "",
- discount: "",
- },
formLabelWidth: "120px",
imageUrl: "",
size: "",
@@ -483,9 +294,7 @@
dwId: "",
dwDeptId: "",
dwName: "",
-
},
-
objs: {
drugManufacturerId: "",
reservationTime: "",
@@ -516,7 +325,7 @@
// 鏄惁鏇存柊宸茬粡瀛樺湪鐨勭敤鎴锋暟鎹�
updateSupport: 0,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
- headers: { Authorization: "Bearer " + getToken() ,hospId: Cookies.get("hospId")},
+ headers: { Authorization: "Bearer " + getToken(), hospId: Cookies.get("hospId") },
// 涓婁紶鐨勫湴鍧�
url:
process.env.VUE_APP_BASE_API +
@@ -547,7 +356,9 @@
payType: undefined,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ dwlx: 0
+ },
// 琛ㄥ崟鏍￠獙
rules: {
@@ -638,7 +449,7 @@
],
},
ListObj: {},
- uploadKey:0,
+ uploadKey: 0,
// 閬僵灞�
loading: true,
pacStatus: "鍚敤",
@@ -784,7 +595,7 @@
},
// 鎼滅储
getRemoteData(query) {
-
+
if (query) {
let compName = query;
queryCompany(compName).then((response) => {
@@ -833,6 +644,7 @@
submitFormS() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ this.form.dwlx= 0
addComp(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -926,20 +738,20 @@
dangerouslyUseHTMLString: true,
});
}
- }else{
+ } else {
this.isdisabled = false;
this.ListObj = response.data;
- this.userList = response.data.list;
-
- this.userList.forEach((item) => {
- this.CompanyList.forEach((item1) => {
- if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
- item.company = item1.cnName;
- }
+ this.userList = response.data.list;
+
+ this.userList.forEach((item) => {
+ this.CompanyList.forEach((item1) => {
+ if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
+ item.company = item1.cnName;
+ }
+ });
});
- });
}
-
+
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
@@ -949,15 +761,15 @@
this.isdisabled = true;
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.msg +
- "<div style='br;margin:10px'>" +
- response.data[0] +
- "韬唤璇佹垨鎵嬫満鍙风爜鏈夎" +
- "</div>",
+ response.msg +
+ "<div style='br;margin:10px'>" +
+ response.data[0] +
+ "韬唤璇佹垨鎵嬫満鍙风爜鏈夎" +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
- }
+ }
// else {
// console.log(11111)
// this.isdisabled = false;
@@ -1092,6 +904,4 @@
display: flex;
justify-content: center;
}
-</style>
-
-
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index e3e23f5..c9fcb6f 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -69,11 +69,13 @@
<el-button type="primary" :disabled="!disabled" @click="Cancellation">鎾ら攢鍚堝苟</el-button>
<el-button type="primary" @click="Confirmreceipt" :disabled="!selectList.length">閲囨牱鎵撶爜</el-button>
<el-button type="primary" @click="piliangPrint" :disabled="!isAllSelected">鎵归噺鎵撳嵃</el-button>
+
</el-col>
<el-col :span="12" style="margin: 10px 15px" v-show="samplingList.length > 0 && tjStatus == 0">
<el-button type="primary" :disabled="!selectList.length" @click="buda">琛ユ墦鏉＄爜</el-button>
<!-- @click="Collection" -->
<el-button type="primary" :disabled="!disabled" @click="Cancellation">鎾ら攢鍚堝苟</el-button>
+ <el-button type="primary" @click="jydPrint">鎵撳嵃妫�楠屽崟</el-button>
</el-col>
</el-row>
@@ -451,6 +453,14 @@
loadingInstance.close();
}
},
+
+
+ jydPrint() {
+ const tjnumber = this.piliangList[0].tjNumber;
+ const viewNum = "1086792376946569216";
+ const params = { viewNum, tjnumber };
+ this.$tab.openPage("妫�楠岀瀵兼鍗�", "/report/clinical", params);
+ },
getTruncatedName(proName) {
// 鍘绘帀鎵�鏈夌┖鏍�
const trimmedProName = proName.replace(/\s+/g, "");
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 7097c31..cd3f7cc 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -549,7 +549,7 @@
@submit.native.prevent
>
<el-form-item label="鍗曚綅绫诲瀷" prop="dwlx">
- <el-radio-group v-model="form.dwlx">
+ <el-radio-group v-model="form.dwlx" @input="radioChange" >
<el-radio :label="0">鏅�氬崟浣�</el-radio>
<el-radio :label="1">鑱屼笟鐥呭崟浣�</el-radio>
</el-radio-group>
@@ -857,7 +857,8 @@
id: "",
// 琛ㄥ崟鍙傛暟
form: {
- isZybUnit: 0,
+ dwlx: 0,
+
},
lastXianPrice: 0,
forms: {
@@ -1216,8 +1217,14 @@
handleAdd() {
this.reset();
this.open = true;
+ this.form.dwlx=0
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
+
+ radioChange(val){
+ this.reset();
+ this.form.dwlx=val
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
--
Gitblit v1.8.0