From 5a9be998d3dc8097d19d6f4833c0538c34bd6dcb Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 09 一月 2025 10:29:18 +0800
Subject: [PATCH] 111
---
src/views/system/comp/index.vue | 359 +++++++++++++++++++++--------------------------------------
1 files changed, 127 insertions(+), 232 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 8afc583..af48456 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1,6 +1,7 @@
<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"
+ @submit.native.prevent>
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input ref="inputName" v-model="queryParams.cnName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" clearable
@keyup.enter.native="handleQuery" />
@@ -44,43 +45,15 @@
<el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" />
<el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" />
- <!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/>
- </template>
-</el-table-column> -->
+
<el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" />
<el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" />
<el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" />
<el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" />
- <!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="缁忚惀璁稿彲璇佸彿" align="center" prop="businessLicenseNumber" /> -->
- <!-- <el-table-column label="GMP鏈夋晥鎴鏃ユ湡" align="center" prop="gmpDeadlineDate" width="110px" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.gmpDeadlineDate, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="GMP寤剁画鏃ユ湡" align="center" prop="gmpDelayDate" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.gmpDelayDate, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="GMP璇佷功鍥剧墖(base64缂栫爜)" align="center" prop="gmpPhoto" width="100">
- <template slot-scope="scope">
- <image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/>
- </template>
- </el-table-column> -->
+
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
- <!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column> -->
+
<el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" />
<el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true">
<template slot-scope="scope">
@@ -88,16 +61,7 @@
</template>
</el-table-column>
<el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" />
- <!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/>
- </template>
- </el-table-column> -->
- <!-- <el-table-column label="鏈夋晥鏃堕棿" align="center" prop="validTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column> -->
+
<el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -120,7 +84,7 @@
<el-row :gutter="20">
<el-col :span="7" :xs="24">
<div style="padding: 0 20px">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true" @submit.native.prevent>
<el-form-item label="濂楅鍚嶇О" prop="dwDeptName">
<el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ュ椁愬悕绉�" />
</el-form-item>
@@ -146,7 +110,7 @@
</div>
</el-col>
<el-col :span="17" :xs="24">
- <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true">
+ <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true" @submit.native.prevent>
<el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
<el-input v-model="forms.groupingName" placeholder="璇疯緭鍏ュ垎缁勫悕绉�" style="width: 130px"
@focus="changegroupingName" />
@@ -238,23 +202,25 @@
<!-- 濂楅 -->
<div>
- <el-dialog :title="title" :visible.sync="openss" width="1400px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="openss" width="1400px" :style="{ height: 1400 + 'px' }" append-to-body
+ :close-on-click-modal="false">
<el-row :gutter="24">
<el-col :span="8" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+ @submit.native.prevent>
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
@keyup.enter.native="handleSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
- <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
+
</el-form-item>
</el-form>
<el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
height="478">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+ <el-table-column label="搴忓彿" align="center" prop="pacId" width="50px" />
<el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
<template slot-scope="scope">
{{ scope.row.pacName + "/" + scope.row.price }}
@@ -264,7 +230,7 @@
</el-col>
<el-col :span="6" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
- style="height: 35px">
+ @submit.native.prevent>
<el-form-item label="鍚堣" prop="price">
<el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
@@ -277,9 +243,9 @@
</div> -->
<!-- @row-dblclick="dbclick" -->
<el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
- <el-table-column label="椤圭洰鍚嶇О/浠锋牸/鍏�" align="center" prop="proName">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName">
<template slot-scope="scope">
- {{ scope.row.proName + "/" + scope.row.proPrice }}
+ {{ scope.row.proName }}
</template>
</el-table-column>
@@ -298,7 +264,7 @@
</el-col>
<el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="68px">
+ label-width="68px" @submit.native.prevent>
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -326,15 +292,15 @@
<el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
<el-row :gutter="24" v-if="!isTableVisible">
- <el-col :span="11" :xs="24">
+ <el-col :span="15" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
- style="height: 35px">
+ style="height: 35px" @submit.native.prevent>
<el-form-item label="鍘熶环">
<el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
<el-form-item label="浼樻儬">
<el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="2" :step="0.1"
- :max="10" :min="1" @change="numberChange"></el-input-number>
+ :min="0" @change="numberChange"></el-input-number>
</el-form-item>
<el-form-item label="鐜颁环">
<el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
@@ -345,14 +311,14 @@
</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">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="486">
<template slot-scope="scope">
- {{ scope.row.proName + "/" + scope.row.proPrice }}
+ {{ scope.row.proName }}
</template>
</el-table-column>
- <el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
- <el-table-column label="鎶樻墸">
+ <el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
+ <el-table-column label="鎶樻墸" width="85">
<template slot-scope="scope">
<!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
<el-input v-model.number="scope.row.limits" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸"
@@ -360,8 +326,8 @@
</el-input>
</template>
</el-table-column>
- <el-table-column label="鐜颁环" align="center" prop="ysPrice"></el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="68">
+ <el-table-column label="鐜颁环" align="center" prop="ysPrice" width="85"></el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="85">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete"
@click="handledbelete(scope.row)">鍒犻櫎</el-button>
@@ -376,9 +342,9 @@
璁�</el-button>
</div>
</el-col>
- <el-col :span="11" :xs="24">
+ <el-col :span="7" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="68px">
+ label-width="68px" @submit.native.prevent>
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -388,7 +354,7 @@
</el-form-item>
</el-form>
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
- height="478" style="width: 70%">
+ 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" />
@@ -397,31 +363,39 @@
</el-row>
<!-- -=----------------------------------------------------- -->
<el-row :gutter="24" v-else>
- <el-col :span="8" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+ <el-col :span="6" :xs="24">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"
+ @submit.native.prevent>
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
@keyup.enter.native="handleSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
- <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
</el-form-item>
</el-form>
<el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
- height="478">
- <el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+ height="483">
+ <!-- <el-table-column type="selection" width="40px" align="center" /> -->
+
+ <el-table-column label="搴忓彿" align="center" prop="newID" width="50px">
+ <template slot-scope="scope">
+ {{ scope.row.newID }}
+ </template>
+ </el-table-column>
+
<el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
<template slot-scope="scope">
{{ scope.row.pacName + "/" + scope.row.price }}
</template>
</el-table-column>
</el-table>
+ <div style="font-size: 16px;margin-top: 10px;">椤圭洰鎬绘潯鏁帮細<span style="font-weight: 700;margin-right: 5px;">{{
+ newpacName.length }}</span>鏉�</div>
</el-col>
- <el-col :span="6" :xs="24">
+ <el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
- style="height: 35px">
+ style="height: 51px" @submit.native.prevent>
<el-form-item label="鍚堣" prop="price">
<el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
@@ -430,10 +404,10 @@
</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">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="170">
<template slot-scope="scope">
- {{ scope.row.proName + "/" + scope.row.proPrice }}
+ {{ scope.row.proName }}
</template>
</el-table-column>
<el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
@@ -449,12 +423,12 @@
<div style="margin: 240% 16%">
<el-button type="primary" size="medium " icon="el-icon-back"
style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;"
- @click="resetright">纭</el-button>
+ @click="resetright">纭� 璁�</el-button>
</div>
</el-col>
<el-col :span="8" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="68px">
+ label-width="68px" @submit.native.prevent>
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -464,9 +438,9 @@
</el-form-item>
</el-form>
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
- height="478" style="width: 70%">
+ height="478">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="130" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="288" />
<el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100" />
</el-table>
</el-col>
@@ -481,7 +455,7 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
<div class="dia">
<el-dialog :title="title" :visible.sync="open" width="1340px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true">
+ <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true" @submit.native.prevent>
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width: 520px" />
</el-form-item>
@@ -501,9 +475,6 @@
<el-input v-model="form.faxNumber" 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="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px" />
@@ -530,86 +501,12 @@
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
<el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
</el-form-item>
- <!-- <el-form-item label="浼佷笟绫诲瀷" prop="typeOfEnterprise">
- <el-select v-model="form.typeOfEnterprise" placeholder="璇烽�夋嫨浼佷笟绫诲瀷">
- <el-option
- v-for="dict in dict.type.dict_comp_type"
- :key="dict.value"
- :label="dict.label"
-:value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item> -->
- <!-- <el-form-item label="琛屾斂鍖哄垝id" prop="areaid">
- <el-input v-model="form.areaid" placeholder="璇疯緭鍏ヨ鏀垮尯鍒抜d" />
- </el-form-item> -->
- <!-- <el-form-item label="GMP璇佷功缂栧彿" prop="gmpNo">
- <el-input v-model="form.gmpNo" placeholder="璇疯緭鍏MP璇佷功缂栧彿" />
- </el-form-item> -->
- <!-- <el-form-item label="GMP鍙戣瘉鏃ユ湡" prop="gmpissueDate">
- <el-date-picker clearable
- v-model="form.gmpissueDate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨GMP鍙戣瘉鏃ユ湡">
- </el-date-picker>
- </el-form-item> -->
- <!-- <el-form-item label="缁忚惀璁稿彲璇佸彿" prop="businessLicenseNumber">
- <el-input v-model="form.businessLicenseNumber" placeholder="璇疯緭鍏ョ粡钀ヨ鍙瘉鍙�" />
- </el-form-item> -->
- <!-- <el-form-item label="GMP鏈夋晥鎴鏃ユ湡" prop="gmpDeadlineDate">
- <el-date-picker clearable
- v-model="form.gmpDeadlineDate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨GMP鏈夋晥鎴鏃ユ湡">
- </el-date-picker>
- </el-form-item> -->
- <!-- <el-form-item label="GMP璁よ瘉鑼冨洿" prop="gmpRange">
- <el-input v-model="form.gmpRange" placeholder="璇疯緭鍏MP璁よ瘉鑼冨洿" />
- </el-form-item> -->
- <!-- <el-form-item label="GMP寤剁画鑼冨洿" prop="gmpDelayRange">
- <el-input v-model="form.gmpDelayRange" placeholder="璇疯緭鍏MP寤剁画鑼冨洿" />
- </el-form-item> -->
- <!-- <el-form-item label="GMP寤剁画鏃ユ湡" prop="gmpDelayDate">
- <el-date-picker clearable
- v-model="form.gmpDelayDate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨GMP寤剁画鏃ユ湡">
- </el-date-picker>
- </el-form-item> -->
- <!-- <el-form-item label="GMP璇佷功鍥剧墖(base64缂栫爜)">
- <image-upload v-model="form.gmpPhoto"/>
- </el-form-item> -->
- <!-- <el-form-item label="鎺掑簭" prop="orderNum">
- <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
- </el-form-item> -->
- <!-- <el-form-item label="鏁版嵁鐘舵��(PT10.00.004)" prop="effective">
- <el-select v-model="form.effective" placeholder="璇烽�夋嫨鏁版嵁鐘舵��(PT10.00.004)">
- <el-option
- v-for="dict in dict.type.dict_data_status"
- :key="dict.value"
- :label="dict.label"
-:value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item> -->
- <!-- <el-form-item label="鎷奸煶" prop="spell">
- <el-input v-model="form.spell" 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-form-item>
- <!-- <el-form-item label="浜旂瑪绠�鐮�" prop="wbm">
- <el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" />
- </el-form-item> -->
+
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -754,31 +651,7 @@
contactPhone: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
- // taxNumber: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // legalPerson: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // registerAddress: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // bankAccount: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // countNum: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // principal: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // faxNumber: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // mailingAddress: [
- // { required: true, validator: checkPhoneNum, trigger: "blur" },
- // ],
- // email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+
},
};
},
@@ -897,9 +770,10 @@
this.handleQuery();
},
resetQuerys() {
- (this.OnenewpacName = []),
- (this.queryParams.price = 0),
- this.$refs.tbone.toggleRowSelection(this.pacList[0], false);
+ this.OnenewpacName = [],
+ this.queryParams.price = 0,
+ this.queryParams.xianprice = 0,
+ this.youhui = 0
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -925,18 +799,7 @@
this.GroupUpdate();
}
- /* if (this.selectionList.length) {
- // 濡傛灉绗竴涓〃鏍兼湁閫変腑椤癸紝閫変腑绗簩涓〃鏍煎搴旂殑鏁版嵁
- const selectedDeptId = this.selectionList[0].id; // 鍋囪姣忎釜椤规湁涓�涓敮涓�鐨� id
- const correspondingGroups = this.groupingList.filter(
- (group) => group.deptId === selectedDeptId
- );
- this.groupList = correspondingGroups;
- } else {
- // 濡傛灉娌℃湁閫変腑浠讳綍椤癸紝娓呯┖绗簩涓〃鏍肩殑閫変腑椤�
- this.groupList = [];
- this.$refs.tbs.clearSelection();
- } */
+
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -993,7 +856,7 @@
return sum.plus(new Big(item.ysPrice || '0'));
}, new Big(0));
})
- // ----------------------------------------------------------
+
})
.catch(() => {
@@ -1016,6 +879,8 @@
this.loading = true;
if (this.forms.sex) {
deptTreeSelect(this.forms.sex).then((response) => {
+ console.log('111', response.rows);
+
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1028,6 +893,7 @@
});
} else {
deptTreeSelect().then((response) => {
+ console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1041,13 +907,17 @@
}
getProjectList().then((response) => {
this.Treedata = response.data;
-
});
},
-
+ getpro() {
+ getProjectList().then((response) => {
+ this.Treedata = response.data;
+ });
+ },
handleSearch() {
if (this.queryParams.pacName) {
getPackageList(this.queryParams.pacName).then((response) => {
+ console.log('333', response.data);
this.newpacName = response.data;
response.data.forEach((item, index) => {
item.newID =
@@ -1058,6 +928,7 @@
});
} else {
deptTreeSelect().then((response) => {
+ console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -1077,13 +948,14 @@
},
handleSearchFor() {
getProjectList(this.queryParams.proName).then((response) => {
- this.Treedata = response.data;
+
response.data.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
index +
1;
});
+ this.Treedata = response.data;
});
},
// 鍗曢」鏁版嵁鑾峰彇
@@ -1093,43 +965,52 @@
}
},
resetright() {
- this.queryParams.price = 0;
- this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
- this.youhui = 0; // 鍒濆鍖栦紭鎯�
+ if (this.dataList.length == 0) {
+ return; // 濡傛灉鏁版嵁鍒楄〃涓虹┖锛岀洿鎺ヨ繑鍥�
+ } else {
+ this.queryParams.price = 0; // 鍒濆鍖栨�讳环
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
- const newItemsToAdd = [];
+ const newItemsToAdd = []; // 鐢ㄤ簬瀛樺偍鏂伴渶瑕佹坊鍔犵殑椤圭洰
- this.dataList.forEach((item) => {
- this.$refs.tre.toggleRowSelection(item, false);
- // 浣跨敤 $set 纭繚鍝嶅簲鎬�
- this.$set(item, 'limits', 10);
- this.$set(item, 'ysPrice', item.proPrice);
+ this.dataList.forEach((item) => {
+ this.$refs.tre.toggleRowSelection(item, false); // 鍙栨秷閫変腑鐘舵��
+ // 浣跨敤 $set 纭繚鍝嶅簲鎬�
+ this.$set(item, 'limits', 10); // 璁剧疆闄愬埗鏁伴噺
+ this.$set(item, 'ysPrice', item.proPrice); // 璁剧疆鐜颁环涓哄師浠�
- // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
- const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
- if (!existingItem) {
- newItemsToAdd.push(item);
- this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
- }
- });
+ // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
+ const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
+ if (!existingItem) {
+ newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁�
+ this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
+ }
+ });
- // 娣诲姞鏂伴」鐩埌 OnenewpacName
- this.OnenewpacName.push(...newItemsToAdd);
+ // 娣诲姞鏂伴」鐩埌 OnenewpacName
+ this.OnenewpacName.push(...newItemsToAdd);
- // 鍒犻櫎閲嶅椤圭洰锛岃繖閲屾垜浠彧闇�澶勭悊鏂版坊鍔犵殑椤圭洰鍜屽師鏈夐」鐩箣闂寸殑閲嶅
- for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
- for (let j = i + 1; j < this.OnenewpacName.length; j++) {
- if (this.OnenewpacName[i].proId === this.OnenewpacName[j].proId) {
- this.OnenewpacName.splice(j, 1);
- j--;
+ // 鍒犻櫎閲嶅椤圭洰锛岃繖閲屾垜浠彧闇�澶勭悊鏂版坊鍔犵殑椤圭洰鍜屽師鏈夐」鐩箣闂寸殑閲嶅
+ for (let i = this.OnenewpacName.length - newItemsToAdd.length; i < this.OnenewpacName.length - 1; i++) {
+ for (let j = i + 1; j < this.OnenewpacName.length; j++) {
+ if (this.OnenewpacName[i].proId === this.OnenewpacName[j].proId) {
+ this.OnenewpacName.splice(j, 1); // 鍒犻櫎閲嶅鐨勯」鐩�
+ j--; // 鍥犱负鍒犻櫎浜嗕竴涓厓绱狅紝褰撳墠鐨刯瑕佸噺1
+ }
}
}
- }
+ this.queryParams.price = 0
+ this.queryParams.xianprice = 0
+ // 閲嶆柊璁＄畻鎬讳环鍜岀幇浠�
+ this.OnenewpacName.forEach((item) => {
+ this.queryParams.price += item.proPrice; // 绱姞鍘熶环
+ this.queryParams.xianprice += item.ysPrice || 0; // 绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
+ });
- this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
- })
+ // 璁＄畻浼樻儬锛岃繖閲屽亣璁句紭鎯犳槸鐜颁环涓庡師浠风殑宸鐧惧垎姣�
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ }
},
handledbelete(row) {
this.queryParams.price = 0;
@@ -1316,10 +1197,12 @@
if (this.forms.sex) {
+ console.log('杩涙潵浜唅f');
+
deptTreeSelect(this.forms.sex).then((response) => {
// 濂楅鍚嶇О
this.newpacName = response.rows;
-
+ console.log('5', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1329,8 +1212,11 @@
});
});
} else {
+ console.log('杩涙潵浜唀lse');
+
deptTreeSelect().then((response) => {
this.newpacName = response.rows;
+ console.log('6', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1560,4 +1446,13 @@
width: 50px;
height: 100px;
}
+
+::v-deep .el-dialog__body {
+ padding: 5px 30px;
+}
+
+::v-deep .el-dialog {
+ height: 750px;
+ overflow-y: auto;
+}
</style>
--
Gitblit v1.8.0