From 8f5eca214f1544ae0979de2a0bd09535a48a6297 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 16 四月 2025 16:23:14 +0800
Subject: [PATCH] qx
---
src/views/hosp/rules/index.vue | 6
src/views/system/comp/index.vue | 31
src/views/jmreport/payment/index.vue | 43 +
src/components/public/index.vue | 637 +++++++++++++---------------
src/views/hosp/ruleAdvice/index.vue | 4
src/views/picture/picture/index.vue | 552 +++++++++++-------------
6 files changed, 618 insertions(+), 655 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 12ba45e..19a6ccc 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -1,349 +1,320 @@
<template>
- <div>
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1080px"
- append-to-body
- >
- <h3 v-if="fList.proResult">妫�娴嬮」鐩� :{{ fList.project.proName }}</h3>
- <h3 v-if="fList.proResult">
- 妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
- </h3>
- <!-- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- > -->
- <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
- <el-input
- v-model="queryParams.bingzhong"
- placeholder="璇疯緭鍏ョ畝绉�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 120px"
- />
- </el-form-item>
- <el-form-item label="鎷奸煶鐮�" prop="bzPinyin">
- <el-input
- v-model="queryParams.bzPinyin"
- placeholder="璇疯緭鍏ユ嫾闊崇爜"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 130px"
- />
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- </el-form-item> -->
- <!-- <el-form-item>
- <h3 >{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h3>
- </el-form-item> -->
- <!-- <el-form-item>
- <h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
- </el-form-item> -->
- <!-- </el-form> -->
- <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
- <div style="display: flex; width: 100%">
- <div style="width: 50%; margin-right: 40px">
- <el-table
- :data="dataList"
- ref="multipleTable"
- v-loading="loading"
- row-key="aid"
- @selection-change="handleSelectionChange"
- :reserve-selection="false"
- border
- height="420px"
- >
- <el-table-column type="selection" width="40" align="center" />
- <el-table-column
- label="搴忓彿"
- type="index"
- align="center"
- width="50px"
- />
- <!-- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" /> -->
- <el-table-column label="妫�鏌ユ墍瑙�" align="center" prop="yxbx" />
- <el-table-column label="妫�鏌ョ粨璁�" align="center" prop="ruleStr" />
- </el-table>
- <div class="pag">
- <div class="pag1" style="margin-left: 630px">
- <pagination
- small
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- </div>
+ <div>
+ <el-dialog :title="title" :visible.sync="open" width="1080px" append-to-body>
+ <h3 v-if="fList.proResult">妫�娴嬮」鐩� :{{ fList.project.proName }}</h3>
+ <h3 v-if="fList.proResult">
+ 妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
+ </h3>
+
+ <h2 style="text-align: center;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
+ <div style="display: flex; width: 100%">
+ <div style="width: 50%; margin-right: 40px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+ <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
+ <el-input
+ v-model="queryParams.bingzhong"
+ placeholder="璇疯緭鍏ョ畝绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 120px"
+ />
+ </el-form-item>-->
+ <el-form-item label="妫�鏌ョ粨璁�" prop="ruleStr">
+ <el-input v-model="queryParams.ruleStr" placeholder="璇疯緭鍏ユ鏌ョ粨璁�" clearable @keyup.enter.native="getList"
+ style="width: 130px" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">鎼滅储</el-button>
+ </el-form-item>
+ <!-- <el-form-item>
+ <h3 >{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h3>
+ </el-form-item> -->
+ <!-- <el-form-item>
+ <h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
+ </el-form-item> -->
+ </el-form>
+ <el-table :data="dataList" ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange"
+ border height="480px">
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column label="搴忓彿" type="index" align="center" width="50px" />
+ <!-- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" /> -->
+ <el-table-column label="妫�鏌ユ墍瑙�" align="center" prop="yxbx" />
+ <el-table-column label="妫�鏌ョ粨璁�" align="center" prop="ruleStr" />
+ </el-table>
+ <div class="pag">
+ <div class="pag1" style="margin-left: 630px">
+ <pagination small v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
-
- <div style="width: 100%; height: 600px">
- <!-- <h3 style="margin-top: -30px;">宸查�夐」鐩�</h3> -->
- <el-form
- :model="form"
- ref="queryForm"
- size="small"
- label-width="68px"
- :inline="true"
- >
- <!-- :inline="true" -->
- <!-- <el-form-item>
- <el-input
- type="textarea"
- v-model="form.desc"
- style="width: 560px"
- ></el-input>
- </el-form-item> -->
- <el-form-item label="妫�鏌ユ墍瑙�" prop="jcsj">
- <el-input
- v-model="form.jcsj"
- clearable
- type="textarea"
- :autosize="{ minRows: 8 }"
- style="width: 380px"
- />
- </el-form-item>
- <el-form-item label="妫�鏌ョ粨璁�" prop="conclusion">
- <el-input
- v-model="form.desc"
- clearable
- type="textarea"
- :autosize="{ minRows: 8 }"
- style="width: 380px"
- />
- </el-form-item>
- </el-form>
- </div>
</div>
-
- <span slot="footer" class="dialog-footer" style="margin-top: -120px">
- <el-button @click="open = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- </div>
- </template>
-
- <script>
- import { getlist, getlistByRuleStr } from "@/api/doctor/check";
- import { getYxJcXxJg } from "@/api/picture/picture";
- export default {
- name: "Public",
- props: {
- checkStatus: {
- type: String,
- default: "0",
- validator: (value) => ["0", "1"].includes(value),
- },
- proResult: {
- type: String,
- default: "",
- },
- conclusion: {
- type: String,
- default: "",
- },
- projectList: {
- type: Array,
- default: () => [],
- },
+
+ <div class="jianc">
+ <!-- <h3 style="margin-top: -30px;">宸查�夐」鐩�</h3> -->
+ <el-form :model="form" ref="queryForm" size="small" label-width="68px" :label-position="labelPosition">
+ <!-- :inline="true" -->
+ <!-- <el-form-item>
+ <el-input
+ type="textarea"
+ v-model="form.desc"
+ style="width: 560px"
+ ></el-input>
+ </el-form-item> -->
+ <el-form-item label="妫�鏌ユ墍瑙�" prop="jcsj">
+ <el-input v-model="form.jcsj" clearable type="textarea" :autosize="{ minRows: 7 }" style="width: 380px" />
+ </el-form-item>
+ <el-form-item label="妫�鏌ョ粨璁�" prop="desc">
+ <el-input v-model="form.desc" clearable type="textarea" :autosize="{ minRows: 7 }" style="width: 380px" />
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+
+ <span slot="footer" class="dialog-footer" style="margin-top: -20px">
+ <el-button @click="callcolos">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { getlist, getlistByRuleStr } from "@/api/doctor/check";
+import { getYxJcXxJg } from "@/api/picture/picture";
+export default {
+ name: "Public",
+ props: {
+ checkStatus: {
+ type: String,
+ default: "0",
+ validator: (value) => ["0", "1"].includes(value),
},
- data() {
- return {
- open: false,
- // 寮瑰嚭灞傛爣棰�
- title: "",
- yxbx: "",
- proName:'',
- // lastDesc: "",
- total: 0,
- dataList: [],
- // 閬僵灞�
- loading: false,
- form: {
- desc: "",
- jcsj: "",
- },
- queryParams: {
- bingzhong: "",
- bzPinyin: "",
- proId:"",
- // proName:"",
- pageNum: 1,
- pageSize: 10,
- },
- list: [],
- fList: {},
- selectedItems: [],
- searchDebounce: null,
- };
+ proResult: {
+ type: String,
+ default: "",
},
- watch: {
- checkStatus(newValue) {
- if (newValue === "1") {
- this.updateData(this.proResult, this.conclusion);
+ conclusion: {
+ type: String,
+ default: "",
+ },
+ projectList: {
+ type: Array,
+ default: () => [],
+ },
+ },
+ data() {
+ return {
+ open: false,
+ labelPosition: "top",
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ yxbx: "",
+ proName: '',
+ // lastDesc: "",
+ total: 0,
+ dataList: [],
+ // 閬僵灞�
+ loading: false,
+ form: {
+ desc: "",
+ jcsj: "",
+ },
+ queryParams: {
+ ruleStr: "",
+ pageNum: 1,
+ pageSize: 10,
+ },
+ list: [],
+ fList: {},
+ selectedItems: [],
+ searchDebounce: null,
+ };
+ },
+ watch: {
+ checkStatus(newValue) {
+ console.log(565658)
+ if (newValue === "1") {
+ this.updateData(this.proResult, this.conclusion);
+ }
+ },
+ projectList: {
+ immediate: true,
+ deep: true,
+ handler(newVal) {
+ console.log("鏀跺埌鐨勯」鐩暟鎹�:", newVal);
+ // 浣犲彲浠ュ湪杩欓噷澶勭悊鏁版嵁锛屾瘮濡備繚瀛樺埌 data 鎴栧仛閫昏緫鍒ゆ柇
+ if (newVal && newVal.length > 0) {
+ const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
+ this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
+ this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
+ this.proName = firstProject.proName
}
},
- projectList: {
- immediate: true,
- deep: true,
- handler(newVal) {
- console.log("鏀跺埌鐨勯」鐩暟鎹�:", newVal);
- // 浣犲彲浠ュ湪杩欓噷澶勭悊鏁版嵁锛屾瘮濡備繚瀛樺埌 data 鎴栧仛閫昏緫鍒ゆ柇
- if (newVal && newVal.length > 0) {
- const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
- this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
- // this.queryParams.proName = firstProject.proName;
- this.proName = firstProject.proName
- }
- },
- },
},
- mounted() {},
-
- created() {},
- methods: {
- async getList() {
- try {
- this.loading = true; // 娣诲姞鍔犺浇鐘舵��
-
- const res = await getlist(this.queryParams);
- this.dataList = res.data.rows;
+ },
+ mounted() { },
+
+ created() { },
+ methods: {
+ async getList() {
+ try {
+ this.loading = true; // 娣诲姞鍔犺浇鐘舵��
+ const res = await getlist(this.queryParams);
+ this.dataList = res.data.rows;
+ if (res.data.total) {
this.total = res.data.total;
-
- // 濡傛灉闇�瑕侀�変腑鎿嶄綔锛屽皢鍏跺皝瑁呬负鐙珛鏂规硶
- await this.handleAutoSelection();
- } catch (error) {
- console.error("鑾峰彇鏁版嵁澶辫触:", error);
- this.$message.error("鑾峰彇鏁版嵁澶辫触");
- } finally {
- this.loading = false;
}
- },
-
- // 灏佽閫変腑閫昏緫
- async handleAutoSelection() {
- if (!this.fList?.rulesList?.length) return;
-
- await this.$nextTick();
- // 鍏堟竻闄ゆ墍鏈夐�夋嫨
- this.$refs.multipleTable?.clearSelection();
- // 鍐嶈繘琛岄�夋嫨
- this.dataList.forEach((item) => {
- const shouldSelect = this.fList.rulesList.some(
- (rule) => rule.aid === item.aid
- );
- if (shouldSelect) {
- this.$refs.multipleTable?.toggleRowSelection(item, true);
- }
- });
- },
-
- handleQuery() {
- if (this.searchDebounce) clearTimeout(this.searchDebounce);
-
- this.searchDebounce = setTimeout(() => {
- this.queryParams.pageNum = 1; // 閲嶇疆椤电爜
- this.getList();
- }, 300);
- },
-
- updateData(proResult, conclusion) {
- if (this.checkStatus === "1") {
- this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
- this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
- // console.log(proResult, conclusion);
+ this.updateData(this.proResult, this.conclusion);
+
+ // 濡傛灉闇�瑕侀�変腑鎿嶄綔锛屽皢鍏跺皝瑁呬负鐙珛鏂规硶
+ await this.handleAutoSelection();
+ } catch (error) {
+ console.error("鑾峰彇鏁版嵁澶辫触:", error);
+ this.$message.error("鑾峰彇鏁版嵁澶辫触");
+ } finally {
+ this.loading = false;
+ }
+ },
+
+ // 灏佽閫変腑閫昏緫
+ async handleAutoSelection() {
+ if (!this.fList?.rulesList?.length) return;
+
+ await this.$nextTick();
+ this.dataList.forEach((item) => {
+ const shouldSelect = this.fList.rulesList.some(
+ (rule) => rule.aid === item.aid
+ );
+ if (shouldSelect) {
+ this.$refs.multipleTable?.toggleRowSelection(item, true);
}
- },
-
- handleSelectionChange(selection) {
- console.log('Selection changed:', selection);
- this.list = [...selection]; // 浣跨敤灞曞紑杩愮畻绗﹀垱寤烘柊鏁扮粍
- this.updateFormContent(selection);
- },
-
- updateFormContent(selection) {
- // 濡傛灉澶勪簬妫�鏌ョ姸鎬侊紝浣跨敤浼犲叆鐨勫��
- if (this.checkStatus === "1") {
- this.updateData(this.proResult, this.conclusion);
- return;
- }
-
- // 閲嶇疆琛ㄥ崟鍐呭
+ });
+ },
+
+ handleQuery() {
+ if (this.searchDebounce) clearTimeout(this.searchDebounce);
+
+ this.searchDebounce = setTimeout(() => {
+ this.queryParams.pageNum = 1; // 閲嶇疆椤电爜
+ this.getList();
+ }, 300);
+ },
+
+ updateData(proResult, conclusion) {
+ console.log(proResult, conclusion, 5658)
+ if (this.checkStatus == 1) {
+
+ this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
+ } else {
this.form.desc = "";
this.form.jcsj = "";
-
- // 鍙湁鍦ㄦ湁閫変腑椤规椂鎵嶈繘琛屾嫾鎺�
- if (selection.length > 0) {
- // 浣跨敤map鍜宩oin鏇夸唬forEach鍜屽瓧绗︿覆鎷兼帴
- this.form.desc = selection
- .map((item) => item.bingzhong || item.ruleStr)
- .filter(Boolean)
- .join(",");
-
- this.form.jcsj = selection
- .map((item) => item.yxbx)
- .filter(Boolean)
- .join(",");
- }
- },
-
- handleOk() {
- if (!this.form.desc && !this.form.jcsj) {
- this.$message.warning("璇烽�夋嫨鏁版嵁");
- return;
- }
-
- try {
- this.$emit("add", this.form.desc, this.form.jcsj);
- this.resetForm();
- this.open = false;
- } catch (error) {
- console.error("澶勭悊鏁版嵁澶辫触:", error);
- this.$message.error("鎿嶄綔澶辫触");
- }
- },
-
- resetForm() {
- this.form.desc = "";
- this.form.jcsj = "";
- this.list = [];
- if (this.$refs.multipleTable) {
- this.$refs.multipleTable.clearSelection();
- }
- },
+ }
+
+ if (this.list.length != 0) {
+ let desc = ""
+ desc += this.list
+ .map((item) => item.bingzhong || item.ruleStr)
+ .filter(Boolean)
+ .join(",");
+ let jcsj = ""
+ jcsj += this.list
+ .map((item) => item.yxbx)
+ .filter(Boolean)
+ .join(",");
+ this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = this.form.desc + desc;
+ }
},
- computed: {
- isCheckMode() {
- return this.checkStatus === "1";
- },
-
- hasSelectedItems() {
- return this.list.length > 0;
- },
+
+ handleSelectionChange(selection) {
+ this.list = selection;
+ this.updateFormContent(selection);
},
- };
- </script>
-
- <style scoped>
- .el-dialog__body {
- padding: 10px 20px;
- }
- ::v-deep .el-dialog__footer {
- padding: 0 !important;
- padding-bottom: 40px !important;
- }
- </style>
-
\ No newline at end of file
+
+ updateFormContent(selection) {
+ // if (!selection.length) return;
+ this.updateData(this.proResult, this.conclusion);
+ // 濡傛灉澶勪簬妫�鏌ョ姸鎬侊紝浣跨敤浼犲叆鐨勫��
+ // if (this.checkStatus === "1") {
+ // this.updateData(this.proResult, this.conclusion);
+ // return;
+ // }
+
+ // 閲嶇疆琛ㄥ崟鍐呭
+ // this.form.desc = "";
+ // this.form.jcsj = "";
+ // console.log(22222);
+ // // 浣跨敤map鍜宩oin鏇夸唬forEach鍜屽瓧绗︿覆鎷兼帴
+ // this.form.desc = selection
+ // .map((item) => item.bingzhong || item.ruleStr)
+ // .filter(Boolean)
+ // .join(",");
+
+ // this.form.jcsj = selection
+ // .map((item) => item.yxbx)
+ // .filter(Boolean)
+ // .join(",");
+ },
+
+ handleOk() {
+ if (!this.form.desc && !this.form.jcsj) {
+ this.$message.warning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+
+ try {
+ this.$emit("add", this.form.desc, this.form.jcsj);
+ this.resetForm();
+ this.open = false;
+ } catch (error) {
+ console.error("澶勭悊鏁版嵁澶辫触:", error);
+ this.$message.error("鎿嶄綔澶辫触");
+ }
+ },
+
+ resetForm() {
+ this.form.desc = "";
+ this.form.jcsj = "";
+ this.list = [];
+ if (this.$refs.multipleTable) {
+ this.$refs.multipleTable.clearSelection();
+ }
+ },
+ callcolos() {
+ this.open = false;
+ }
+ },
+ computed: {
+ isCheckMode() {
+ return this.checkStatus === "1";
+ },
+
+ hasSelectedItems() {
+ return this.list.length > 0;
+ },
+ },
+};
+</script>
+
+<style scoped>
+.el-dialog__body {
+ padding: 0px 20px;
+}
+
+::v-deep .el-dialog__header {
+ padding: 0px !important;
+ padding-bottom: 0px !important;
+}
+
+::v-deep .el-dialog__footer {
+ padding: 0 !important;
+ padding-bottom: 40px !important;
+}
+
+.jianc {
+ width: 100%;
+ height: 600px;
+ padding-top: 40px
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/ruleAdvice/index.vue b/src/views/hosp/ruleAdvice/index.vue
index d8b945a..d57632a 100644
--- a/src/views/hosp/ruleAdvice/index.vue
+++ b/src/views/hosp/ruleAdvice/index.vue
@@ -440,7 +440,7 @@
this.open = true;
this.title = "娣诲姞鐥呯+鎰忚";
listRules(this.queryParams).then((response) => {
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -460,7 +460,7 @@
bingzhong: query,
};
listRules(data).then((response) => {
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
});
}
},
diff --git a/src/views/hosp/rules/index.vue b/src/views/hosp/rules/index.vue
index 3ceb5ec..38aa5e1 100644
--- a/src/views/hosp/rules/index.vue
+++ b/src/views/hosp/rules/index.vue
@@ -617,16 +617,16 @@
getListByXmId() {
this.loading = true;
listRules(this.queryParams).then((response) => {
- response.rows.forEach((item, index) => {
+ response.data.rows.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
index +
1;
});
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
console.log(this.rulesList, 999);
- this.total = response.total;
+ this.total = response.data.total;
this.loading = false;
});
},
diff --git a/src/views/jmreport/payment/index.vue b/src/views/jmreport/payment/index.vue
new file mode 100644
index 0000000..2a17bc4
--- /dev/null
+++ b/src/views/jmreport/payment/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:"1072318375476887552",
+ };
+ },
+ created() {
+ view().then((res) => {
+ this.src =
+ res +
+ "/" +
+ this.viewNum +
+ "?token=Bearer " +
+ getToken();
+ });
+ // this.src = "http://192.168.0.99:8080/ltkj-admin/jmreport/view/815468234724306944?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/picture/picture/index.vue b/src/views/picture/picture/index.vue
index a15ab68..792376a 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -1,138 +1,58 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- @blur="hb"
- style="width: 170px"
- />
+ <el-input ref="inputName" v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @keyup.enter.native="handleQuery" @blur="hb" style="width: 170px" />
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 110px"
- />
+
+ <el-form-item label="濮撳悕" prop="name" v-show="isCollapsed == 1">
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
+ style="width: 110px" />
</el-form-item>
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="tjCompName"
- style="margin-left: 20px"
- >
- <el-select
- :remote-method="getRemoteData"
- v-model="queryParams.tjCompName"
- value-key="drugManufacturerId"
- style="width: 180px"
- remote
- filterable
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="searchSelect"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.drugManufacturerId"
- :label="dict.cnName"
- :value="dict"
- />
+ <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px" v-show="isCollapsed == 1">
+ <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+ style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰" prop="tcm">
- <el-input
- v-model="queryParams.tcm"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 170px"
- />
+ <el-form-item label="椤圭洰" prop="tcm" v-show="isCollapsed == 1">
+ <el-input v-model="queryParams.tcm" placeholder="璇疯緭鍏ラ」鐩�" clearable @keyup.enter.native="handleQuery"
+ style="width: 170px" />
</el-form-item>
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker
- v-model="createTimeList"
- type="datetimerange"
- align="right"
- :picker-options="pickerOptions"
- style="width: 310px"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" v-show="isCollapsed == 1">
+ <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
+ style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- style="margin-right: 15px"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
+ v-show="isCollapsed == 0">灞曞紑鏇村绛涢�夐」
+ </el-button>
+ <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
+ v-show="isCollapsed == 1">鏀惰捣鏇村绛涢�夐」
+ </el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+ style="margin-right: 15px">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-radio-group
- v-model="checkStatus"
- @input="radioChange"
- style="margin: 10px 15px"
- >
+ <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">
<el-radio-button label="0">鏈</el-radio-button>
<el-radio-button label="1">宸叉</el-radio-button>
</el-radio-group>
- <div style="width: 100%; margin-left: 10px; display: flex">
- <div style="width: 36%; margin-right: 30px">
- <el-table
- id="table"
- v-loading="loading"
- ref="tb"
- :data="pictureList"
- highlight-current-row
- :row-class-name="tableRowClassName"
- @current-change="handleCurrentChange"
- border
- height="520px"
- >
+ <el-row :gutter="20">
+ <el-col :span="11">
+ <el-table v-loading="loading" ref="tb" :data="pictureList" highlight-current-row
+ :row-class-name="tableRowClassName" @current-change="handleCurrentChange" border height="520px">
+ <!-- <el-table-column type="selection" width="55" /> -->
<!-- @selection-change="handleSelectionChange" -->
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- min-width="160"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- min-width="80"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="cusSex"
- min-width="50"
- >
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" min-width="160" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" min-width="80" />
+ <el-table-column label="鎬у埆" align="center" prop="cusSex" min-width="50">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
<span v-if="scope.row.cusSex == '1'">濂�</span>
@@ -145,185 +65,105 @@
<!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
<!-- </template> -->
</el-table-column>
- <el-table-column
- label="鎵嬫満鍙�"
- align="center"
- prop="cusPhone"
- min-width="100"
- />
- <el-table-column
- label="濂楅鍚�"
- align="center"
- prop="tcm"
- min-width="100"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjTime"
- min-width="120"
- />
- <el-table-column
- label="瀹℃牳鐘舵��"
- align="center"
- prop="confirmStatus"
- min-width="80"
- >
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="cusPhone" min-width="100" />
+ <el-table-column label="濂楅鍚�" align="center" prop="tcm" min-width="100" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" min-width="120" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="confirmStatus" min-width="80">
<template slot-scope="scope">
- <span
- :style="{
- color:
- scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
- }"
- v-if="scope.row.confirmStatus == '301'"
- >宸查�氳繃</span
- >
- <span
- :style="{
- color:
- scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
- }"
- v-if="scope.row.confirmStatus == '299'"
- >宸查┏鍥�</span
- >
+ <span :style="{
+ color:
+ scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
+ }" v-if="scope.row.confirmStatus == '301'">宸查�氳繃</span>
+ <span :style="{
+ color:
+ scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29',
+ }" v-if="scope.row.confirmStatus == '299'">宸查┏鍥�</span>
</template>
</el-table-column>
</el-table>
- </div>
- <div style="width: 44%; height: 610px">
- <el-table
- v-loading="loading"
- ref="mu"
- :data="tableList"
- :row-class-name="tableRowClassName"
- highlight-current-row
- @selection-change="handleChange"
- border
- style="height: 400px"
- >
- <el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="绉戝"
- align="center"
- prop="deptName"
- min-width="100"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="椤圭洰"
- align="center"
- prop="proName"
- min-width="150"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="type"
- :show-overflow-tooltip="true"
- min-width="100"
- >
+ <div class="pag">
+ <div class="pag1">
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page"
+ :limit.sync="queryParams.pageSize" @pagination="submitForm" />
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <el-table v-loading="loading" ref="mu" :data="tableList" :row-class-name="tableRowClassName"
+ @header-click="handleHeaderClick" highlight-current-row @selection-change="handleChange" border
+ style="height: 400px">
+ <el-table-column type="selection" width="50" align="center">
+ </el-table-column>
+ <el-table-column label="绉戝" align="center" prop="deptName" min-width="100" :show-overflow-tooltip="true" />
+ <el-table-column label="椤圭洰" align="center" prop="proName" min-width="150" :show-overflow-tooltip="true" />
+ <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" min-width="100">
<template slot-scope="scope">
- <span
- v-if="scope.row.type == '0'"
- :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }"
- >
- {{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }}
+ <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>
<span v-if="scope.row.type == '2'">寮冩</span>
<span v-if="scope.row.type == '3'">寤舵湡</span>
</template>
</el-table-column>
- <el-table-column
- label="妫�鏌ユ椂闂�"
- align="center"
- prop="bcupdateTime"
- min-width="160"
- />
+ <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" min-width="160" />
+ <!-- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ :disabled="scope.row.type === 1"
+ :loading="scope.row.isLoading"
+ @click="qijian(scope.row)"
+ >{{ scope.row.type === 0 ? "寮冩" : "鎭㈠" }}</el-button
+ >
+ <el-button size="mini" type="text" @click="yijian(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-column type="selection" width="40" align="center" />
<el-table-column label="鏀惰垂椤圭洰" align="center" prop="proName" />
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
<el-table-column label="椤圭洰缁撴灉" align="center" prop="proResult" /> -->
</el-table>
<div style="margin-top: 10px">
- <el-form
- :model="form"
- ref="queryForm"
- size="small"
- :inline="false"
- label-width="68px"
- >
+ <el-form :model="form" ref="queryForm" size="small" :inline="false" label-width="68px">
<el-form-item label="妫�鏌ユ墍瑙�" prop="proResult">
- <el-input
- v-model="form.proResult"
- clearable
- type="textarea"
- @focus="submiepilog"
- />
+ <el-input v-model="form.proResult" clearable type="textarea" @focus="submiepilog" />
</el-form-item>
<el-form-item label="妫�鏌ョ粨璁�" prop="conclusion">
- <el-input
- v-model="form.conclusion"
- clearable
- type="textarea"
- @focus="submiepilog"
- />
+ <el-input v-model="form.conclusion" clearable type="textarea" @focus="submiepilog" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-picture"
- size="mini"
- @click="tupian"
- >鍥剧墖</el-button
- >
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="submito"
- >鎻愪氦</el-button
- >
+ <el-button type="primary" icon="el-icon-picture" size="mini" @click="tupian">鍥剧墖</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="submito">鎻愪氦</el-button>
</el-form-item>
</el-form>
</div>
+ </el-col>
+ </el-row>
- <!-- <div style="display:flex;margin:15px 0px;width: 100%;">
- <div style="width: 100%;display:flex;">
- <el-button type="primary" class="default-button-style" size="small"
- @click="submiepilog">缁撴灉缁撹</el-button>
- <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="submito">鎻愪氦</el-button>
- </div>
- </div> -->
- </div>
- </div>
<el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="60%">
<!-- :before-close="handleClose" -->
<img src="../../../assets/logo/logo.png" alt="" />
</el-dialog>
- <div style="margin-right: 58%">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="submitForm"
- />
- </div>
- <Public
- ref="aaa"
- :check-status="checkStatus"
- :pro-result="form.proResult"
- :conclusion="form.conclusion"
- @add="handleChanges"
- :project-list="projectList"
- />
+
+ <Public ref="aaa" :check-status="checkStatus" :pro-result="form.proResult" :conclusion="form.conclusion"
+ @add="handleChanges" :project-list="projectList" />
<!-- :last-desc="form.conclusion" -->
</div>
</template>
@@ -377,6 +217,7 @@
// 閫変腑鏁扮粍
ids: [],
CheckBox: {},
+ isCollapsed: 0, // 榛樿涓烘姌鍙犵姸鎬�
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -519,7 +360,26 @@
this.queryParams.beginTime = null;
this.queryParams.endTime = null;
}
-
+ /* getYxJcList(this.queryParams).then((response) => {
+
+ if (response.data) {
+ this.pictureList = response.data.customers;
+ } else {
+ this.$message.warning("鏌ユ棤姝や汉");
+ }
+
+ if (this.pictureList.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.pictureList[0], true);
+ });
+ } else {
+ this.$refs.tb.clearSelection();
+ }
+ this.total = response.data.total;
+
+ this.loading = false;
+ }); */
+
getCompany(this.queryParams).then((response) => {
this.CompanyList = response.data;
this.loading = false;
@@ -563,9 +423,7 @@
},
handleRowClick(row, column, event) {
- // console.log(row, 2323);
this.name = row.proName;
- // console.log(this.name, 99999);
},
// 浣撴鍏徃鎷奸煶鎼滅储
getRemoteData(query) {
@@ -579,6 +437,8 @@
radioChange(value) {
this.loading = true;
this.queryParams.checkStatus = value;
+ this.form.proResult = "";
+ this.form.conclusion = "";
getYxJcList(this.queryParams).then((res) => {
if (res.code == 200) {
this.loading = false;
@@ -602,7 +462,6 @@
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
}); */
@@ -622,7 +481,6 @@
this.resetForm("form");
},
hb() {
- // console.log(this.queryParams.tjNum);
if (this.queryParams.tjNumber != null) {
// this.handleQuery();
this.submitForm();
@@ -665,18 +523,25 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
- // console.log(this.CheckBox, 9999);
+ },
+
+ handleHeaderClick(column, event) {
+ if (column.type === "selection") {
+ // 鏌ユ壘鍏ㄩ�夋骞堕殣钘�
+ const checkbox = event.target.closest(".el-checkbox");
+ if (checkbox) checkbox.style.display = "none";
+ }
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.page = 1;
this.submitForm();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.createTimeList = [];
(this.queryParams = {
- pageNum: 1,
+ page: 1,
pageSize: 10,
tjNumber: null,
compId: null,
@@ -694,6 +559,14 @@
this.loading = true;
},
+ toggleCollapse3() {
+ // this.isCollapsed = !this.isCollapsed; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ this.isCollapsed = 0;
+ },
+ toggleCollapse() {
+ this.isCollapsed = 1; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ },
+
tableRowClassName({ row, rowIndex }) {
for (let i = 0; i < this.selectList.length; i++) {
if (row === this.selectList[i]) {
@@ -709,17 +582,34 @@
this.tableList = [];
return;
}
-
- let tjNumber = val.tjNumber;
this.selectedTjNumber = val.tjNumber;
- this.loading = true;
+ this.changtjNumber(val.tjNumber)
+ },
+
+ changtjNumber(val) {
+ console.log(8989)
+ let tjNumber = val;
+ this.loading = true;
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
this.$nextTick(() => {
- if (this.tableList.length > 0) {
+ const headerCheckbox = this.$refs.mu.$el.querySelector(
+ ".el-table__header .el-checkbox"
+ );
+ if (headerCheckbox) headerCheckbox.style.display = "none";
+ if (this.queryParams.checkStatus == 0) {
+ if (this.tableList.length > 0) {
+ this.tableList.forEach((item, index) => {
+ if (item.type == 0) {
+ const firstRow = item;
+ this.$refs.mu.toggleRowSelection(firstRow, true);
+ this.handleChange([firstRow]);
+ }
+ })
+ }
+ } else {
const firstRow = this.tableList[0];
this.$refs.mu.toggleRowSelection(firstRow, true);
this.handleChange([firstRow]);
@@ -728,7 +618,59 @@
});
},
-
+ // 寮冩鎸夐挳
+ qijian(row) {
+ const tjNUm = this.selectedTjNumber;
+ const proId = row.proId;
+ row.isLoading = true;
+ if (row.type == "2") {
+ huifu(tjNUm, proId).then((res) => {
+ if (res.code == 200) {
+ cSWebGetPro(tjNUm).then((res) => {
+ if (res.code === 200) {
+ // 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
+ this.xiangmuList = res.data;
+ row.isLoading = false;
+ }
+ });
+ }
+ });
+ } else {
+ qijian(tjNUm, proId).then((res) => {
+ if (res.code == 200) {
+ cSWebGetPro(tjNUm).then((res) => {
+ if (res.code === 200) {
+ // 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
+ this.xiangmuList = res.data;
+ this.isLoading = false;
+ }
+ });
+ }
+ });
+ }
+ },
+
+ yijian(row) {
+ const tjNUm = this.selectedTjNumber;
+ const proId = row.proId;
+ row.isLoading = true;
+ yijian(tjNUm, proId)
+ .then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("宸叉鎴愬姛");
+ cSWebGetPro(tjNUm).then((res) => {
+ if (res.code === 200) {
+ this.xiangmuList = res.data;
+ row.isLoading = false;
+ }
+ });
+ }
+ })
+ .catch(() => {
+ row.isLoading = false;
+ });
+ },
+
// 澶氶�夋閫変腑鏁版嵁
/* handleSelectionChange(selection) {
this.imgsrc = selection[0].picturePath;
@@ -790,6 +732,10 @@
});
},
handleChange(selection) {
+ if (selection.length > 1) {
+ let del_row = selection.shift();
+ this.$refs.mu.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
this.projectList = selection.map((item) => ({
proId: item.proId,
proName: item.proName,
@@ -798,16 +744,12 @@
const proId = selection[0].proId;
// 鉁� 纭繚 selectedRow 瀛樺湪涓旀湁 tjNumber
- if (this.selectedRow && this.selectedRow.tjNumber) {
- const tjNumber = this.selectedRow.tjNumber;
- getYxJcXxJg(tjNumber, proId).then((res) => {
- this.form.proResult = res.data.jcsj;
- this.form.conclusion = res.data.jcjl;
- this.$refs.aaa.updateData(res.data.jcsj, res.data.jcjl);
- });
- } else {
- console.warn("selectedRow 鏈噯澶囧ソ锛岃烦杩囨帴鍙ｈ皟鐢�");
- }
+ const tjNumber = this.selectedTjNumber;
+ getYxJcXxJg(tjNumber, proId).then((res) => {
+ this.form.proResult = res.data.jcsj;
+ this.form.conclusion = res.data.jcjl;
+ this.$refs.aaa.updateData(res.data.jcsj, res.data.jcjl);
+ });
// 鉁� 鍚屾椂鏇存柊 selectedRow
this.selectedRow = selection[0];
@@ -815,13 +757,11 @@
},
/* handleChange(selection) {
- // console.log(selection, 123);
if (selection && selection.length > 0) {
const proId = selection[0].proId;
const tjNumber = this.selectedRow.tjNumber;
this.selectedRow = selection[0];
getYxJcXxJg(tjNumber, proId).then((res) => {
- console.log(res, 333);
this.form.proResult = res.data.jcsj;
this.form.conclusion = res.data.jcjl;
});
@@ -842,6 +782,7 @@
tupian() {
this.dialogVisible = true;
},
+
// 纭畾鎸夐挳
submito() {
/* if (this.dataobj) {
@@ -864,16 +805,15 @@
console.error("鏈�変腑琛屾垨缂哄皯 proId");
return;
}
- console.log(this.selectedRow.proId, 96);
const proId = this.selectedRow.proId;
- const jcsj = this.form.proResult; // 鑾峰彇妫�鏌ユ墍瑙�
- const jcjl = this.form.conclusion; // 鑾峰彇妫�鏌ョ粨璁�
+ const jcsj = this.form.proResult || " "; // 鑾峰彇妫�鏌ユ墍瑙�
+ const jcjl = this.form.conclusion || " "; // 鑾峰彇妫�鏌ョ粨璁�
// 纭繚 jcsj 鍜� jcjl 瀛樺湪
- if (!jcsj || !jcjl) {
- console.error("妫�鏌ユ墍瑙佹垨妫�鏌ョ粨璁轰笉鑳戒负绌�");
- return;
- }
+ // if (!jcsj || !jcjl) {
+ // console.error("妫�鏌ユ墍瑙佹垨妫�鏌ョ粨璁轰笉鑳戒负绌�");
+ // return;
+ // }
addYxJcXx({
proId: proId,
@@ -882,11 +822,20 @@
jcjl: jcjl, // 浼犻�掓鏌ョ粨璁�
})
.then((response) => {
- console.log("鎻愪氦鎴愬姛", response);
- this.submitForm();
-
this.form.proResult = "";
this.form.conclusion = "";
+ if (this.tableList.length == 1) {
+ this.submitForm();
+ } else {
+ this.tableList.forEach((item, index) => {
+ if (item.type == 0) {
+ this.changtjNumber(this.selectedTjNumber);
+ } else {
+ this.submitForm();
+ }
+ })
+
+ }
})
.catch((error) => {
console.error("鎻愪氦澶辫触", error);
@@ -894,20 +843,16 @@
},
//鍒犻櫎鎸夐挳
- handleDelete() {},
+ handleDelete() { },
// 瀵煎嚭
- handleExport() {},
+ handleExport() { },
},
};
</script>
<style>
-#table .el-table__header-wrapper .el-checkbox {
- display: none;
-}
-
.default-button-style :hover {
width: 80px;
border-bottom: none;
@@ -969,4 +914,5 @@
float: left;
position: relative;
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index fbeafe1..94197a1 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -288,6 +288,9 @@
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ </el-form-item>
</el-form>
<!-- <div style="color: red; font-size: 8px">
娉ㄩ噴锛氶紶鏍囧乏閿弻鍑婚�変腑琛屽彲鍒犻櫎
@@ -320,9 +323,7 @@
<el-col :span="8" :xs="24">
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
- </el-form-item>
+
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -334,8 +335,8 @@
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
height="478">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230px"/>
+ <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100px"/>
</el-table>
</el-col>
</el-row>
@@ -366,6 +367,9 @@
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
</el-form-item>
</el-form>
<el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
@@ -411,9 +415,7 @@
<el-col :span="7" :xs="24">
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
- </el-form-item>
+
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@@ -426,8 +428,8 @@
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
height="478" style="width: 100%">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230px"/>
+ <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100px"/>
</el-table>
</el-col>
</el-row>
@@ -472,6 +474,9 @@
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ </el-form-item>
</el-form>
<el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="170">
@@ -503,9 +508,7 @@
<el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
- </el-form-item>
+
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -517,7 +520,7 @@
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
height="478">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="288" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230" />
<el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100" />
</el-table>
</el-col>
--
Gitblit v1.8.0