|
@@ -156,7 +156,8 @@
|
|
|
<el-button @click="enclosure = false" size="small">取 消</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <track-playback :dialogVisible="dialogVisibleTwo" v-loading="loadingDialog" :parkingPoint="parkingPoint" :lineArr="lineArr"
|
|
|
+ <track-playback :dialogVisible="dialogVisibleTwo" v-loading="loadingDialog" :parkingPoint="parkingPoint"
|
|
|
+ :lineArr="lineArr"
|
|
|
ref="playback"></track-playback>
|
|
|
</basic-container>
|
|
|
</div>
|
|
@@ -271,7 +272,7 @@ export default {
|
|
|
searchIcon: true,
|
|
|
searchIndex: 2,
|
|
|
searchSpan: 8,
|
|
|
- menuWidth:140,
|
|
|
+ menuWidth: 140,
|
|
|
menu: true,
|
|
|
searchMenuPosition: "right",
|
|
|
searchMenuSpan: 6,
|
|
@@ -424,6 +425,30 @@ export default {
|
|
|
this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88.1), this.optionList);
|
|
|
this.collectionOption = await this.getColumnData(this.getColumnName(88.2), this.collectionOptionBackup);
|
|
|
this.key++
|
|
|
+ if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1) {
|
|
|
+ let type = false
|
|
|
+ for (let item in this.goodsOptionCrud.column) {
|
|
|
+ if (this.goodsOptionCrud.column[item].prop == 'profit') {
|
|
|
+ type = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!type) {
|
|
|
+ this.goodsOptionCrud.column.push({
|
|
|
+ label: '利润',
|
|
|
+ width: 80,
|
|
|
+ precision: 2,
|
|
|
+ index: 16,
|
|
|
+ type: 'number',
|
|
|
+ prop: 'profit'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for (let item in this.goodsOptionCrud.column) {
|
|
|
+ if (this.goodsOptionCrud.column[item].prop == 'profit') {
|
|
|
+ this.goodsOptionCrud.column.splice(item, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
|
|
|
this.goodsOptionCrud.menu = false;
|
|
|
// this.goodsOptionCrud.column.forEach((item,index)=>{
|
|
@@ -542,13 +567,6 @@ export default {
|
|
|
width: 100,
|
|
|
prop: 'extraAmountC'
|
|
|
}, {
|
|
|
- label: '利润',
|
|
|
- width: 80,
|
|
|
- precision: 2,
|
|
|
- index: 16,
|
|
|
- type: 'number',
|
|
|
- prop: 'profit'
|
|
|
- }, {
|
|
|
label: '应付杂费明细',
|
|
|
width: 100,
|
|
|
index: 18,
|
|
@@ -687,13 +705,6 @@ export default {
|
|
|
width: 100,
|
|
|
prop: 'extraAmountC'
|
|
|
}, {
|
|
|
- label: '利润',
|
|
|
- width: 80,
|
|
|
- precision: 2,
|
|
|
- index: 16,
|
|
|
- type: 'number',
|
|
|
- prop: 'profit'
|
|
|
- }, {
|
|
|
label: '应付杂费明细',
|
|
|
width: 100,
|
|
|
index: 18,
|
|
@@ -770,7 +781,7 @@ export default {
|
|
|
...queryParams //括号内是要传递给新窗口的参数
|
|
|
}
|
|
|
})
|
|
|
- window.open(routeData.href.slice(1,routeData.href.length)+'&'+`${this.website.tokenHeader}=${getToken()}`);
|
|
|
+ window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
type: 'info',
|
|
@@ -823,6 +834,30 @@ export default {
|
|
|
this.$message.success("重置成功");
|
|
|
this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
+ if (this.roleName.indexOf('admin') !== -1 || this.roleName.indexOf('总调度') !== -1) {
|
|
|
+ let type = false
|
|
|
+ for (let item in this.goodsOptionCrud.column) {
|
|
|
+ if (this.goodsOptionCrud.column[item].prop == 'profit') {
|
|
|
+ type = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!type) {
|
|
|
+ this.goodsOptionCrud.column.push({
|
|
|
+ label: '利润',
|
|
|
+ width: 80,
|
|
|
+ precision: 2,
|
|
|
+ index: 16,
|
|
|
+ type: 'number',
|
|
|
+ prop: 'profit'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for (let item in this.goodsOptionCrud.column) {
|
|
|
+ if (this.goodsOptionCrud.column[item].prop == 'profit') {
|
|
|
+ this.goodsOptionCrud.column.splice(item, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
|
|
|
this.goodsOptionCrud.menu = false;
|
|
|
// this.goodsOptionCrud.column.forEach((item,index)=>{
|
|
@@ -941,13 +976,6 @@ export default {
|
|
|
width: 100,
|
|
|
prop: 'extraAmountC'
|
|
|
}, {
|
|
|
- label: '利润',
|
|
|
- width: 80,
|
|
|
- precision: 2,
|
|
|
- index: 16,
|
|
|
- type: 'number',
|
|
|
- prop: 'profit'
|
|
|
- }, {
|
|
|
label: '应付杂费明细',
|
|
|
width: 100,
|
|
|
index: 18,
|
|
@@ -1086,13 +1114,6 @@ export default {
|
|
|
width: 100,
|
|
|
prop: 'extraAmountC'
|
|
|
}, {
|
|
|
- label: '利润',
|
|
|
- width: 80,
|
|
|
- precision: 2,
|
|
|
- index: 16,
|
|
|
- type: 'number',
|
|
|
- prop: 'profit'
|
|
|
- }, {
|
|
|
label: '应付杂费明细',
|
|
|
width: 100,
|
|
|
index: 18,
|
|
@@ -1124,6 +1145,7 @@ export default {
|
|
|
})
|
|
|
return this.calculateHu()
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
//行跳转
|
|
|
celJump(row, index) {
|