From 288842f04e72d34fca6948ad1891c8460feb9774 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 10 一月 2025 17:53:51 +0800
Subject: [PATCH] 倒推
---
src/views/system/comp/index.vue | 263 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 232 insertions(+), 31 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index af48456..e835cee 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -45,15 +45,43 @@
<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">
@@ -61,7 +89,16 @@
</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)"
@@ -299,31 +336,31 @@
<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-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" width="486">
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="410">
<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">
+ <el-table-column label="鎶樻墸" width="151">
<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>
+ <el-input-number v-model.number="scope.row.limits"
+ 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>
@@ -391,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"
@@ -422,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">
@@ -475,6 +512,9 @@
<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" />
@@ -501,12 +541,87 @@
<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>
@@ -651,7 +766,31 @@
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" }],
},
};
},
@@ -665,24 +804,30 @@
this.getList();
},
methods: {
- validateDiscount(row) {
- if (row.limits > 10) {
- row.limits = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
- } else if (row.limits < 0) {
- row.limits = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+ 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;
}
- 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.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() {
@@ -770,7 +915,7 @@
this.handleQuery();
},
resetQuerys() {
- this.OnenewpacName = [],
+ this.OnenewpacName = [],
this.queryParams.price = 0,
this.queryParams.xianprice = 0,
this.youhui = 0
@@ -799,7 +944,18 @@
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() {
@@ -852,11 +1008,12 @@
const limits = new Big(item.limits);
const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
item.ysPrice = result.toNumber();
+ console.log("numberChange")
this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
}, new Big(0));
})
-
+ // ----------------------------------------------------------
})
.catch(() => {
@@ -864,6 +1021,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) {
@@ -984,7 +1185,7 @@
const existingItem = this.OnenewpacName.find(existing => existing.proId === item.proId);
if (!existingItem) {
newItemsToAdd.push(item); // 濡傛灉涓嶅瓨鍦ㄧ浉鍚岄」鐩紝鍒欐坊鍔犲埌鏂版暟缁�
- this.updateProPrice(item); // 鏇存柊鍗曚釜椤圭洰鐨勪环鏍�
+ this.updateProPrice(item);
}
});
--
Gitblit v1.8.0