From 5d4021d7a3694a9ffa48b7c611009e14baa65c08 Mon Sep 17 00:00:00 2001
From: TorKing <1643074784@qq.com>
Date: Wed, 14 Jul 2021 18:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../distributionWarehousing/distributionWarehousing.vue | 2 +-
.../indexComponent/distributionWarehousing/sendRecord.vue | 2 +-
.../components/addFolviteDistribution.vue | 6 +++++-
.../folviteDistribution/folviteDistribution.vue | 4 ++--
.../inStockManage/components/addMaterialDistribution.vue | 5 ++++-
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue b/src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
index 95f5124..c09dbf9 100644
--- a/src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
+++ b/src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
@@ -50,7 +50,7 @@
const columns = [
{
title: '发放单位',
- dataIndex: 'sendUnitName',
+ dataIndex: 'sendNodeName',
ellipsis: true
},
{
diff --git a/src/views/indexComponent/distributionWarehousing/sendRecord.vue b/src/views/indexComponent/distributionWarehousing/sendRecord.vue
index 71a2842..b223b7a 100644
--- a/src/views/indexComponent/distributionWarehousing/sendRecord.vue
+++ b/src/views/indexComponent/distributionWarehousing/sendRecord.vue
@@ -56,7 +56,7 @@
const columns = [
{
title: '收货单位',
- dataIndex: 'receiveUnitName',
+ dataIndex: 'receiveNodeName',
width:"240px",
ellipsis: true
},
diff --git a/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue b/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
index 23f80ae..0a22049 100644
--- a/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
+++ b/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
@@ -445,7 +445,11 @@
},
getBookHtmlContent() {//获取用户知情书模板
this.$api.common.fetchConsentInfo().then(({data}) => {
- this.bookHtmlContent = data
+ if (this.$api.utils.isBlank(data)){
+ this.bookHtmlContent={content:""}
+ }else {
+ this.bookHtmlContent = data;
+ }
})
},
getAllDoctorList() {
diff --git a/src/views/indexComponent/folviteDistribution/folviteDistribution.vue b/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
index a4b26e5..85d8c66 100644
--- a/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
+++ b/src/views/indexComponent/folviteDistribution/folviteDistribution.vue
@@ -3,7 +3,7 @@
<a-form layout="inline" class="search_form">
<a-form-item label="证件号码">
<!--v-price="{digit:4}"-->
- <a-input v-model="searchForm.idCar" placeholder="请输入证件号码" style="width: 250px"></a-input>
+ <a-input v-model="searchForm.womenIdCard" placeholder="请输入证件号码" style="width: 250px"></a-input>
</a-form-item>
<a-form-item>
<!-- <a-button class="search_btn" @click="restSearchForm">读卡识别</a-button>-->
@@ -95,7 +95,7 @@
return {
// 搜索框对象
searchForm: {
- idCar:undefined
+ womenIdCard:undefined
},
pagination: {
pageIndex: 1,
diff --git a/src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue b/src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
index e1bd835..bcf1fe5 100644
--- a/src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
+++ b/src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue
@@ -217,9 +217,12 @@
} else {
this.subLoad = true;
let params = {}
- let reviceUnitName = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].unitName
+ let reviceUnitName = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].unitName;
+ let treeNodeId = this.childUnitList.filter(item => item.id == this.formData.receiveUnitId)[0].treeNodeId;
params = {
...this.formData,
+ receiveNodeId:treeNodeId,
+ receiveNodeName:reviceUnitName,
sendDate: moment(this.formData.sendDate).format('yyyy-MM-DD'),
receiveUnitName: reviceUnitName
};
--
2.18.0