Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl

# Conflicts:
#	src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue
#	src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue
#	src/views/indexComponent/supplyManage/components/addSupply.vue

src/views/indexComponent/distributionWarehousing/distributionWarehousing.vue

@@ -28,6 +28,7 @@
                  rowKey="id"
                  :loading="loading"
                  :pagination="false"
+                 :scroll="{ x: 1}"
         >
             <template slot="expireDateS" slot-scope="record">
                 {{record.expireDate | formatDate}}
@@ -56,7 +57,7 @@
         {
             title: '发放单位',
             width:'200px',
-            dataIndex: 'sendNodeName',
+            dataIndex: 'sendUnitName',
             ellipsis: true
         },
         // {
@@ -67,54 +68,62 @@
         {
             title: '品牌',
             dataIndex: 'brandName',
-            ellipsis: true
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '批次号',
             dataIndex: 'batchNumber',
-            ellipsis: true
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '生产日期',
             dataIndex: 'produceDate',
-            ellipsis: true
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '有效期',
+            width:'200px',
             scopedSlots: {customRender: 'expireDateS'},
         },
         {
             title: '单价(元)',
-            width:'90px',
             dataIndex: 'unitPrice',
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '规格',
             dataIndex: 'specs',
-            width:'70px',
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '分配数量',
             dataIndex: 'sendNum',
-            width:'100px',
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '入库状态',
             // dataIndex: 'statusName',
             // ellipsis: true,
-            width:'100px',
+            width:'200px',
             scopedSlots: {customRender: 'statusNameInfo'},
         },
         {
             title: '入库日期',
             dataIndex: 'receiveDate',
-            width: '110px',
+            ellipsis: true,
+            width:'200px'
         },
         {
             title: '操作',
             align: 'center',
             fixed: 'right',
-            width:'140px',
+            width:'200px',
             scopedSlots: {customRender: 'action'},
         },
     ]
@@ -219,7 +228,6 @@
     .btn_space {
         margin-right: 5px;
     }
-
     /*.search_form {
         margin-top: -17px;
         border: 1px solid rgba(255,77,128, .2);

src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue

@@ -496,10 +496,7 @@
                 this.$api.common.fetchAreaByCode({areaCode: targetOption.areaCode}).then(({data = []}) => {
                     targetOption.loading = false;
                     data.forEach(item => {
-                        item['isLeaf'] = false
-                        if (item.areaLevel >=5) {
-                            item['isLeaf'] = true
-                        }
+                        item['isLeaf'] = item.areaLevel >= 5;
                     })
                     if (targetOption.areaCode == 0) {
                         this.areaInfo = [...data]

src/views/indexComponent/inStockManage/components/addMaterialDistribution.vue

@@ -225,12 +225,14 @@
                             let params = {}
                             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;
+                            let unitInfo = JSON.parse(window.sessionStorage.setItem('unitInfo'));
                             params = {
                                 ...this.formData,
-                                receiveNodeId:treeNodeId,
-                                receiveNodeName:reviceUnitName,
+                                receiveNodeId: treeNodeId,
+                                receiveNodeName: reviceUnitName,
                                 sendDate: moment(this.formData.sendDate).format('yyyy-MM-DD'),
-                                receiveUnitName: reviceUnitName
+                                receiveUnitName: reviceUnitName,
+                                sendUnitName: unitInfo.unitName
                             };
                             let detailedList = [];
                             this.formData.detailedList.forEach(item => {
@@ -266,14 +268,16 @@
         border: 1px solid #F0F0F0;
         border-bottom: 0px
     }
+
     .addMaterialDistribution {
         .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
             padding: 10px !important;
         }
     }
+
     .modal_table {
         .ant-form-item {
-            margin-bottom: 0px!important;
+            margin-bottom: 0px !important;
         }
     }
 </style>

src/views/indexComponent/supplyManage/components/addSupply.vue

@@ -154,10 +154,7 @@
                 this.$api.common.fetchAreaByCode({areaCode: targetOption.areaCode}).then(({data = []}) => {
                     targetOption.loading = false;
                     data.forEach(item => {
-                        item['isLeaf'] = false
-                        if (item.areaLevel >=5) {
-                            item['isLeaf'] = true
-                        }
+                        item['isLeaf'] = item.areaLevel >= 5;
                     })
                     if (targetOption.areaCode == 0) {
                         this.areaInfo = [...data]
@@ -175,7 +172,7 @@
                     if (true) {
                         // vm.subLoad = true;
                         const {areaCode, areaName, ...others} = vm.formData
-                        let areaInfo = areaCode[areaCode.length -1]
+                        let areaInfo = areaCode[areaCode.length - 1]
                         let par = {
                             areaCode: areaInfo,
                             ...others

src/views/indexComponent/supplyManage/supplyManage.vue

@@ -13,8 +13,12 @@
                 </a-select>
             </a-form-item>
             <a-form-item>
-                <a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">搜索</a-button>
-                <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px" @click="restSearchForm">清空</a-button>
+                <a-button type="primary" icon="search" class="search_btn" style="margin-left: 10px" @click="searchList">
+                    搜索
+                </a-button>
+                <a-button class="search_btn ant-table-btn" icon="sync" style="margin-left: 10px"
+                          @click="restSearchForm">清空
+                </a-button>
             </a-form-item>
             <a-button type="primary" class="search_btn" style="float: right" @click="toAdd">添加供应商</a-button>
             <div style="clear: both"></div>
@@ -35,11 +39,11 @@
                         cancel-text="否"
                         @confirm="changeStatus(record)"
                 >
-                    <a href="#">{{record.status === 1 ? '停用' : '启用'}}</a>
+                    <a-button class="ant-table-btn" size="small">{{record.status==0?'启用':'停用'}}
+                    </a-button>
+                    <a-button style="margin-left: 10px" class="ant-table-btn" size="small" @click="updateSupply(record)">修改</a-button>
                 </a-popconfirm>
-
-                <a-button type="link" size="small" @click="updateSupply(record)">修改</a-button>
-<!--                <a-button type="link" size="small" @click="deleteConfirm(record)">删除</a-button>-->
+                <!--                <a-button type="link" size="small" @click="deleteConfirm(record)">删除</a-button>-->
             </template>
         </a-table>
         <a-pagination
@@ -58,6 +62,7 @@
 </template>
 <script>
     import {getEnumByFlag, isEmptyParams} from "../../utils/common";
+
     const columns = [
         {
             title: '供应商名称',
@@ -178,7 +183,7 @@
                 this.searchList()
             },
             toAdd() {
-                this.$router.push({path:'/supplyManage/add',query: {modeType: "add"}})
+                this.$router.push({path: '/supplyManage/add', query: {modeType: "add"}})
             },
             changeStatus(record) {
                 let par = {