From 4d5c58454d3368e0ce940b39538ee7e3a5cc81fa Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Nov 2023 10:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=84=E5=A5=97=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basic/basicDestinyRel.js | 10 +++++
src/views/basic/destiny/destinyModelEdit.vue | 27 ++++++-------
.../basic/destiny/destinySelectProduct.vue | 20 +++++-----
src/views/basic/destiny/skProject.vue | 40 ++++++++++++++-----
4 files changed, 62 insertions(+), 35 deletions(-)
diff --git a/src/api/basic/basicDestinyRel.js b/src/api/basic/basicDestinyRel.js
index 653f9413..2b6acd7e 100644
--- a/src/api/basic/basicDestinyRel.js
+++ b/src/api/basic/basicDestinyRel.js
@@ -82,6 +82,16 @@ export function addDestinyProcess(query) {
}
+export function downloadBasicProject(query) {
+ return axios({
+ url: "/udiwms/basic/destiny/project/download",
+ method: "post",
+ data: query
+ });
+}
+
+
+
diff --git a/src/views/basic/destiny/destinyModelEdit.vue b/src/views/basic/destiny/destinyModelEdit.vue
index f243e7d2..e57ecf93 100644
--- a/src/views/basic/destiny/destinyModelEdit.vue
+++ b/src/views/basic/destiny/destinyModelEdit.vue
@@ -1,23 +1,22 @@
<template>
<div>
- <el-form :model="editLogin" label-width="30%">
+ <el-form :model="editLogin" label-width="120px">
<el-card>
<el-row>
- <el-col :span="18">
+ <el-col :span="22">
<div class="text item">
- <el-form-item label="模板名称" prop="unitId">
- <el-input v-model="editLogin.name" placeholder="请输入模板名称" style="width: 100%"
+ <el-form-item label="项目编号" prop="unitId">
+ <el-input v-model="editLogin.code" placeholder="请输入模板编号" style="width: 100%"
size="small"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
-
<el-row>
- <el-col :span="18">
+ <el-col :span="22">
<div class="text item">
- <el-form-item label="模板编号" prop="unitId">
- <el-input v-model="editLogin.code" placeholder="请输入模板编号" style="width: 100%"
+ <el-form-item label="项目名称" prop="unitId">
+ <el-input v-model="editLogin.name" placeholder="请输入模板名称" style="width: 100%"
size="small"></el-input>
</el-form-item>
</div>
@@ -26,7 +25,7 @@
<el-row>
- <el-col :span="18">
+ <el-col :span="22">
<div class="text item">
<el-form-item label="备注" prop="unitId">
<el-input type="textarea" :rows="3" v-model="editLogin.remark" placeholder="请输入备注"></el-input>
@@ -46,7 +45,7 @@
<script>
-import {addModeldestiny,editModeldestiny} from "@/api/basic/basicDestinyRel";
+import {addModeldestiny, editModeldestiny} from "@/api/basic/basicDestinyRel";
import {isBlank} from "@/utils/strUtil";
export default {
@@ -73,10 +72,10 @@ export default {
},
methods: {
onModifySubmit() {
- if(isBlank(this.editLogin.name)){
+ if (isBlank(this.editLogin.name)) {
return this.$message.error("模板名称不能为空");
}
- if(isBlank(this.editLogin.code)){
+ if (isBlank(this.editLogin.code)) {
return this.$message.error("模板编号不能为空");
}
if (this.editLogin.id != null) {
@@ -105,9 +104,9 @@ export default {
},
created() {
- if(isBlank(this.editQuery.id)){
+ if (isBlank(this.editQuery.id)) {
this.editLogin = {}
- }else {
+ } else {
this.editLogin = this.editQuery
}
}
diff --git a/src/views/basic/destiny/destinySelectProduct.vue b/src/views/basic/destiny/destinySelectProduct.vue
index 3d7184ca..e242f741 100644
--- a/src/views/basic/destiny/destinySelectProduct.vue
+++ b/src/views/basic/destiny/destinySelectProduct.vue
@@ -4,7 +4,7 @@
<el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row>
<el-col :span="18">
- <el-form-item label="UDI码:" class="query-form-item">
+ <el-form-item label="UDI码:" >
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
@@ -12,25 +12,25 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="拼音简写:" class="query-form-item">
+ <el-form-item label="拼音简写:" >
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="第三方物资编码:" class="query-form-item">
+ <el-form-item label="第三方物资编码:" >
<el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="分类编码:" class="query-form-item">
+ <el-form-item label="分类编码:" >
<el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="供应商:" class="query-form-item">
+ <el-form-item label="供应商:" >
<el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
clearable="true"></el-input>
</el-form-item>
@@ -38,24 +38,24 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="物品编码:" class="query-form-item">
+ <el-form-item label="物品编码:" >
<el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="产品通用名:" class="query-form-item">
+ <el-form-item label="产品通用名:" >
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="规格型号:" class="query-form-item">
+ <el-form-item label="规格型号:" >
<el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="生产企业:" class="query-form-item">
+ <el-form-item label="生产企业:" >
<el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
@@ -64,7 +64,7 @@
<el-row>
<el-col :span="6">
- <el-form-item label="物资分类:" class="query-form-item">
+ <el-form-item label="物资分类:" >
<el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"></el-input>
</el-form-item>
diff --git a/src/views/basic/destiny/skProject.vue b/src/views/basic/destiny/skProject.vue
index f2058a73..92a9b427 100644
--- a/src/views/basic/destiny/skProject.vue
+++ b/src/views/basic/destiny/skProject.vue
@@ -4,13 +4,13 @@
<el-form :model="filterQuery" label-width="100px" size="mini">
<el-row>
<el-col :span="6">
- <el-form-item label="项目名称:" class="query-form-item">
- <el-input v-model="filterQuery.name" placeholder="请输入项目名称"></el-input>
+ <el-form-item label="项目编码:" class="query-form-item">
+ <el-input v-model="filterQuery.code" placeholder="请输入项目编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="项目编码:" class="query-form-item">
- <el-input v-model="filterQuery.code" placeholder="请输入项目编码"></el-input>
+ <el-form-item label="项目名称:" class="query-form-item">
+ <el-input v-model="filterQuery.name" placeholder="请输入项目名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -18,6 +18,7 @@
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+ <el-button type="primary" icon="el-icon-download" @click="onDownload">更新下载</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAddClick">新增</el-button>
</el-button-group>
</el-form-item>
@@ -31,8 +32,8 @@
<el-table-column label="项目编码" prop="code" width="140"></el-table-column>
<el-table-column label="项目名称" prop="name" width="160"></el-table-column>
<el-table-column label="备注" prop="remark" width="180"></el-table-column>
- <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>
- <el-table-column label="创建时间" prop="createTime" width="160"></el-table-column>
+ <!-- <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>-->
+ <el-table-column label="更新时间" prop="createTime" width="160"></el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
@@ -63,9 +64,9 @@
<el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
- <el-table-column label="产品DI" prop="nameCode"></el-table-column>
- <el-table-column label="产品编码" prop="thirdId"></el-table-column>
- <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+ <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+ <el-table-column label="第三方编码" prop="thirdId"></el-table-column>
+ <el-table-column label="物资名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="数量" prop="count">
@@ -105,7 +106,7 @@
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
- width="40%"
+ width="45%"
:before-close="closeDialog"
v-if="formVisible"
>
@@ -138,13 +139,14 @@
<script>
import {
addModeldestiny,
- delectModeldestiny, delectModeldestinyProduct,
+ delectModeldestiny, delectModeldestinyProduct, downloadBasicProject,
filterDestinyDelect,
getBasicDestinyfilter, uploadModeldestinyProduct
} from "@/api/basic/basicDestinyRel";
import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
import destinySelectProduct from "@/views/basic/destiny/destinySelectProduct";
+import {downloadSick} from "@/api/basic/sicker/skPersonApi";
export default {
@@ -161,6 +163,7 @@ export default {
formVisible: false,
selectFormVisible: false,
loading: false,
+ dlBasicLoading: false,
formName: "",
total: 0,
list: [],
@@ -209,6 +212,21 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
+
+ onDownload() {
+ this.dlBasicLoading = true;
+ downloadBasicProject({thidSys: "thirdId"}).then(res => {
+ this.dlBasicLoading = false
+ if (res.code != 20000) {
+ this.$message.error(res.message)
+ return
+ }
+ }).catch(() => {
+ this.dlBasicLoading = false
+ this.$message.error("数据加载失败")
+ })
+ },
+
getList() {
this.loading = true;
getBasicDestinyfilter(this.filterQuery).then(response => {