From a1cf1e5b031b2c85c6af756dbfa56794abfc83cf Mon Sep 17 00:00:00 2001 From: yuanwei Date: Mon, 15 Jan 2024 13:37:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=89=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/anno/anncmntManu.js | 9 ++++ src/api/anno/anncmntYlqxzcr.js | 9 ++++ src/api/anno/anncmntYlqxzczh.js | 9 ++++ src/views/anno/anncmnt/manu.vue | 20 ++++++-- src/views/anno/anncmnt/manuCertDialog.vue | 32 +++++++++--- src/views/anno/anncmnt/manuDialog.vue | 12 ----- src/views/anno/anncmnt/product.vue | 32 +++++++++--- src/views/anno/anncmnt/productDialog.vue | 61 ++++++++++++++++------- src/views/anno/anncmnt/ylqxzcrDialog.vue | 4 +- src/views/anno/anncmnt/ylqxzczhDialog.vue | 37 ++++++++------ 10 files changed, 159 insertions(+), 66 deletions(-) diff --git a/src/api/anno/anncmntManu.js b/src/api/anno/anncmntManu.js index d2878dd..c9fc227 100644 --- a/src/api/anno/anncmntManu.js +++ b/src/api/anno/anncmntManu.js @@ -30,3 +30,12 @@ export function deletegg(data) { data: data }); } + + +export function getManuList(query) { + return axios({ + url: "/anno/anncmnt/manu/getList", + method: "get", + params: query + }); +} diff --git a/src/api/anno/anncmntYlqxzcr.js b/src/api/anno/anncmntYlqxzcr.js index 3709b81..2f5f655 100644 --- a/src/api/anno/anncmntYlqxzcr.js +++ b/src/api/anno/anncmntYlqxzcr.js @@ -30,3 +30,12 @@ export function deletegg(data) { data: data }); } + + +export function getYlqxzcrList(query) { + return axios({ + url: "/anno/anncmnt/ylqxzcr/getList", + method: "get", + params: query + }); +} diff --git a/src/api/anno/anncmntYlqxzczh.js b/src/api/anno/anncmntYlqxzczh.js index b6ff310..4d1b58c 100644 --- a/src/api/anno/anncmntYlqxzczh.js +++ b/src/api/anno/anncmntYlqxzczh.js @@ -30,3 +30,12 @@ export function deletegg(data) { data: data }); } + + +export function getYlqxzczhList(query) { + return axios({ + url: "/anno/anncmnt/ylqxzczh/getList", + method: "get", + params: query + }); +} \ No newline at end of file diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue index 94d6caa..08e3edf 100644 --- a/src/views/anno/anncmnt/manu.vue +++ b/src/views/anno/anncmnt/manu.vue @@ -344,7 +344,7 @@ import indexDialog from "@/views/anno/anncmnt/manuDialog"; import manuCertDialog from "@/views/anno/anncmnt/manuCertDialog"; import {deletegg, list} from "@/api/anno/anncmntManu"; -import {deletCert, listCert} from "@/api/anno/anncmntManuCert"; +import {deleteCert, listCert} from "@/api/anno/anncmntManuCert"; import {executeFuc, getHead} from "@/utils/customConfig"; export default { @@ -381,6 +381,7 @@ export default { page: 1, limit: 10, }, + changeCode:"", actDateRange: [], pickerOptions: { shortcuts: [ @@ -426,6 +427,9 @@ export default { } this.filterQuery.page = 1; this.getList(); + this.changeCode = ""; + this.manuCertList = [], + this.manuCertTotal = 0 }, onReset() { this.$router.push({ @@ -436,12 +440,16 @@ export default { limit: 10, }; this.getList(); + this.changeCode = ""; + this.manuCertList = [], + this.manuCertTotal = 0 }, onCertReset() { this.$router.push({ path: "", }); this.filterCertQuery = { + manuCreditCode:this.changeCode, page: 1, limit: 10, }; @@ -479,8 +487,13 @@ export default { this.getCertList(); }, addCertMuti(){ + var changeCode = this.changeCode; + if(!changeCode){ + this.$message.error("请先选择企业"); + return; + } this.inputCertQuery={ - + manuCreditCode:changeCode } this.formCertName=1; this.manuCertDialogVisible = true; @@ -491,6 +504,7 @@ export default { _this.manuCertDialogVisible = true; }, supCertClick(_this,row) { + _this.changeCode= row.creditCode _this.onCertReset(); }, getList() { @@ -538,7 +552,7 @@ export default { }, deleteCertDialog(_this,row) { - deletCert(row) + deleteCert(row) .then((response) => { if(response.code == 20000){ _this.getCertList() diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue index 5c5eb61..54bb4c3 100644 --- a/src/views/anno/anncmnt/manuCertDialog.vue +++ b/src/views/anno/anncmnt/manuCertDialog.vue @@ -65,13 +65,10 @@ - {{ item.label }} - {{ - item.code - }} + {{ item.code }} @@ -127,6 +124,8 @@ diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue index 31d8af0..ee58a4b 100644 --- a/src/views/anno/anncmnt/manuDialog.vue +++ b/src/views/anno/anncmnt/manuDialog.vue @@ -87,18 +87,6 @@ :placeholder="item.columnDesc" > - - - {{item.columnDesc}} - - - {{item.columnDesc}} diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue index 8bf4076..f3d1359 100644 --- a/src/views/anno/anncmnt/product.vue +++ b/src/views/anno/anncmnt/product.vue @@ -191,7 +191,7 @@
- 新增注册/备案证 + 新增产品批次
@@ -344,7 +344,7 @@ import indexDialog from "@/views/anno/anncmnt/productDialog"; import manuCertDialog from "@/views/anno/anncmnt/productCertDialog"; import {deletegg, list} from "@/api/anno/anncmntProduct"; -import {deletCert, listCert} from "@/api/anno/anncmntProductBatch"; +import {deleteCert, listCert} from "@/api/anno/anncmntProductBatch"; import {executeFuc, getHead} from "@/utils/customConfig"; export default { @@ -369,8 +369,8 @@ export default { formCertName: 1, formCertMap: { - 1: "新增产品信息明细", - 2: "编辑产品信息明细", + 1: "新增产品批次", + 2: "编辑产品批次", }, inputCertQuery:{}, manuCertDialogVisible: false, @@ -381,6 +381,7 @@ export default { page: 1, limit: 10, }, + changeCode:"", actDateRange: [], pickerOptions: { shortcuts: [ @@ -426,6 +427,9 @@ export default { } this.filterQuery.page = 1; this.getList(); + this.changeCode = ""; + this.manuCertList = [], + this.manuCertTotal = 0 }, onReset() { this.$router.push({ @@ -436,12 +440,16 @@ export default { limit: 10, }; this.getList(); + this.changeCode = ""; + this.manuCertList = [], + this.manuCertTotal = 0 }, onCertReset() { this.$router.push({ path: "", }); this.filterCertQuery = { + productIdFk:this.changeCode, page: 1, limit: 10, }; @@ -479,9 +487,15 @@ export default { this.getCertList(); }, addCertMuti(){ - this.inputCertQuery={ - - } + var changeCode = this.changeCode; + if(!changeCode){ + this.$message.error("请先选择产品"); + return; + } + this.inputCertQuery={ + productIdFk:changeCode, + productName:this.changeName + } this.formCertName=1; this.manuCertDialogVisible = true; }, @@ -491,6 +505,8 @@ export default { _this.manuCertDialogVisible = true; }, supCertClick(_this,row) { + _this.changeCode= row.id + _this.changeName= row.productName _this.onCertReset(); }, getList() { @@ -538,7 +554,7 @@ export default { }, deleteCertDialog(_this,row) { - deletCert(row) + deleteCert(row) .then((response) => { if(response.code == 20000){ _this.getCertList() diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue index ed78046..6ab7abc 100644 --- a/src/views/anno/anncmnt/productDialog.vue +++ b/src/views/anno/anncmnt/productDialog.vue @@ -65,13 +65,10 @@ - {{ item.label }} - {{ - item.code - }} + {{ item.code }} @@ -87,18 +84,6 @@ :placeholder="item.columnDesc" > - - - {{item.columnDesc}} - - - {{item.columnDesc}} @@ -127,6 +112,8 @@ diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue index 38a6add..a51a0eb 100644 --- a/src/views/anno/anncmnt/ylqxzcrDialog.vue +++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue @@ -82,8 +82,8 @@ diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue index b1471dc..12b050e 100644 --- a/src/views/anno/anncmnt/ylqxzczhDialog.vue +++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue @@ -65,7 +65,7 @@ {{ item.label }} @@ -87,18 +87,6 @@ :placeholder="item.columnDesc" > - - - {{item.columnDesc}} - - - {{item.columnDesc}} @@ -127,6 +115,7 @@