From 1bc4abc4059185784e3084a8e767eab1abff6929 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 8 Nov 2023 10:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=A4=87=E6=B3=A8=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
.env.production | 4 +-
.../purchase/purApply/purApplyEditDiaolog.vue | 1 +
.../purApply/purOrderSelectProduct.vue | 95 ++++++++++---------
4 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/.env.development b/.env.development
index c36d00d3..eed92e7d 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
diff --git a/.env.production b/.env.production
index 3ca504ef..db49354c 100644
--- a/.env.production
+++ b/.env.production
@@ -13,10 +13,10 @@ ENV = 'production'
刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
# 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index c9eea37b..491f4517 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -108,6 +108,7 @@
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column width="150" label="申购数量">
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 55f447ed..0f6297d6 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -102,21 +102,22 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方物资编码" prop="thirdId" width="120" show-overflow-tooltip></el-table-column>
- <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="商品名称" prop="spmc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
<el-table-column
- v-if="productRemarkSet.remarkEnable1"
- :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
- show-overflow-tooltip></el-table-column>
+ v-if="productRemarkSet.remarkEnable1"
+ :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
+ show-overflow-tooltip></el-table-column>
<el-table-column
- v-if="productRemarkSet.remarkEnable2"
- :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
- show-overflow-tooltip></el-table-column>
+ v-if="productRemarkSet.remarkEnable2"
+ :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
+ show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="80" fixed="right">
<template slot-scope="scope">
@@ -126,23 +127,23 @@
</el-table>
<pagination
- v-show="pageTotal>0"
- :total="pageTotal"
- :page.sync="listQuery.page"
- :limit.sync="listQuery.limit"
- @pagination="handleErpPageChange"
+ v-show="pageTotal>0"
+ :total="pageTotal"
+ :page.sync="listQuery.page"
+ :limit.sync="listQuery.limit"
+ @pagination="handleErpPageChange"
></pagination>
</el-card>
<el-dialog
- title="耗材字典详情"
- :visible.sync="udiRlDetailVisible"
- width="80%"
- :close-on-click-modal="false"
- :close-on-press-escape="false"
- append-to-body
- v-if="udiRlDetailVisible"
+ title="耗材字典详情"
+ :visible.sync="udiRlDetailVisible"
+ width="80%"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ append-to-body
+ v-if="udiRlDetailVisible"
>
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
@@ -365,43 +366,43 @@ export default {
this.listQuery.customerId = store.getters.customerId;
this.listQuery.id = this.pId;
filterCompanyProductplanRelevance(this.listQuery)
- .then((response) => {
- this.loading = false;
- if (response.code === 20000) {
- this.dataList = response.data.list || [];
- this.pageTotal = response.data.total || 0;
- } else {
- this.$message.error(response.message);
+ .then((response) => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.dataList = response.data.list || [];
+ this.pageTotal = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
+ this.dataList = [];
+ this.pageTotal = 0;
+ }
+ })
+ .catch(() => {
+ this.loading = false;
this.dataList = [];
this.pageTotal = 0;
- }
- })
- .catch(() => {
- this.loading = false;
- this.dataList = [];
- this.pageTotal = 0;
- });
+ });
},
getRationList() {
this.loading = true;
filterCompanyProductRationRelevance(this.listQuery)
- .then((response) => {
- this.loading = false;
- if (response.code === 20000) {
- this.dataList = response.data.list || [];
- this.pageTotal = response.data.total || 0;
- } else {
- this.$message.error(response.message);
+ .then((response) => {
+ this.loading = false;
+ if (response.code === 20000) {
+ this.dataList = response.data.list || [];
+ this.pageTotal = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
+ this.dataList = [];
+ this.pageTotal = 0;
+ }
+ })
+ .catch(() => {
+ this.loading = false;
this.dataList = [];
this.pageTotal = 0;
- }
- })
- .catch(() => {
- this.loading = false;
- this.dataList = [];
- this.pageTotal = 0;
- });
+ });
},
intentBack() {
this.closeDialog();