|
|
@@ -66,13 +66,13 @@
|
|
|
<!-- 增项分类列表 -->
|
|
|
<el-row :gutter="2">
|
|
|
<el-col :span="12">
|
|
|
- <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
|
|
|
+ <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
|
|
|
<div slot="header">
|
|
|
<span><i class="icon icon-table2"></i> 全部准入范围</span>
|
|
|
<!-- <el-button style="float: right; padding: 3px 0" type="text"
|
|
|
v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button> -->
|
|
|
</div>
|
|
|
- <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
|
|
|
+ <el-table :data="entityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
|
|
|
<!-- <el-table-column label="操作" min-width="100" align="center" fixed>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
|
|
|
@@ -93,13 +93,13 @@
|
|
|
<el-col :span="12">
|
|
|
<!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
|
|
|
:candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
|
|
|
- <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
|
|
|
+ <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
|
|
|
<div slot="header">
|
|
|
<span><i class="icon icon-table2"></i> 新增准入范围</span>
|
|
|
<el-button style="float: right; padding: 3px 0" type="text"
|
|
|
v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
|
|
|
</div>
|
|
|
- <el-table :data="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
|
|
|
+ <el-table :data="myentityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
|
|
|
<el-table-column label="操作" min-width="100" align="center" fixed>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
|
|
|
@@ -136,7 +136,7 @@
|
|
|
<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<div v-for="(tmpUrl, index) in scope.row.FileUrlList">
|
|
|
- <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
|
|
|
+ <a :href="fileurlcut(scope.row.FileUrl, index)" target="_blank"
|
|
|
class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -188,7 +188,7 @@
|
|
|
</el-dialog>
|
|
|
<!-- 增项分类添加、修改 -->
|
|
|
<el-dialog title="添加" :visible.sync="dialogVisible">
|
|
|
- <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
|
|
|
+ <el-form label-width="150px" v-loading="dialogloading" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="分类名称" prop="Name">
|
|
|
@@ -520,6 +520,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
|
|
|
AppendType: '02', // 增项类别(01 物资类，02 基建类，03 技术服务类)
|
|
|
Remark: '' // 备注
|
|
|
},
|
|
|
+ dialogloading: false,
|
|
|
dialogVisible: false, // 增项分类dialog
|
|
|
dialogFormData: {
|
|
|
Id: '',
|
|
|
@@ -840,7 +841,15 @@ import fileapi from '@/api/oilsupplier/supplierfile'
|
|
|
fileurlcut (val, index) {
|
|
|
let fileurlall = val.split('$')[index]
|
|
|
let fileurl = fileurlall.split('|')
|
|
|
- return fileurl[0]
|
|
|
+ let fullUrl = fileurl[0]
|
|
|
+ // 内网服务器专用
|
|
|
+ if (process.client && (fullUrl.indexOf('upfile') === 0 || fullUrl.indexOf('/upfile') === 0)) {
|
|
|
+ const myDomain = window.location.host
|
|
|
+ fullUrl = 'http://' + myDomain + '/' + fullUrl
|
|
|
+ } else {
|
|
|
+ fullUrl = 'http://' + fullUrl
|
|
|
+ }
|
|
|
+ return fullUrl
|
|
|
},
|
|
|
commitaudit () {
|
|
|
if (this.subfileList && this.subfileList.length > 0) {
|
|
|
@@ -1225,6 +1234,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
|
|
|
_this.dialogFormData.SupplierId = _this.formData.SupplierId
|
|
|
_this.dialogFormData.SupplierCertId = _this.formData.SupplierCertId
|
|
|
_this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
|
|
|
+ _this.dialogloading = true
|
|
|
_this.addSortAppend()
|
|
|
} else {
|
|
|
return false
|
|
|
@@ -1249,6 +1259,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
|
|
|
this.dialogFormData.SupplierTypeCode = '02'
|
|
|
this.$axios.post('/suppliercertappendsub/addappendsub/', this.dialogFormData)
|
|
|
.then(res => {
|
|
|
+ this.dialogloading = false
|
|
|
if (res.data.code === 0) {
|
|
|
this.$message({
|
|
|
type: 'success',
|
yuedefeng