From ba6e43f9c2b2c4724b961e584de89546b4b21f32 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期三, 13 九月 2023 16:01:20 +0800
Subject: [PATCH] su
---
src/views/sampling/sampling/index.vue | 221 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 170 insertions(+), 51 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 7006297..ef9aba1 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -1,18 +1,43 @@
<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"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="浣撴鍙�" prop="tjNum">
- <el-input v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable @keyup.enter.native="handleQuery"
- style="width: 170px" />
+ <el-input
+ v-model="queryParams.tjNum"
+ placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ 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-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 110px"
+ />
</el-form-item>
<el-form-item label="鐢宠鏃堕棿" prop="applicationTime">
- <el-date-picker clearable v-model="createTimeList" @change="dateChangebirthday1" style="width: 240px"
- value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
- :picker-options="pickerOptions"></el-date-picker>
+ <el-date-picker
+ v-model="createTimeList"
+ @change="dateChangebirthday1"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions"
+ ></el-date-picker>
</el-form-item>
<!-- <el-form-item label="鏄惁閲囨牱" prop="isSignFor">
<el-select style="width:100px" v-model="queryParams.isSignFor" placeholder="鏄惁閲囨牱">
@@ -32,33 +57,84 @@
<el-input v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable @keyup.enter.native="handleQuery" style="width: 140px;"/>
</el-form-item> -->
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鏌ヨ</el-button>
- <el-button type="primary" icon="el-icon-thumb" size="mini" @click="Confirmreceipt">纭閲囨牱</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鏌ヨ</el-button
+ >
+ <el-button
+ type="primary"
+ icon="el-icon-thumb"
+ size="mini"
+ @click="Confirmreceipt"
+ >纭閲囨牱</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
- <el-radio-group v-model="tjStatus" @input="radioChange" style="margin: 10px 15px">
+ <el-radio-group
+ v-model="tjStatus"
+ @input="radioChange"
+ style="margin: 10px 15px"
+ >
<el-radio-button label="1">鏈噰鏍�</el-radio-button>
<el-radio-button label="0">宸查噰鏍�</el-radio-button>
</el-radio-group>
<div style="width: 100%; margin-left: 10px; display: flex">
<div style="width: 40%; margin-right: 20px">
- <el-table id="ta" v-loading="loading" ref="tb" :data="samplingList" @selection-change="handleSelectionChange"
- border height="520px" :row-class-name="tableRowClassName">
+ <el-table
+ id="ta"
+ v-loading="loading"
+ ref="tb"
+ :data="samplingList"
+ @selection-change="handleSelectionChange"
+ border
+ height="520px"
+ :row-class-name="tableRowClassName"
+ >
<el-table-column type="selection" width="40" align="center" />
- <el-table-column label="浣撴鍙�" align="center" prop="customer.tjNumber" width="160px" />
- <el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="80px" />
- <el-table-column label="鎬у埆" align="center" prop="customer.cusSex" width="60px">
+ <el-table-column
+ label="浣撴鍙�"
+ align="center"
+ prop="customer.tjNumber"
+ width="160px"
+ />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ prop="customer.cusName"
+ width="80px"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="customer.cusSex"
+ width="60px"
+ >
<template slot-scope="scope">
<!-- {{scope.row.customer.cusSex}} -->
{{ scope.row.customer.cusSex === 0 ? "鐢�" : "濂�" }}
<!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> -->
</template>
</el-table-column>
- <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="120px" />
- <el-table-column label="鐢宠鏃堕棿" align="center" prop="customer.applicationTime" width="210">
+ <el-table-column
+ label="鎵嬫満鍙�"
+ align="center"
+ prop="customer.cusPhone"
+ width="120px"
+ />
+ <el-table-column
+ label="鐢宠鏃堕棿"
+ align="center"
+ prop="customer.applicationTime"
+ width="210"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.customer.applicationTime) }}</span>
</template>
@@ -66,8 +142,16 @@
</el-table>
</div>
<div style="width: 50%">
- <el-table v-loading="loading" :data="tableList" :span-method="objectSpanMethod" @selection-change="handleChange"
- border height="520px" ref="tab1" :row-class-name="tableRowClassName">
+ <el-table
+ v-loading="loading"
+ :data="tableList"
+ :span-method="objectSpanMethod"
+ @selection-change="handleChange"
+ border
+ height="520px"
+ ref="tab1"
+ :row-class-name="tableRowClassName"
+ >
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
<!-- <el-table-column label="鏄惁绛炬敹" align="center" prop="isSignFor" /> -->
@@ -76,18 +160,29 @@
<span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
- <el-table-column label="鏍囨湰绫诲瀷" align="center" prop="specimenType">
+ <el-table-column label="鏍囨湰绫诲瀷" align="center" prop="specimenType" width="120">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_dict_specimen" :value="scope.row.specimenType" />
+ <dict-tag
+ :options="dict.type.sys_dict_specimen"
+ :value="scope.row.specimenType"
+ />
</template>
</el-table-column>
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column label="鎬у埆" align="center" prop="proSex" />
- <el-table-column label="绌鸿吂" align="center" prop="isEat" />
- <el-table-column label="閲囨牱缂栧彿" align="center" prop="samplingNumber" />
- <el-table-column label="閲囨牱鐘舵��" align="center" prop="isSignFor">
+ <el-table-column label="鎬у埆" align="center" prop="proSex" width="90" />
+ <el-table-column label="绌鸿吂" align="center" prop="isEat" width="90" />
+ <el-table-column
+ label="閲囨牱缂栧彿"
+ align="center"
+ prop="samplingNumber"
+ :show-overflow-tooltip="true" width="120"
+ />
+ <el-table-column label="閲囨牱鐘舵��" align="center" prop="isSignFor" width="90">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sampling_type" :value="scope.row.isSignFor" />
+ <dict-tag
+ :options="dict.type.sampling_type"
+ :value="scope.row.isSignFor"
+ />
</template>
</el-table-column>
<!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -113,8 +208,13 @@
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :pager-count="5" :current-page.sync="currentPage1" :current-page="page"
:page-sizes="pageSize" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> -->
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
</div>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�閲囨牱绠＄悊瀵硅瘽妗� -->
@@ -285,23 +385,28 @@
this.queryParams.endTime = this.createTimeList[1];
getList(this.queryParams).then((response) => {
if (response.data) {
- this.samplingList = response.data.list;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
+ if (response.data.list == null) {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
} else {
- this.$refs.tb.clearSelection();
+ this.samplingList = response.data.list;
+ this.loading = false;
+ if (this.samplingList.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
+ });
+ } else {
+ this.$refs.tb.clearSelection();
+ }
}
this.total = response.data.total;
this.loading = false;
} else {
- this.samplingList = []
- this.tableList = []
+ this.samplingList = [];
+ this.tableList = [];
this.loading = false;
}
-
-
});
},
@@ -384,7 +489,7 @@
// },
// 纭畾鎸夐挳
- submitForm() { },
+ submitForm() {},
// 纭閲囨牱
Confirmreceipt() {
@@ -400,16 +505,30 @@
this.loading = true;
this.queryParams.isSignFor = value;
getList(this.queryParams).then((response) => {
- this.samplingList = response.data.list;
- if (this.samplingList.length != 0) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
- });
- } else {
- this.$refs.tb.clearSelection();
+
+ if (response.data) {
+ if (response.data.list == null) {
+ this.samplingList = [];
+ this.tableList = [];
+ this.loading = false;
+ } else {
+ this.samplingList = response.data.list;
+ this.loading = false;
+ if (this.samplingList.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.samplingList[0], true);
+ });
+ } else {
+ this.$refs.tb.clearSelection();
+ }
+ }
+ this.total = response.data.total;
+ this.loading = false;
+ }else{
+ this.samplingList= [];
+ this.tableList = [];
+ this.loading = false;
}
- this.total = response.data.total;
- this.loading = false;
});
},
@@ -435,7 +554,7 @@
},
// 瀵煎嚭
- handleExport() { },
+ handleExport() {},
},
};
</script>
--
Gitblit v1.8.0