正在显示
3 个修改的文件
包含
8 行增加
和
16 行删除
| @@ -29,7 +29,7 @@ module.exports = { | @@ -29,7 +29,7 @@ module.exports = { | ||
| 29 | assetsPublicPath: '/', | 29 | assetsPublicPath: '/', |
| 30 | proxyTable: { | 30 | proxyTable: { |
| 31 | '/api':{ | 31 | '/api':{ |
| 32 | - target: 'http://127.0.0.1:12343',//设置你调用的接口域名和端口号 别忘了加http | 32 | + target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http |
| 33 | changeOrigin: true, | 33 | changeOrigin: true, |
| 34 | pathRewrite: { | 34 | pathRewrite: { |
| 35 | '^/api': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可 | 35 | '^/api': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可 |
| @@ -8,7 +8,6 @@ | @@ -8,7 +8,6 @@ | ||
| 8 | <i v-if="!scope.row._expanded" class="el-icon-plus"/> | 8 | <i v-if="!scope.row._expanded" class="el-icon-plus"/> |
| 9 | <i v-else class="el-icon-minus"/> | 9 | <i v-else class="el-icon-minus"/> |
| 10 | </span> | 10 | </span> |
| 11 | - <!--{{ scope.$index }}--> | ||
| 12 | </template> | 11 | </template> |
| 13 | </el-table-column> | 12 | </el-table-column> |
| 14 | <el-table-column v-for="(column, index) in columns" v-else :key="column.value" :label="column.text" :width="column.width"> | 13 | <el-table-column v-for="(column, index) in columns" v-else :key="column.value" :label="column.text" :width="column.width"> |
| @@ -20,7 +19,6 @@ | @@ -20,7 +19,6 @@ | ||
| 20 | <i v-if="!scope.row._expanded" class="el-icon-plus"/> | 19 | <i v-if="!scope.row._expanded" class="el-icon-plus"/> |
| 21 | <i v-else class="el-icon-minus"/> | 20 | <i v-else class="el-icon-minus"/> |
| 22 | </span> | 21 | </span> |
| 23 | - {{ scope.row[column.value] }} | ||
| 24 | </template> | 22 | </template> |
| 25 | </el-table-column> | 23 | </el-table-column> |
| 26 | <slot/> | 24 | <slot/> |
| @@ -49,7 +47,7 @@ export default { | @@ -49,7 +47,7 @@ export default { | ||
| 49 | evalArgs: Array, | 47 | evalArgs: Array, |
| 50 | expandAll: { | 48 | expandAll: { |
| 51 | type: Boolean, | 49 | type: Boolean, |
| 52 | - default: true | 50 | + default: false |
| 53 | } | 51 | } |
| 54 | }, | 52 | }, |
| 55 | computed: { | 53 | computed: { |
| @@ -68,11 +66,8 @@ export default { | @@ -68,11 +66,8 @@ export default { | ||
| 68 | }, | 66 | }, |
| 69 | methods: { | 67 | methods: { |
| 70 | showRow: function(row) { | 68 | showRow: function(row) { |
| 71 | - this.data | ||
| 72 | - const show = (row.parent ? (row.parent._expanded && row.parent._show) : true) | ||
| 73 | -// const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true) | ||
| 74 | -// row.row._show = show | ||
| 75 | - row._show = show | 69 | + const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true) |
| 70 | + row.row._show = show | ||
| 76 | return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;' | 71 | return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;' |
| 77 | }, | 72 | }, |
| 78 | // 切换下级是否展开 | 73 | // 切换下级是否展开 |
| @@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
| 20 | @click="handleDelList">批量发送 | 20 | @click="handleDelList">批量发送 |
| 21 | </el-button> | 21 | </el-button> |
| 22 | </div> | 22 | </div> |
| 23 | - <tree-table :data="orgData" :eval-func="func" :eval-args="args" :expand-all="expandAll" stripe | ||
| 24 | - style="font-size: 13px" border @selection-change="handleSelectionChange"> | 23 | + <tree-table :data="orgData" :eval-func="func" :expand-all="expandAll" stripe |
| 24 | + style="font-size: 12px" border @selection-change="handleSelectionChange"> | ||
| 25 | <el-table-column prop="waybillNo" label="主单号" width="130px" align="center"> | 25 | <el-table-column prop="waybillNo" label="主单号" width="130px" align="center"> |
| 26 | <template slot-scope="scope"> | 26 | <template slot-scope="scope"> |
| 27 | <span>{{ scope.row.awba }}</span> | 27 | <span>{{ scope.row.awba }}</span> |
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | <span>{{ scope.row.flightno }}</span> | 37 | <span>{{ scope.row.flightno }}</span> |
| 38 | </template> | 38 | </template> |
| 39 | </el-table-column> | 39 | </el-table-column> |
| 40 | - <el-table-column label="航班日期" width="120px" align="center" sortable> | 40 | + <el-table-column label="航班日期" width="120px" align="center"> |
| 41 | <template slot-scope="scope"> | 41 | <template slot-scope="scope"> |
| 42 | <span>{{ scope.row.flightdate }}</span> | 42 | <span>{{ scope.row.flightdate }}</span> |
| 43 | </template> | 43 | </template> |
| @@ -502,7 +502,7 @@ | @@ -502,7 +502,7 @@ | ||
| 502 | } | 502 | } |
| 503 | return { | 503 | return { |
| 504 | func: treeToArray, | 504 | func: treeToArray, |
| 505 | - expandAll: true, | 505 | + expandAll:true, |
| 506 | total: 0, | 506 | total: 0, |
| 507 | loading: false, | 507 | loading: false, |
| 508 | listLoading: false, | 508 | listLoading: false, |
| @@ -510,11 +510,8 @@ | @@ -510,11 +510,8 @@ | ||
| 510 | multipleSelection: [], | 510 | multipleSelection: [], |
| 511 | dialogFormVisible: false, | 511 | dialogFormVisible: false, |
| 512 | dialogStatus: '', | 512 | dialogStatus: '', |
| 513 | - country: country, | ||
| 514 | countryOption: [], | 513 | countryOption: [], |
| 515 | shpCompnyTypeOption: [], | 514 | shpCompnyTypeOption: [], |
| 516 | - dangerGoods: dangerGoods, | ||
| 517 | - goodsPackage: goodsPackage, | ||
| 518 | textMap: { | 515 | textMap: { |
| 519 | update: '编辑', | 516 | update: '编辑', |
| 520 | create: '添加', | 517 | create: '添加', |
-
请 注册 或 登录 后发表评论