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

src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue

@@ -115,7 +115,6 @@
                         });
                     },
                     onCancel() {
-                        that.$message.warning('已取消!');
                     },
                     class: 'test',
                 });

src/views/indexComponent/distributionWarehousing/sendRecord.vue

@@ -27,7 +27,6 @@
                  rowKey="id"
                  :loading="loading"
                  :pagination="false"
-                 bordered
         >
             <template slot="statusName" slot-scope="record">
                 <a-button type="link" size="small">{{record.statusName}}</a-button>

src/views/indexComponent/stockTransfer/stockTransfer.vue

@@ -78,7 +78,7 @@
         {
             title: '生产日期',
             dataIndex: 'produceDate',
-            scopedSlots: {customRender: 'produceDateS'},
+
         },
         {
             title: '有效期',