From 2767c4c422c39bb26ee92d5c841b094ce12df4c6 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 19 六月 2025 15:26:49 +0800
Subject: [PATCH] qx
---
src/views/doctor/checkAll/index.vue | 3
src/api/account/contract.js | 38 ++++
src/views/hosp/order/index.vue | 4
vue.config.js | 4
src/views/system/contract/index.vue | 252 +++++++++++++++++++++++++++++--
src/views/system/info/index.vue | 102 +++++++++---
src/views/hosp/project/index.vue | 39 +++-
7 files changed, 381 insertions(+), 61 deletions(-)
diff --git a/src/api/account/contract.js b/src/api/account/contract.js
new file mode 100644
index 0000000..b3d6c5e
--- /dev/null
+++ b/src/api/account/contract.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 鏌ヨ鍚堝悓鍒楄〃
+export function getList(query) {
+ return request({
+ url: '/system/htxxb/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 淇敼鍚堝悓
+export function edithtxxb(data) {
+ return request({
+ url: '/system/htxxb',
+ method: 'put',
+ data: data
+ })
+}
+
+// 鏂板鍚堝悓
+export function addhtxxb(data) {
+ return request({
+ url: '/system/htxxb',
+ method: 'post',
+ data: data
+ })
+}
+
+
+// 鍒犻櫎浣撴椤圭洰寤鸿瑙勫垯鏂拌〃
+export function delhtxxb(id) {
+ return request({
+ url: '/system/htxxb/' + id,
+ method: 'delete'
+ })
+}
+
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 2cd77aa..aef79b7 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -92,7 +92,8 @@
</el-table-column>
<el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
<el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
- <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" />
+ <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 1" />
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 0" />
<!-- <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> -->
<el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" :show-overflow-tooltip="true" width="160px" />
<el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px"
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 3127430..454434d 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -1957,6 +1957,8 @@
this.DataList = [];
this.DataList3 = [];
this.Datalists = [];
+ this.filterText = "",
+ this.filterage = "",
this.TotalPrice1 = 0;
this.orderId = row.orderId;
this.cusId = row.tjCusIdCard;
@@ -2033,6 +2035,8 @@
this.DataList = [];
this.DataList3 = [];
this.Datalists = [];
+ this.filterText = "",
+ this.filterage = "",
this.TotalPrice1 = 0;
this.orderId = this.ids;
this.cusId = this.cusIds;
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 775a846..8a75a61 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -469,11 +469,27 @@
></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏍囨湰绫诲瀷" prop="specimenType">
+ <el-select
+ v-model="form.specimenType"
+ placeholder="璇烽�夋嫨鏍囨湰绫诲瀷"
+ style="width: 200px"
+ filterable
+ clearable
+ >
+ <el-option
+ v-for="dict in dict.type.yblx"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="妫�鏌ラ儴浣�" prop="checkBw">
<el-select
v-model="form.checkBw"
placeholder="璇烽�夋嫨妫�鏌ラ儴浣�"
- style="width: 200px"
+ style="width: 260px"
filterable
clearable
>
@@ -489,7 +505,7 @@
<el-input
v-model="form.proMetering"
placeholder="璇疯緭鍏ュ崟浣�"
- style="width: 260px"
+ style="width: 200px"
/>
</el-form-item>
<el-form-item label="鍙傝�冭寖鍥�" prop="proScope">
@@ -503,14 +519,14 @@
<el-input
v-model="form.sl"
placeholder="璇疯緭鍏ユ暟閲�"
- style="width: 200px"
+ style="width: 260px"
/>
</el-form-item>
<el-form-item label="缁勫悎鏍囧織" prop="sfzhfy">
<el-select
v-model="form.sfzhfy"
placeholder="璇烽�夋嫨鏄惁缁勫悎鏍囧織"
- style="width: 260px"
+ style="width: 200px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
@@ -547,7 +563,7 @@
<el-input
v-model="form.hisXmmc"
placeholder="his椤圭洰鍚嶇О"
- style="width: 200px"
+ style="width: 260px"
></el-input>
</el-form-item>
<el-form-item label="his椤圭洰鍚嶇О" prop="hisXmmc" v-if="key == 'N'">
@@ -561,7 +577,7 @@
<el-input
v-model="form.hisXmbm"
placeholder="璇疯緭鍏is缂栫爜"
- style="width: 260px"
+ style="width: 200px"
/>
</el-form-item>
<el-form-item label="his鍗曚环" prop="hisdj">
@@ -582,14 +598,14 @@
<el-input
v-model="form.lisXmmc"
placeholder="璇疯緭鍏IS椤圭洰"
- style="width: 200px"
+ style="width: 260px"
></el-input>
</el-form-item>
<el-form-item label="LIS缂栫爜" prop="lisXmbm">
<el-input
v-model="form.lisXmbm"
placeholder="璇疯緭鍏is缂栫爜"
- style="width: 260px"
+ style="width: 200px"
/>
</el-form-item>
<el-form-item label="澶囨敞" prop="proRemark">
@@ -603,11 +619,11 @@
<el-input
v-model="form.xh"
placeholder="璇疯緭鍏ユ帓搴�"
- style="width: 200px"
+ style="width: 260px"
/>
</el-form-item>
<el-form-item label="鏄惁鍙備笌寮傚父" prop="sfcyyc">
- <el-select v-model="form.sfcyyc" placeholder="璇烽�夋嫨鏄惁鍙備笌寮傚父" style="width: 260px">
+ <el-select v-model="form.sfcyyc" placeholder="璇烽�夋嫨鏄惁鍙備笌寮傚父" style="width: 200px">
<el-option v-for="dict in dictTypesy" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
@@ -962,6 +978,7 @@
"sys_dict_position",
"tj_result_type",
"sys_yes_no",
+ "yblx",
],
components: { Treeselect, IconSelect, Packagese },
data() {
@@ -1101,7 +1118,7 @@
watch: {
deptName(val) {
this.debounceFilter(val);
- },
+ },
treeId(newVal) {
console.log(newVal,8989)
if (newVal && newVal.length > 0) {
diff --git a/src/views/system/contract/index.vue b/src/views/system/contract/index.vue
index 9ff09a8..d60875e 100644
--- a/src/views/system/contract/index.vue
+++ b/src/views/system/contract/index.vue
@@ -8,7 +8,7 @@
v-show="showSearch"
label-width="68px"
>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-form-item label="鍗曚綅鍚嶇О" v-show="showSearch" prop="company">
<el-select
:remote-method="getRemoteData"
v-model="queryParams.company"
@@ -239,6 +239,28 @@
label-width="80px"
:inline="true"
>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+ <!-- <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" /> -->
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="form.cnName"
+ remote
+ default-first-option
+ allow-create
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @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="htlx">
<el-select
v-model="form.htlx"
@@ -256,7 +278,6 @@
</el-select>
</el-form-item>
-
<el-form-item label="浼佷笟鍚嶇О" prop="qymc">
<el-input
placeholder="璇疯緭鍏ヤ紒涓氬悕绉�"
@@ -265,7 +286,7 @@
></el-input>
</el-form-item>
- <el-form-item label="鍚堝悓閲戦" prop="htje">
+ <el-form-item label="鍚堝悓閲戦" prop="htje">
<el-input
placeholder="璇疯緭鍏ュ悎鍚岄噾棰�"
v-model="form.htje"
@@ -335,8 +356,6 @@
></el-input>
</el-form-item>
-
-
<el-form-item label="缁鏍囧織" prop="xqbz">
<el-input
placeholder="璇疯緭鍏ョ画绛惧悎鍚屾爣蹇�"
@@ -361,7 +380,21 @@
></el-input>
</el-form-item>
-
+ <el-form-item label="寮�绁ㄥ悕绉�" prop="kpmc">
+ <el-input
+ placeholder="璇疯緭鍏ュ紑绁ㄥ悕绉�"
+ v-model="form.kpmc"
+ clearable
+ ></el-input>
+ </el-form-item>
+
+ <el-form-item label="寮�绁ㄧ◣鍙�" prop="kpsh">
+ <el-input
+ placeholder="璇疯緭鍏ュ紑绁ㄧ◣鍙�"
+ v-model="form.kpsh"
+ clearable
+ ></el-input>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input
@@ -379,21 +412,143 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 娣诲姞鍗曚綅瀵硅瘽妗� -->
+ <el-dialog
+ :title="title"
+ :visible.sync="open1"
+ width="1000px"
+ append-to-body
+ >
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="98px"
+ :inline="true"
+ @submit.native.prevent
+ >
+ <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+ <el-input
+ v-model="form.cnName"
+ placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"
+ style="width: 510px"
+ />
+ </el-form-item>
+ <el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="taxNumber">
+ <el-input
+ v-model="form.taxNumber"
+ placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜"
+ style="width: 510px"
+ />
+ </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-form-item>
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+ </el-form-item>
+
+ <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+ <el-input
+ v-model="form.registerAddress"
+ placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+ style="width: 830px"
+ />
+ </el-form-item>
+ <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+ <el-input
+ v-model="form.mailingAddress"
+ placeholder="璇疯緭鍏ラ�氳鍦板潃"
+ style="width: 830px"
+ />
+ </el-form-item>
+
+ <br />
+ <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+ <el-input
+ v-model="form.bankAccount"
+ placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
+ style="width: 510px"
+ />
+ </el-form-item>
+ <el-form-item label="閾惰璐︽埛" prop="countNum">
+ <el-input
+ v-model="form.countNum"
+ placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
+ style="width: 510px"
+ />
+ </el-form-item>
+ <el-form-item label="鑱旂郴閭" prop="email">
+ <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
+ <el-form-item label="璐熻矗浜�" prop="principal">
+ <el-input v-model="form.principal" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" />
+ </el-form-item>
+ <el-form-item label="缃戝潃" prop="url">
+ <el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+ </el-form-item>
+
+ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+ <el-select
+ filterable
+ v-model="form.areaName"
+ placeholder="璇烽�夋嫨琛屾斂鍖哄垝鍚嶇О"
+ clearable
+ style="width: 198px"
+ >
+ <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="remark">
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :rows="2"
+ label-width="400px"
+ style="width: 830px"
+ resize="none"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm1">纭� 瀹�</el-button>
+
+ <el-button @click="cancel1">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
-// import { getList, addhtxxb, edithtxxb, delhtxxb } from "@/api/account/contract";
-import { getZybCompList, queryCompany, getconfigKey, getCompany } from "@/api/team/tuanti";
+import { getList, addhtxxb, edithtxxb, delhtxxb } from "@/api/account/contract";
+import {
+ getZybCompList,
+ queryCompany,
+ getconfigKey,
+ getCompany,
+} from "@/api/team/tuanti";
import {
- addDept,
addComp,
+ updateComp,
Deptlist,
- getDwAndDwDept,
- newExcelImport,
} from "@/api/system/comp";
export default {
@@ -402,6 +557,16 @@
dicts: ["sys_type_contract"],
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback("");
+ } else if (value != undefined && value != "") {
+ return callback();
+ } else if (!patter.test(value)) {
+ return callback("");
+ }
+ };
return {
// 閬僵灞�
@@ -442,6 +607,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ open1: false,
objs: {
drugManufacturerId: "",
@@ -478,6 +644,14 @@
trigger: "blur",
},
],
+ cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+ contactPerson: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ contactPhone: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+
},
};
},
@@ -492,7 +666,7 @@
getList() {
this.loading = true;
- /* getList(this.queryParams).then((response) => {
+ getList(this.queryParams).then((response) => {
for (let i = 0; i < response.rows.length; i++) {
response.rows[i].newID = i + 1;
}
@@ -500,9 +674,9 @@
this.dataList = response.rows;
this.loading = false;
- }); */
+ });
- // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
getCompany(this.queryParam).then((response) => {
this.CompanyList = response.data;
});
@@ -522,18 +696,19 @@
});
},
- // 浣撴鍏徃鎷奸煶鎼滅储
+ // 浣撴鍏徃鎷奸煶鎼滅储
getRemoteData(query) {
if (query) {
let compName = query;
queryCompany(compName).then((response) => {
- console.log(response,123);
-
+ console.log(response, 123);
+
this.CompanyList = response.data;
});
}
},
+
idFn1(value) {
if (value) {
this.form.dictCompId = value;
@@ -549,7 +724,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd1() {
this.reset();
- this.open = true;
+ this.open1 = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
@@ -558,7 +733,39 @@
cancel() {
this.open = false;
this.reset();
- // this.getList();
+ // this.getList();
+ },
+ cancel1(){
+ this.open1 = false;
+ },
+
+ /** 鎻愪氦鎸夐挳 */
+ submitForm1() {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ if (this.form.drugManufacturerId != null) {
+ updateComp(this.form).then((response) => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open1 = false;
+ this.getList();
+ });
+ } else {
+ if (
+ this.form.cnName &&
+ this.form.contactPerson &&
+ this.form.contactPhone
+ ) {
+ addComp(this.form).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open1 = false;
+ this.getList();
+ });
+ } else {
+ this.$modal.msgError("璇峰～鍐欏繀浼犻」");
+ }
+ }
+ }
+ });
},
// 鎼滅储
@@ -679,7 +886,7 @@
this.open = true;
- this.title = "鍚堝悓淇℃伅璇︽儏";
+ this.title = "娣诲姞鍚堝悓淇℃伅璇︽儏";
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -692,6 +899,11 @@
this.open = true;
this.title = "鍚堝悓淇℃伅璇︽儏";
+
+ /* this.form = {
+ ...row,
+ cnName: row.drugManufacturerId, // 纭繚杩欓噷鏄� ID
+ }; */
},
handleDelete(row) {
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 844d82b..1af767f 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -36,7 +36,8 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery" style="margin:0 15px;"
+ @click="handleQuery"
+ style="margin: 0 15px"
>鎼滅储</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
@@ -115,7 +116,12 @@
/>
<el-table-column label="宸" align="center" prop="difference" />
<el-table-column label="绛剧害浜�" align="center" prop="payer" />
- <el-table-column label="棰勭害鏃堕棿" align="center" prop="createTime" />
+ <el-table-column
+ label="棰勭害鏃堕棿"
+ align="center"
+ prop="createTime"
+ :formatter="formatDate"
+ />
</el-table>
<el-form
@@ -126,7 +132,7 @@
label-width="100px"
>
<el-row>
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="璐熻矗浜�" style="display: flex">
<el-input
v-model="formInline.payer"
@@ -134,12 +140,12 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="浜ゆ槗閲戦" style="display: flex">
<el-input v-model="formInline.price" placeholder="閲戦"></el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="浜ゆ槗绫诲瀷" prop="payType" style="display: flex">
<el-select
v-model="formInline.payType"
@@ -154,23 +160,66 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="4">
+ <el-form-item style="display: flex">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="SubmitEvent"
+ style="margin: 0 15px"
+ >鏀惰垂</el-button
+ >
+ </el-form-item>
+ </el-col>
+ <!-- <el-col :span="7">
<el-form-item>
- <el-button type="primary" size="mini" @click="SubmitEvent" style="margin:0 15px;"
+ <el-button
+ type="primary"
+ size="mini"
+ @click="SubmitEvent"
+ style="margin: 0 15px"
>鏀惰垂</el-button
>
<el-button type="primary" size="mini" @click="handleDelete"
>閫�璐�</el-button
>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
+ <el-button-group style="margin-left: 20px; margin-top: 20px">
+ <el-button type="primary" size="mini">宸叉鏈粨璐︿汉鍛�</el-button>
+ <el-button type="primary" size="mini">鏈浜哄憳</el-button>
+ <el-button type="primary" size="mini">鍏ㄩ儴浜哄憳</el-button>
+ </el-button-group>
+
<el-row :gutter="20">
+ <el-col :span="12" :xs="24" style="padding: 0px 20px">
+ <div class="tj">
+ <span class="tj_txt">浣撴浜哄憳鎯呭喌琛�</span>
+ </div>
+
+ <el-table
+ v-loading="loading"
+ :data="peopleList"
+ border
+ max-height="260px"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="搴忓彿" align="center" prop="newID" />
+ <el-table-column label="濮撳悕" align="center" prop="name" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" />
+ <el-table-column label="鐢佃瘽" align="center" prop="iphone" />
+ <el-table-column label="鐘舵��" align="center" prop="tjStatus" />
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime">
+ </el-table-column>
+ </el-table>
+ </el-col>
+
<el-col :span="12" :xs="24">
<div class="tj">
- <span class="tj_txt">宸茬即璐硅褰�</span>
+ <span class="tj_txt">宸茬粨璐﹁褰�</span>
</div>
<el-table
@@ -192,24 +241,11 @@
<el-table-column label="浜ゆ槗浜哄憳" align="center" prop="payer" />
<el-table-column label="鎿嶄綔浜哄憳" align="center" prop="payee">
</el-table-column>
- <el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="createTime" />
- </el-table>
- </el-col>
- <el-col :span="12" :xs="24" style="padding: 0px 20px">
- <div class="tj">
- <span class="tj_txt">浣撴浜哄憳鎯呭喌琛�</span>
- </div>
-
- <el-table
- v-loading="loading"
- :data="peopleList"
- border
- max-height="260px"
- >
- <el-table-column label="搴忓彿" align="center" prop="newID" />
- <el-table-column label="濮撳悕" align="center" prop="name" />
- <el-table-column label="鐘舵��" align="center" prop="tjStatus" />
- <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime">
+ <el-table-column label="缁撹处鏃堕棿" align="center" prop="createTime" />
+ <el-table-column label="鎿嶄綔" align="center">
+ <template>
+ <el-button type="primary">鎾ら攢缁撹处</el-button>
+ </template>
</el-table-column>
</el-table>
</el-col>
@@ -295,6 +331,14 @@
},
methods: {
/** 鏌ヨ浣撴鍗曚綅缂磋垂鏄庣粏鍒楄〃 */
+ formatDate(row) {
+ if (!row.createTime) return "";
+ const date = new Date(row.createTime);
+ const year = date.getFullYear();
+ const month = (date.getMonth() + 1).toString().padStart(2, "0");
+ const day = date.getDate().toString().padStart(2, "0");
+ return `${year}-${month}-${day}`;
+ },
getList() {
// this.loading = true;
// listInfo(this.queryParams).then(response => {
@@ -396,7 +440,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- console.log(2222)
+ console.log(2222);
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
@@ -431,7 +475,7 @@
});
}
});
- console.log(11111)
+ console.log(11111);
if (this.teamNo) {
getTeamTjPeopleList(this.teamNo).then((res) => {
if (res.data) {
diff --git a/vue.config.js b/vue.config.js
index ae33049..792b37d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -54,6 +54,10 @@
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
// target: `http://192.168.1.99:5012`,
+<<<<<<< HEAD
+=======
+ // target: `http://192.168.1.2:5011`,
+>>>>>>> 37c5fa644553d6e24c729b62408e631a8c50e379
target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
--
Gitblit v1.8.0