From 87d24ab85a9821d6b0366691d09a10d19bc3e45c Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 08 一月 2025 15:11:58 +0800
Subject: [PATCH] 1
---
src/views/system/comp/index.vue | 824 +++++++++++++++++++++++-----------------------------------
1 files changed, 322 insertions(+), 502 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index d43c277..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" />
@@ -31,7 +32,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
- v-hasPermi="['system:comp:edit']">缁存姢閮ㄩ棬</el-button>
+ v-hasPermi="['system:comp:edit']">缁存姢濂楅</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -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,9 +84,9 @@
<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-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
- <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
+ <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>
<el-form-item label="绛剧害閲戦" prop="signingPrice">
<el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
@@ -131,7 +95,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddDept"
- v-hasPermi="['system:comp:add']">淇濆瓨閮ㄩ棬</el-button>
+ v-hasPermi="['system:comp:add']">淇濆瓨濂楅</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singleg" @click="handledeleDept"
@@ -141,12 +105,12 @@
<el-table ref="tb" v-loading="loading" :data="deptList" @selection-change="handleSelection" border
style="width: 320px" height="350">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="閮ㄩ棬鍚嶇О" align="center" prop="dwDeptName" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="dwDeptName" />
</el-table>
</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" />
@@ -169,10 +133,9 @@
<el-form-item label="鍘熶环" prop="price">
<el-input v-model="forms.price" placeholder="璇疯緭鍏ュ師浠�" style="width: 130px" />
</el-form-item>
- <el-form-item label="鎶樻墸" prop="limits">
+ <!-- <el-form-item label="鎶樻墸" prop="limits">
<el-input v-model="forms.limits" placeholder="璇疯緭鍏ユ姌鎵�" style="width: 130px" @change="numberChange" />
- <!-- :disabled="isfalse" -->
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浼樻儬浠�" prop="ysPrice">
<el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
@@ -192,31 +155,10 @@
<el-input v-model="forms.gtAge" style="width: 54px" />
</el-col>
</el-form-item>
- <el-form-item label="鍘熶环" prop="price">
- <el-input
- v-model="forms.price"
- placeholder="璇疯緭鍏ュ師浠�"
- style="width: 130px"
- />
- </el-form-item>
- <el-form-item label="鎶樻墸" prop="limits">
- <el-input
- v-model="forms.limits"
- placeholder="璇疯緭鍏ユ姌鎵�"
- style="width: 130px"
- @change="numberChange"
- />
- <!-- :disabled="isfalse" -->
- </el-form-item>
- <el-form-item label="浼樻儬浠�" prop="ysPrice">
- <el-input
- v-model="forms.ysPrice"
- placeholder="璇疯緭鍏ュ簲鏀�"
- style="width: 120px"
- />
- </el-form-item>
-
+
+
+
</el-form>
<el-row :gutter="10" class="mb8">
@@ -224,8 +166,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
- @click="xiangmuWh">椤圭洰缁存姢</el-button>
+ <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh">椤圭洰缁存姢</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
@@ -261,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 }}
@@ -287,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>
@@ -300,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>
@@ -321,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" />
@@ -347,32 +290,112 @@
<div>
<el-dialog :title="title" :visible.sync="openOne" width="1400px" 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-row :gutter="24" v-if="!isTableVisible">
+
+ <el-col :span="15" :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="鍘熶环">
+ <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"
+ :min="0" @change="numberChange"></el-input-number>
+ </el-form-item>
+ <el-form-item label="鐜颁环">
+ <el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
+ style="width: 140px" />
+ </el-form-item>
+ <el-form-item>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</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="486">
+
+ <template slot-scope="scope">
+ {{ scope.row.proName }}
+ </template>
+ </el-table-column>
+ <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="杈撳叆鎶樻墸"
+ size="small" type="number" min="0" step="1" max="10">
+ </el-input>
+ </template>
+ </el-table-column>
+ <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>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
+ <el-col :span="2" :xs="24">
+ <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>
+ </div>
+ </el-col>
+ <el-col :span="7" :xs="24">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+ 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" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
+ </el-form-item>
+ </el-form>
+ <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>
+ </el-col>
+ </el-row>
+ <!-- -=----------------------------------------------------- -->
+ <el-row :gutter="24" v-else>
+ <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" v-if="isTableVisible" >
- <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>
@@ -380,32 +403,14 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <!-- <div style="color: red; font-size: 8px">
- 娉ㄩ噴锛氶紶鏍囧乏閿弻鍑婚�変腑琛屽彲鍒犻櫎
- </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 border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
+ <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>
+ <el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="68">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete"
@@ -415,15 +420,15 @@
</el-table>
</el-col>
<el-col :span="2" :xs="24">
- <div style="margin: 240% 6%">
+ <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" />
@@ -432,23 +437,11 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
</el-form-item>
</el-form>
- <el-table
- border
- v-loading="loading"
- ref="tre"
- :data="Treedata"
- @selection-change="handleChangesingle"
- height="478"
- style="width: 70%"
- >
+ <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="130" />
- <el-table-column
- label="椤圭洰浠锋牸/鍏�"
- align="center"
- prop="proPrice"
- width="100"
- />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="288" />
+ <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100" />
</el-table>
</el-col>
</el-row>
@@ -462,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>
@@ -482,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" />
@@ -511,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>
@@ -602,13 +518,12 @@
</template>
<script>
-
+import Big from 'big.js';
import {
listComp,
getComp,
delComp,
addComp,
- getfzgrouping,
updateComp,
addDept,
Deptlist,
@@ -690,6 +605,8 @@
enName: null,
code: null,
price: null,
+ xianprice: null,
+ limits: null
},
id: "",
// 琛ㄥ崟鍙傛暟
@@ -700,10 +617,11 @@
gtAge: 100,
groupingName: "",
pacName: "",
- payType: "",
- sex: "",
+ payType: "1",
+ sex: "2",
},
sfzs: '',
+ youhui: '',
// 琛ㄥ崟鏍￠獙
rules: {
cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
@@ -714,7 +632,7 @@
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
gtAge: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
- limits: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+ limits: [{ required: false, validator: checkPhoneNum, trigger: "blur" }],
ltAge: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
/* pacName: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
@@ -733,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" }],
+
},
};
},
@@ -771,7 +665,26 @@
this.getList();
},
methods: {
-
+ validateDiscount(row) {
+ if (row.limits > 10) {
+ row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
+ } else if (row.limits < 0) {
+ row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+ }
+ this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
+ },
+ updateProPrice(row) {
+
+ const proPrice = new Big(row.proPrice);
+
+ const limits = new Big(row.limits);
+ const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
+ row.ysPrice = result.toNumber();
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0)).toNumber();
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ },
getList() {
this.$nextTick(() => {
this.$refs.inputName.focus();
@@ -779,7 +692,7 @@
(this.loading = true);
listComp(this.queryParams).then((response) => {
this.compList = response.rows;
-
+
response.rows.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
@@ -801,7 +714,7 @@
cancell() {
this.openss = false;
this.openOne = false;
- this.reset();
+ // this.reset();
},
// 琛ㄥ崟閲嶇疆
reset() {
@@ -857,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) {
@@ -885,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() {
@@ -923,7 +826,7 @@
if (this.form.drugManufacturerId) {
this.beCurrentDept();
}
- this.title = "閮ㄩ棬鍒嗙粍缁存姢" + "( " + this.form.cnName + ")";
+ this.title = "濂楅鍒嗙粍缁存姢" + "( " + this.form.cnName + ")";
getInfo().then((response) => {
this.getInfodis = response.user.discount;
if (this.getInfodis == null || this.getInfodis == 10) {
@@ -931,20 +834,35 @@
}
});
},
- // 鎶樻墸
- numberChange(currentValue) {
- this.forms.limits = currentValue;
- /* if (this.forms.limits > this.getInfodis) {
- this.forms.limits = this.getInfodis;
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
- } */
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
+ numberChange(currentValue, oldValue) {
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ this.youhui = currentValue;
+ if (this.youhui < this.getInfodis) {
+ this.youhui = this.getInfodis;
+ // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒);
+ }
+ this.OnenewpacName.forEach((item) => {
+ item.limits = this.youhui
+ const proPrice = new Big(item.proPrice);
+ const limits = new Big(item.limits);
+ const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
+ item.ysPrice = result.toNumber();
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0));
+ })
+
+
+ })
+ .catch(() => {
+ this.youhui = oldValue;
+ });
+
},
changegroupingName() {
@@ -961,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) => {
@@ -969,39 +889,11 @@
index +
1;
});
- // if (this.groupList.length >= 1) {
- // if (this.groupList[0].id) {
- // getfzgrouping(this.groupList[0].id).then((response) => {
- // this.OnenewpacName = response.data.groupingProList;
- // this.queryParams.price = 0;
- // this.OnenewpacName.forEach((item) => {
- // this.queryParams.price += item.proPrice;
- // });
- // });
- // }
- // }
- // if (this.newpacName.length != 0) {
- // this.$nextTick(() => {
- // if (this.forms.pacName) {
- // this.newpacName.forEach((item, index) => {
- // if (this.forms.pacName == item.pacName) {
- // this.$refs.tbone.toggleRowSelection(
- // this.newpacName[index],
- // true
- // );
- // }
- // });
- // } else {
- // this.$refs.tbone.toggleRowSelection(this.newpacName[0], true);
- // }
- // });
- // } else {
- // this.$refs.tbone.clearSelection();
- // }
});
} else {
deptTreeSelect().then((response) => {
+ console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1010,46 +902,22 @@
index +
1;
});
- // if (this.groupList.length >= 1) {
- // if (this.groupList[0].id) {
- // getfzgrouping(this.groupList[0].id).then((response) => {
- // this.OnenewpacName = response.data.groupingProList;
- // this.queryParams.price = 0;
- // this.OnenewpacName.forEach((item) => {
- // this.queryParams.price += item.proPrice;
- // });
- // });
- // }
- // }
- // if (this.newpacName.length != 0) {
- // this.$nextTick(() => {
- // if (this.forms.pacName) {
- // this.newpacName.forEach((item, index) => {
- // if (this.forms.pacName == item.pacName) {
- // this.$refs.tbone.toggleRowSelection(
- // this.newpacName[index],
- // true
- // );
- // }
- // });
- // } else {
- // this.$refs.tbone.toggleRowSelection(this.newpacName[0], true);
- // }
- // });
- // } else {
- // this.$refs.tbone.clearSelection();
- // }
+
});
}
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 =
@@ -1060,6 +928,7 @@
});
} else {
deptTreeSelect().then((response) => {
+ console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -1079,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;
});
},
// 鍗曢」鏁版嵁鑾峰彇
@@ -1094,67 +964,89 @@
this.dataList = selection;
}
},
- // 鍗曢」閫夊畾鎸夐挳
resetright() {
- this.queryParams.price = 0;
- // this.dataLists=JSON.parse(JSON.stringify(this.dataList));
- this.dataList.forEach((item) => {
- this.$refs.tre.toggleRowSelection(item, false);
- this.OnenewpacName.push(item);
- });
+ if (this.dataList.length == 0) {
+ return; // 濡傛灉鏁版嵁鍒楄〃涓虹┖锛岀洿鎺ヨ繑鍥�
+ } else {
+ this.queryParams.price = 0; // 鍒濆鍖栨�讳环
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
- for (var i = 0; i < this.OnenewpacName.length - 1; i++) {
- for (var j = i + 1; j < this.OnenewpacName.length; j++) {
- if (this.OnenewpacName[i].proId == this.OnenewpacName[j].proId) {
- this.OnenewpacName.splice(j, 1);
- j--;
+ const newItemsToAdd = []; // 鐢ㄤ簬瀛樺偍鏂伴渶瑕佹坊鍔犵殑椤圭洰
+
+ 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); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
+ }
+ });
+
+ // 娣诲姞鏂伴」鐩埌 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--; // 鍥犱负鍒犻櫎浜嗕竴涓厓绱狅紝褰撳墠鐨刯瑕佸噺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.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
}
- return this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- });
},
handledbelete(row) {
this.queryParams.price = 0;
- this.OnenewpacName.forEach((item, index) => {
- if (item.proId == row.proId) {
- this.OnenewpacName.splice(index, 1);
- }
- });
- return this.OnenewpacName.forEach((item) => {
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
+
+ // 鍏堟壘鍒板苟鍒犻櫎椤圭洰
+ this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
+
+ // 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
+ this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice;
+ this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
});
- },
- /* submitrighr() {
- if (this.pacList.length >= 1) {
- this.openss = false;
- this.forms.pacName = this.pacList[0].pacName;
- this.forms.price = this.queryParams.price;
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
+
+ // 璁＄畻浼樻儬
+ if (this.queryParams.price > 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
} else {
- this.$modal.msgError("璇烽�夋嫨濂楅");
+ this.youhui = 0;
}
- }, */
+ },
+
submitrighr() {
this.openOne = false;
- // this.forms.pacName = this.pacList[0].pacName;
this.forms.price = this.queryParams.price;
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
- // console.log(this.groupingList, 555);
-
+ this.forms.ysPrice = this.queryParams.xianprice
+ this.forms.limits = this.youhui
let mapList = [];
this.OnenewpacName.forEach((item) => {
mapList.push({
proName: item.proName,
proId: item.proId,
proPrice: item.proPrice,
+ limits: item.limits,
+ ysPrice: item.ysPrice
});
});
@@ -1177,7 +1069,7 @@
mapList: mapList,
price: this.forms.price,
ysPrice: this.forms.ysPrice,
- id: this.groupList[0].id,
+ id: this.groupList[0] ? this.groupList[0].id : ''
};
// 鍙戦�佽姹備繚瀛樻暟鎹�
@@ -1185,11 +1077,11 @@
if (res.code == 200) {
this.beCurrent();
this.forms.groupingName = "";
- this.forms.sex = "";
+ this.forms.sex = "2";
this.forms.pacName = "";
this.forms.price = "";
this.forms.ysPrice = "";
- this.forms.payType = "";
+ this.forms.payType = "1";
}
});
@@ -1208,9 +1100,6 @@
this.pacList.forEach((item) => {
this.OnenewpacName = item.tjProjectList;
});
- // this.dataLists.forEach((item2) => {
- // this.OnenewpacName.push(item2);
- // });
this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice;
});
@@ -1253,7 +1142,6 @@
handleChange(selection) {
this.groupList = selection;
-
if (selection.length > 0) {
this.groupList.forEach((item) => {
this.forms.groupingName = item.groupingName;
@@ -1272,58 +1160,49 @@
this.GroupUpdate();
this.isSexDisabled = false; // 鎭㈠鎬у埆閫夋嫨妗嗕负鍙敤
}
-
- /* this.groupList.forEach((item) => {
- this.forms.groupingName = item.groupingName;
- this.forms.gtAge = item.gtAge;
- this.forms.limits = item.limits;
- this.forms.ltAge = item.ltAge;
- this.forms.pacName = item.pacName;
- this.forms.payType = item.payType;
- this.forms.sex = item.sex;
- this.forms.price = item.price;
- this.forms.ysPrice = item.ysPrice;
- });
- if (selection.length > 1) {
- let del_row = selection.shift();
- this.$refs.tbs.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
- }
- if(selection.length > 0) {
- this.isSexDisabled = true;
- }
- else {
- this.isSexDisabled = false;
- } */
this.groupIds = selection.map((item) => item.id);
this.singlegg = !selection.length;
},
xiangmuWh() {
+ if (!this.forms.groupingName ||
+ !this.forms.sex ||
+ !this.forms.payType) {
+ this.$modal.msgError("璇峰厛濉啓鎵�鏈夊繀濉」!");
+ return; // Stop execution if any required field is empty
+ }
this.openOne = true;
+
this.title = "鍒嗙粍椤圭洰缁存姢";
this.OnenewpacName = [];
this.queryParams.price = 0;
this.loading = true;
- let id = this.groupList[0].id;
+ if (this.groupList[0]) {
+ let id = this.groupList[0].id || '';
+ getDetails(id).then((res) => {
+ this.OnenewpacName = res.data.groupingProList;
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0));
+ this.OnenewpacName.forEach((item, index) => {
+ this.queryParams.price += item.proPrice;
+ });
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ });
+ }
// console.log(this.groupList[0].id, 9966);
getconfigKey("sfzstc").then((res) => {
this.sfzs = res.msg;
-
-
});
- getDetails(id).then((res) => {
- this.OnenewpacName = res.data.groupingProList;
- this.OnenewpacName.forEach((item, index) => {
- this.queryParams.price += item.proPrice;
- });
- // return this.OnenewpacName.forEach((item) => {
- // this.queryParams.price += item.proPrice;
- // });
- });
+
+
+
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 =
@@ -1333,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 =
@@ -1349,70 +1231,7 @@
// console.log(this.Treedata,999888);
});
},
- //淇濆瓨鍒嗙粍
- /* handleGroup() {
- if (this.selectionList.length <= 0) {
- this.$modal.msgError("璇峰厛閫変腑閮ㄩ棬鎴栨坊鍔犳柊鐨勯儴闂�");
- } else {
- this.groupList.forEach((item) => {
- if (item.id) {
- this.id = item.id;
- }
- });
- let mapList = [];
- this.OnenewpacName.forEach((item) => {
- mapList.push({
- proName: item.proName,
- proId: item.proId,
- proPrice: item.proPrice,
- });
- });
- if (this.id) {
- var data = {
- id: this.id,
- groupingName: this.forms.groupingName,
- gtAge: this.forms.gtAge,
- limits: this.forms.limits,
- ltAge: this.forms.ltAge,
- pacName: this.forms.pacName,
- payType: this.forms.payType,
- sex: this.forms.sex,
- dwDeptId: this.selectionList[0].id,
- dwId: this.selectionList[0].dwId,
- mapList: mapList,
- price: this.forms.price,
- ysPrice: this.forms.ysPrice,
- };
- } else {
- var data = {
- groupingName: this.forms.groupingName,
- gtAge: this.forms.gtAge,
- limits: this.forms.limits,
- ltAge: this.forms.ltAge,
- pacName: this.forms.pacName,
- payType: this.forms.payType,
- sex: this.forms.sex,
- dwDeptId: this.selectionList[0].id,
- dwId: this.selectionList[0].dwId,
- mapList: mapList,
- price: this.forms.price,
- ysPrice: this.forms.ysPrice,
- };
- }
- dwgrouping(data).then((res) => {
- if (res.code == 200) {
- this.beCurrent();
- this.groupingList = res.data.updatedGroupingList;
- this.forms.groupingName = "";
- this.forms.sex = "";
- this.forms.pacName = "";
- this.forms.price = "";
- this.forms.ysPrice = "";
- this.forms.payType = "";
- }
- });
- }
- }, */
+
handleGroup() {
// 濡傛灉娌℃湁閫変腑浠讳綍閮ㄩ棬锛堝嵆娌℃湁 selectionList锛夛紝鍙互鐩存帴浠� OnenewpacName 鑾峰彇鏁版嵁
let mapList = [];
@@ -1424,16 +1243,8 @@
});
});
- // 濡傛灉 selectionList 涓虹┖锛屼娇鐢� mapList 缁х画淇濆瓨
- /* if (this.OnenewpacName.length === 0) {
- this.$modal.msgError("璇峰厛閫変腑椤圭洰");
- return; // 鎻愮ず鐢ㄦ埛閫変腑椤圭洰
- } */
- this.forms.ysPrice = (
- this.forms.price *
- (this.forms.limits / 10)
- ).toFixed(2);
+
let data = {
groupingName: this.forms.groupingName,
@@ -1456,30 +1267,30 @@
if (res.code == 200) {
this.beCurrent();
this.forms.groupingName = "";
- this.forms.sex = "";
+ this.forms.sex = "2";
this.forms.pacName = "";
this.forms.price = "";
this.forms.ysPrice = "";
- this.forms.payType = "";
+ this.forms.payType = "1";
}
});
},
// 淇敼鍒嗙粍
GroupUpdate() {
- // this.forms = {};
+ console.log(this.$refs.elTable)
+ this.$refs.tbs.clearSelection();
this.forms = {
groupingName: "",
gtAge: "",
limits: "",
ltAge: "",
pacName: "",
- payType: "",
- sex: "",
+ payType: "1",
+ sex: "2",
price: "",
ysPrice: "",
};
- // this.$refs.forms.resetFields();
},
beCurrent() {
let data = {
@@ -1635,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