Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

# Conflicts:
#	dist/css/chunk-61f8141c.46b9efb2.css
#	dist/css/chunk-6b67a942.46b9efb2.css
#	dist/css/chunk-fa0c526e.d5c62f81.css
#	dist/index.html
#	dist/js/app.85eff7d1.js
#	dist/js/app.a83e01cf.js
#	dist/js/app.da14fb4f.js
#	dist/js/chunk-16f87b92.90f60f6b.js
#	dist/js/chunk-2a5eecda.1c9af271.js
#	dist/js/chunk-2a5eecda.f021d932.js

dist/css/chunk-16f87b92.e56571b3.css

+.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-e3e5856c]{width:360px}.w-160[data-v-e3e5856c]{width:160px}.w140[data-v-e3e5856c]{width:140px}.w350[data-v-e3e5856c]{width:350px}.tab-top[data-v-e3e5856c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-e3e5856c],.tab-top[data-v-e3e5856c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-e3e5856c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-e3e5856c]{height:60px}.table-content .img-text img[data-v-e3e5856c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-e3e5856c]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-e3e5856c]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-e3e5856c]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-e3e5856c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-e3e5856c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-e3e5856c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-e3e5856c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-e3e5856c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-e3e5856c]:hover{color:#2f54ed}.undeline-dash[data-v-e3e5856c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-e3e5856c]{display:inline-block;line-height:32px}.hidden-data[data-v-e3e5856c]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-2a5eecda.094d0869.css

-.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-6848d0ea]{width:360px}.w-160[data-v-6848d0ea]{width:160px}.w140[data-v-6848d0ea]{width:140px}.w350[data-v-6848d0ea]{width:350px}.tab-top[data-v-6848d0ea]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-6848d0ea],.tab-top[data-v-6848d0ea]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-6848d0ea]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-6848d0ea]{height:60px}.table-content .img-text img[data-v-6848d0ea]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-6848d0ea]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-6848d0ea]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-6848d0ea]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-6848d0ea]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-6848d0ea]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-6848d0ea]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-6848d0ea]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-6848d0ea]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-6848d0ea]:hover{color:#2f54ed}.undeline-dash[data-v-6848d0ea]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-6848d0ea]{display:inline-block;line-height:32px}.hidden-data[data-v-6848d0ea]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

src/router/performance.js

@@ -13,6 +13,9 @@ export default [
       {
         path: 'delivery-detail',
         component: () => import('@/views/performance-manage/delivery-detail.vue'),
+        meta: {
+          path: '/gift-performance/delivery'
+        }
       },
       {
         path: 'refund',

src/views/gift-manage/real-gift.vue

@@ -566,6 +566,7 @@ export default {
       this.stockData.remainedStock = '';
       this.stockData.textarea = '';
       this.StockDialog = false;
+      this.getTableList();
     },
     // 更新成本
     updateCost(item) {