分配记录

src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue

@@ -50,7 +50,7 @@
     const columns = [
         {
             title: '发放单位',
-            dataIndex: 'sendUnitName',
+            dataIndex: 'sendNodeName',
             ellipsis: true
         },
         {

src/views/indexComponent/distributionWarehousing/sendRecord.vue

@@ -56,7 +56,7 @@
     const columns = [
         {
             title: '收货单位',
-            dataIndex: 'receiveUnitName',
+            dataIndex: 'receiveNodeName',
             width:"240px",
             ellipsis: true
         },

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() {

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,

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
                             };