From aa4451fa555c7d86502c0416a5cf3be343acb67c Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 08 一月 2025 15:09:31 +0800
Subject: [PATCH] 1
---
src/views/system/comp/12.vue | 117 +-------------------------------------
src/views/system/comp/index.vue | 56 ++++++++++++++++--
2 files changed, 55 insertions(+), 118 deletions(-)
diff --git a/src/views/system/comp/12.vue b/src/views/system/comp/12.vue
index 6d3c5dc..987109d 100644
--- a/src/views/system/comp/12.vue
+++ b/src/views/system/comp/12.vue
@@ -54,33 +54,9 @@
<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 +64,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)"
@@ -530,86 +497,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>
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index ea5f569..63ae2dd 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -337,11 +337,11 @@
</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>
+ :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" />
+ 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>
@@ -428,7 +428,7 @@
</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>
+ 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"
@@ -459,8 +459,8 @@
<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>
+ style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;" @click="resetright">纭�
+ 璁�</el-button>
</div>
</el-col>
<el-col :span="8" :xs="24">
@@ -804,6 +804,13 @@
this.getList();
},
methods: {
+ changeXianjia() {
+ // 鍘熷鎶樻墸鐜囪绠�
+
+
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+
+ },
validateDiscount(row) {
if (row.limits > 10) {
row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
@@ -909,7 +916,7 @@
this.handleQuery();
},
resetQuerys() {
- this.OnenewpacName = [],
+ this.OnenewpacName = [],
this.queryParams.price = 0,
this.queryParams.xianprice = 0,
this.youhui = 0
@@ -1014,7 +1021,44 @@
});
},
+ 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 鍚庤繘琛岃皟鏁�
+ if (totalYsprice.toNumber() !== this.queryParams.xianprice) {
+ const diff = this.queryParams.xianprice - totalYsprice.toNumber();
+ if (this.OnenewpacName.length > 0) {
+ const lastItem = this.OnenewpacName[this.OnenewpacName.length - 1];
+ lastItem.ysPrice += diff;
+ // 璋冩暣鍚庢洿鏂� queryParams.xianprice
+ this.queryParams.xianprice = totalYsprice.plus(diff).toNumber();
+ }
+ }
+ })
+ .catch(() => {
+ this.youhui = oldValue;
+ });
+ },
changegroupingName() {
if (this.selectionList.length <= 0) {
this.$modal.msgError("璇峰厛閫変腑閮ㄩ棬鎴栨坊鍔犳柊鐨勯儴闂�");
--
Gitblit v1.8.0