From 720381cfb95f06c87c0b11fe92531d06c2b02e12 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 15 一月 2025 17:58:05 +0800
Subject: [PATCH] 11
---
src/views/system/comp/index.vue | 459 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 276 insertions(+), 183 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 07b3d74..ee61488 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" />
@@ -120,9 +121,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 +132,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 +142,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 +170,6 @@
<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" />
- </el-form-item> -->
-
<el-form-item label="浼樻儬浠�" prop="ysPrice">
<el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
</el-form-item>
@@ -238,23 +235,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 +263,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 +276,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 +297,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,41 +325,125 @@
<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>
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1"
+ :min="0" :max="20" @change="debounceNumberChange" :debounce="3000"></el-input-number>
</el-form-item>
<el-form-item label="鐜颁环">
<el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
- style="width: 140px" />
+ style="width: 140px" @input="changeXianjia" @blur="numberChangeXianPrice(youhui, youhui)" />
</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">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410">
<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" width="85"></el-table-column>
+ <el-table-column label="鎶樻墸" width="151">
+ <template slot-scope="scope">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+ <el-input-number v-model.number="scope.row.limits" @input="validateDiscount(scope.row)"
+ placeholder="杈撳叆鎶樻墸" size="small" type="number" :min="0" :step="0.1" :precision="1" :max="20">
+ </el-input-number>
+ </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-form-item>
+ </el-form>
+ <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
+ 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="8" :xs="24">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+ 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>
+ <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="170">
+
+ <template slot-scope="scope">
+ {{ scope.row.proName }}
</template>
</el-table-column>
<el-table-column label="鍘熶环" align="center" prop="proPrice"></el-table-column>
- <el-table-column label="鎶樻墸">
- <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"></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"
@@ -376,9 +459,9 @@
璁�</el-button>
</div>
</el-col>
- <el-col :span="11" :xs="24">
+ <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" />
@@ -388,85 +471,9 @@
</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-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="8" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
- <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="pacName">
- <template slot-scope="scope">
- {{ scope.row.pacName + "/" + scope.row.price }}
- </template>
- </el-table-column>
- </el-table>
- </el-col>
- <el-col :span="6" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
- style="height: 35px">
- <el-form-item label="鍚堣" prop="price">
- <el-input ref="inputName" v-model="queryParams.price" 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">
-
- <template slot-scope="scope">
- {{ scope.row.proName + "/" + scope.row.proPrice }}
- </template>
- </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"
- @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="8" :xs="24">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="68px">
- <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: 70%">
- <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 +488,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>
@@ -592,6 +599,7 @@
:key="dict.value"
:label="dict.label"
:value="dict.value"
+
></el-option>
</el-select>
</el-form-item> -->
@@ -801,7 +809,7 @@
this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
},
updateProPrice(row) {
-
+ console.log('1234')
const proPrice = new Big(row.proPrice);
const limits = new Big(row.limits);
@@ -812,6 +820,22 @@
}, new Big(0)).toNumber();
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
},
+ debounceNumberChange(currentValue, oldValue) {
+ clearTimeout(this.debounceTimer);
+ this.debounceTimer = setTimeout(() => {
+ this.numberChange(currentValue, oldValue);
+ }, 300);
+ },
+ changeXianjia() {
+ // 鍘熷鎶樻墸鐜囪绠�
+
+
+ if (this.queryParams.price !== 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ }
+
+ },
+
getList() {
this.$nextTick(() => {
this.$refs.inputName.focus();
@@ -897,9 +921,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) {
@@ -963,7 +988,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) {
@@ -1001,6 +1026,50 @@
});
},
+ numberChangeXianPrice(currentValue, oldValue) {
+ this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ // 纭繚淇敼鎶樻墸鐨勫��
+ this.youhui = currentValue;
+ // 濡傛灉鎶樻墸灏忎簬鏈�灏忔姌鎵ｅ�硷紝淇鎶樻墸
+ if (this.youhui < this.getInfodis) {
+ this.youhui = this.getInfodis;
+ }
+ let totalYsprice = new Big(0); // 鍒濆鍖栨�� ysprice
+ // 閬嶅巻姣忎釜椤圭洰锛屾洿鏂版瘡涓瓙椤圭殑浠锋牸
+ 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();
+ totalYsprice = totalYsprice.plus(new Big(item.ysPrice));
+ });
+ // 濡傛灉鎬荤殑 ysPrice 鍜屾煡璇㈠弬鏁颁腑鐨� xianprice 涓嶄竴鑷达紝杩涜璋冩暣
+ if (!totalYsprice.eq(this.queryParams.xianprice)) {
+ const diff = new Big(this.queryParams.xianprice).minus(totalYsprice);
+ // 濡傛灉 OnenewpacName 鏁扮粍涓嶄负绌猴紝璋冩暣鏈�鍚庝竴椤圭殑 ysPrice
+ if (this.OnenewpacName.length > 0) {
+ const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+ const newYsPrice = new Big(lastItem.ysPrice).plus(diff).toNumber();
+ // 浣跨敤 splice 鏇挎崲鏈�鍚庝竴椤癸紝纭繚鏇存柊瑙﹀彂瑙嗗浘鏇存柊
+ console.log("hhh");
+
+ this.$set(this.OnenewpacName[this.OnenewpacName.length - 1], 'ysPrice', newYsPrice);
+
+ }
+ }
+ })
+ .catch(() => {
+ // 濡傛灉鍙栨秷淇敼锛屾仮澶嶅師鏈夌殑浼樻儬鍊�
+ this.youhui = oldValue;
+ });
+ },
+
changegroupingName() {
if (this.selectionList.length <= 0) {
@@ -1016,6 +1085,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 +1099,7 @@
});
} else {
deptTreeSelect().then((response) => {
+ console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1041,13 +1113,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 +1134,7 @@
});
} else {
deptTreeSelect().then((response) => {
+ console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -1077,13 +1154,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,73 +1171,74 @@
}
},
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);
-
- // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
- const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
- if (!existingItem) {
- newItemsToAdd.push(item);
- this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
- }
- });
+ this.dataList.forEach((item) => {
+ this.$refs.tre.toggleRowSelection(item, false); // 鍙栨秷閫変腑鐘舵��
+ // 浣跨敤 $set 纭繚鍝嶅簲鎬�
+ this.$set(item, 'limits', 10); // 璁剧疆闄愬埗鏁伴噺
+ this.$set(item, 'ysPrice', item.proPrice); // 璁剧疆鐜颁环涓哄師浠�
- // 娣诲姞鏂伴」鐩埌 OnenewpacName
- this.OnenewpacName.push(...newItemsToAdd);
+ // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄧ浉鍚岀殑椤圭洰
+ const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
+ if (!existingItem) {
+ newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁�
+ this.updateProPrice(item);
+ }
+ });
- // 鍒犻櫎閲嶅椤圭洰锛岃繖閲屾垜浠彧闇�澶勭悊鏂版坊鍔犵殑椤圭洰鍜屽師鏈夐」鐩箣闂寸殑閲嶅
- 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--;
+ // 娣诲姞鏂伴」鐩埌 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;
}
- }
- }
+ },
+ handledbelete(row) {
+ this.queryParams.price = 0;
+ this.queryParams.xianprice = 0; // 鍒濆鍖栫幇浠�
+ this.youhui = 0; // 鍒濆鍖栦紭鎯�
- // 璁＄畻鎬讳环鍜岀幇浠�
- this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
- });
+ // 鍏堟壘鍒板苟鍒犻櫎椤圭洰
+ this.OnenewpacName = this.OnenewpacName.filter(item => item.proId !== row.proId);
- // 璁＄畻浼樻儬
- if (this.queryParams.price > 0) {
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
- } else {
- this.youhui = 0;
- }
-},
-handledbelete(row) {
- this.queryParams.price = 0;
- 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瀛樺湪
+ });
- // 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
- this.OnenewpacName.forEach((item) => {
- this.queryParams.price += item.proPrice;
- this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
- });
-
- // 璁＄畻浼樻儬
- if (this.queryParams.price > 0) {
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
- } else {
- this.youhui = 0;
- }
-},
+ // 璁＄畻浼樻儬
+ if (this.queryParams.price > 0) {
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ } else {
+ this.youhui = 0;
+ }
+ },
submitrighr() {
this.openOne = false;
@@ -1324,10 +1403,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 =
@@ -1337,8 +1418,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 =
@@ -1568,4 +1652,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