|
|
@@ -41,11 +41,9 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-search"
|
|
|
- @click="handleQuery"
|
|
|
- >搜索</el-button>
|
|
|
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -92,20 +90,13 @@
|
|
|
label="年份"
|
|
|
align="center"
|
|
|
prop="year"
|
|
|
- width="100"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
label="保税区名称"
|
|
|
align="center"
|
|
|
prop="bondedName"
|
|
|
- width="200"
|
|
|
></el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="审核状态"
|
|
|
- align="center"
|
|
|
- prop="approvalStatus"
|
|
|
- width="120"
|
|
|
- >
|
|
|
+ <el-table-column label="审核状态" align="center" prop="approvalStatus">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{
|
|
|
scope.row.approvalStatus == 0 || scope.row.approvalStatus == null
|
|
|
@@ -122,22 +113,18 @@
|
|
|
label="审核时间"
|
|
|
align="center"
|
|
|
prop="approvalTime"
|
|
|
- width="160"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
label="审核人"
|
|
|
align="center"
|
|
|
prop="approvalName"
|
|
|
- width="140"
|
|
|
></el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="上报状态"
|
|
|
- align="center"
|
|
|
- prop="reportStatus"
|
|
|
- width="120"
|
|
|
- >
|
|
|
+ <el-table-column label="上报状态" align="center" prop="reportStatus">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.reportStatus == 0 || scope.row.reportStatus == null">未上报</span>
|
|
|
+ <span
|
|
|
+ v-if="scope.row.reportStatus == 0 || scope.row.reportStatus == null"
|
|
|
+ >未上报</span
|
|
|
+ >
|
|
|
<span v-if="scope.row.reportStatus == 1">已上报</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -145,27 +132,25 @@
|
|
|
label="上报人"
|
|
|
align="center"
|
|
|
prop="reportName"
|
|
|
- width="140"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
label="上报时间"
|
|
|
align="center"
|
|
|
prop="reportTime"
|
|
|
- width="160"
|
|
|
></el-table-column>
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="200">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
v-if="
|
|
|
- (scope.row.auditStatus == 0 || scope.row.auditStatus == null) &&
|
|
|
- checkPermi(['business:QUOTABONDED:edit'])
|
|
|
+ (scope.row.auditStatus == 0 || scope.row.auditStatus == null) && (scope.row.approvalStatus == 0 ||scope.row.approvalStatus == null) &&
|
|
|
+ checkPermi(['gather:QUOTABONDED:audit'])
|
|
|
"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@click="handleApprove(scope.row)"
|
|
|
>提交审核</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
v-if="
|
|
|
scope.row.auditStatus == 1 &&
|
|
|
(scope.row.approvalStatus == 0 ||
|
|
|
@@ -176,12 +161,12 @@
|
|
|
type="text"
|
|
|
@click="handleAdminApprove(scope.row)"
|
|
|
>审核</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
<el-button
|
|
|
v-if="
|
|
|
- scope.row.approvalStatus == 1 &&
|
|
|
+ scope.row.approvalStatus == 2 &&
|
|
|
(scope.row.reportStatus == 0 || scope.row.reportStatus == null) &&
|
|
|
- checkPermi(['business:QUOTABONDED:edit'])
|
|
|
+ checkPermi(['gather:QUOTABONDED:report'])
|
|
|
"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -191,7 +176,7 @@
|
|
|
>
|
|
|
<el-button
|
|
|
v-if="
|
|
|
- (scope.row.auditStatus == 0 || scope.row.auditStatus == null) &&
|
|
|
+ (scope.row.auditStatus == 0 || scope.row.auditStatus == null) && (scope.row.approvalStatus == 0 ||scope.row.approvalStatus == null) &&
|
|
|
checkPermi(['business:QUOTABONDED:edit'])
|
|
|
"
|
|
|
size="mini"
|
|
|
@@ -206,8 +191,15 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- >删除</el-button
|
|
|
- >
|
|
|
+ >删除</el-button>
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ v-if="checkPermi(['business:QUOTABONDED:query'])"
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click="handleUpdate(scope.row)"
|
|
|
+ >查看</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -262,11 +254,22 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-card class="box-card" v-for="(dict,index) in QUOTAFEEList" :key="dict.id" :value="dict" style="margin-bottom: 24px;font-weight: bold ">
|
|
|
- <div slot="header" style="margin-left: 30px;font-size: 15px">
|
|
|
- <span>指标：{{dict.quotaName}}</span>
|
|
|
+ <el-card
|
|
|
+ class="box-card"
|
|
|
+ v-for="(dict, index) in QUOTAFEEList"
|
|
|
+ :key="dict.id"
|
|
|
+ :value="dict"
|
|
|
+ style="margin-bottom: 24px; font-weight: bold"
|
|
|
+ >
|
|
|
+ <div slot="header" style="margin-left: 30px; font-size: 15px">
|
|
|
+ <span>指标：{{ dict.quotaName }}</span>
|
|
|
</div>
|
|
|
- <el-form-item v-if="dict.confirmWay == '附件'" label-width="70px" prop="linkUrls" label="上传附件">
|
|
|
+ <el-form-item
|
|
|
+ v-if="dict.confirmWay == '附件'"
|
|
|
+ label-width="70px"
|
|
|
+ prop="linkUrls"
|
|
|
+ label="上传附件"
|
|
|
+ >
|
|
|
<el-upload
|
|
|
class="upload-demo"
|
|
|
ref="upload"
|
|
|
@@ -283,7 +286,7 @@
|
|
|
审核无法修改
|
|
|
</div>
|
|
|
<el-button slot="trigger" size="small" type="primary"
|
|
|
- >选取文件</el-button
|
|
|
+ >选取文件</el-button
|
|
|
>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
@@ -306,12 +309,20 @@
|
|
|
prop="numValue"
|
|
|
label="数值"
|
|
|
>
|
|
|
- <el-input type="number" :disabled="isAppoval" v-model="dict.numValue"></el-input>
|
|
|
+ <el-input
|
|
|
+ type="number"
|
|
|
+ :disabled="isAppoval"
|
|
|
+ v-model="dict.numValue"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label-width="70px" prop="score" label="分数">
|
|
|
<el-input :disabled="isAppoval" v-model="dict.score"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-card>
|
|
|
+
|
|
|
+ <!-- <el-form-item label-width="100px" label="驳回理由">
|
|
|
+ <el-input type="textarea" width="100%" v-model="form.test"></el-input>
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
<div slot="footer" v-if="!isAppoval" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
@@ -345,8 +356,11 @@ import { listQUOTAFEERole } from "@/api/norm/QUOTAFEE";
|
|
|
import { listAllBONDED } from "@/api/portal/BONDED/BONDED.js";
|
|
|
import { uploadFiles, downloadFiles } from "@/api/common";
|
|
|
import { listDept } from "@/api/system/dept";
|
|
|
-import { checkPermi,checkRole } from "@/utils/permission"; // 权限判断函数
|
|
|
+import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
+
|
|
|
+import { getInfo } from "@/api/login.js";
|
|
|
+
|
|
|
export default {
|
|
|
name: "QUOTABONDED",
|
|
|
data() {
|
|
|
@@ -356,15 +370,15 @@ export default {
|
|
|
// 是否显示弹出层（用户导入）
|
|
|
open: false,
|
|
|
// 弹出层标题（用户导入）
|
|
|
- title: '',
|
|
|
+ title: "",
|
|
|
// 是否禁用上传
|
|
|
isUploading: false,
|
|
|
// 是否更新已经存在的用户数据
|
|
|
updateSupport: 0,
|
|
|
// 设置上传的请求头部
|
|
|
- headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
+ headers: { Authorization: "Bearer " + getToken() },
|
|
|
// 上传的地址
|
|
|
- url: process.env.VUE_APP_BASE_API + '/common/upload'
|
|
|
+ url: process.env.VUE_APP_BASE_API + "/common/upload",
|
|
|
},
|
|
|
uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploads",
|
|
|
isAppoval: false,
|
|
|
@@ -405,9 +419,7 @@ export default {
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
- year: [
|
|
|
- { required: true, message: "年份不能为空", trigger: "blur" },
|
|
|
- ],
|
|
|
+ year: [{ required: true, message: "年份不能为空", trigger: "blur" }],
|
|
|
bondedName: [
|
|
|
{ required: true, message: "综保区名称不能为空", trigger: "blur" },
|
|
|
],
|
|
|
@@ -428,16 +440,16 @@ export default {
|
|
|
methods: {
|
|
|
checkPermi,
|
|
|
checkRole,
|
|
|
- listQUOTAFEERole(){
|
|
|
+ listQUOTAFEERole() {
|
|
|
listQUOTAFEERole().then((response) => {
|
|
|
response.data.forEach((item, index) => {
|
|
|
response.data[index].status = item.status == 0 ? false : true;
|
|
|
});
|
|
|
this.QUOTAFEEList = response.data;
|
|
|
- this.QUOTAFEEList.forEach(item => {
|
|
|
- item.fileList = []
|
|
|
- item.linkUrls = ''
|
|
|
- item.fileNames = ''
|
|
|
+ this.QUOTAFEEList.forEach((item) => {
|
|
|
+ item.fileList = [];
|
|
|
+ item.linkUrls = "";
|
|
|
+ item.fileNames = "";
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
@@ -445,8 +457,21 @@ export default {
|
|
|
getDeptList() {
|
|
|
this.loading = true;
|
|
|
listDept({ parentId: "100" }).then((response) => {
|
|
|
- this.deptList = response.data;
|
|
|
- this.loading = false;
|
|
|
+ getInfo().then((res) => {
|
|
|
+ if (res.user.dept.type == 2) {
|
|
|
+ response.data.forEach((item) => {
|
|
|
+ if (item.deptId == res.user.dept.deptId) {
|
|
|
+ this.deptList = [item];
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.loading = false;
|
|
|
+ return;
|
|
|
+ } else if(res.user.dept.type == 1) {
|
|
|
+ this.deptList = response.data;
|
|
|
+ }
|
|
|
+ this.loading = false;
|
|
|
+ });
|
|
|
});
|
|
|
},
|
|
|
selectBondedChange(val) {
|
|
|
@@ -531,9 +556,9 @@ export default {
|
|
|
getQUOTABONDED(id).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.QUOTAFEEList = response.data.bondedFeeList;
|
|
|
- this.QUOTAFEEList.forEach(item => item.fileList = []);
|
|
|
- this.QUOTAFEEList.forEach(item => {
|
|
|
- item.fileList.push({name:item.fileNames,url:item.linkUrls});
|
|
|
+ this.QUOTAFEEList.forEach((item) => (item.fileList = []));
|
|
|
+ this.QUOTAFEEList.forEach((item) => {
|
|
|
+ item.fileList.push({ name: item.fileNames, url: item.linkUrls });
|
|
|
});
|
|
|
this.open = true;
|
|
|
this.$forceUpdate();
|
|
|
@@ -542,26 +567,26 @@ export default {
|
|
|
},
|
|
|
// 文件上传成功处理
|
|
|
handleFileSuccess(index, response, file, fileList) {
|
|
|
- console.log("1111",index)
|
|
|
- console.log("22222",fileList)
|
|
|
- let linkUrls = '';
|
|
|
- let fileNames = '';
|
|
|
- fileList.forEach(item => {
|
|
|
- linkUrls += item.response.fileName + ',';
|
|
|
- fileNames += item.response.newFileName + ',';
|
|
|
- })
|
|
|
- this.QUOTAFEEList.forEach((item,key) => {
|
|
|
- if(key == index) {
|
|
|
- item.linkUrls = linkUrls
|
|
|
- item.fileNames = fileNames
|
|
|
+ console.log("1111", index);
|
|
|
+ console.log("22222", fileList);
|
|
|
+ let linkUrls = "";
|
|
|
+ let fileNames = "";
|
|
|
+ fileList.forEach((item) => {
|
|
|
+ linkUrls += item.response.fileName + ",";
|
|
|
+ fileNames += item.response.newFileName + ",";
|
|
|
+ });
|
|
|
+ this.QUOTAFEEList.forEach((item, key) => {
|
|
|
+ if (key == index) {
|
|
|
+ item.linkUrls = linkUrls;
|
|
|
+ item.fileNames = fileNames;
|
|
|
}
|
|
|
});
|
|
|
- console.log("1111111111",this.QUOTAFEEList)
|
|
|
+ console.log("1111111111", this.QUOTAFEEList);
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
async submitForm() {
|
|
|
this.form.bondedFeeList = this.QUOTAFEEList;
|
|
|
- console.log("44444444-form",this.form)
|
|
|
+ console.log("44444444-form", this.form);
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
/*if (!(parseInt(this.form.score) == this.form.score)) {
|
|
|
@@ -599,15 +624,15 @@ export default {
|
|
|
});
|
|
|
uploadFiles(formData).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- this.form.bondedFeeList.forEach(item => {
|
|
|
- if(item.confirmWay =='附件'){
|
|
|
+ this.form.bondedFeeList.forEach((item) => {
|
|
|
+ if (item.confirmWay == "附件") {
|
|
|
item.linkUrls = res.fileNames;
|
|
|
item.fileNames = res.newFileNames;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
//this.form.linkUrls = res.fileNames;
|
|
|
//this.form.fileNames = res.newFileNames;
|
|
|
- console.log("555555555-form",this.form)
|
|
|
+ console.log("555555555-form", this.form);
|
|
|
updateQUOTABONDED(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
@@ -642,15 +667,15 @@ export default {
|
|
|
});
|
|
|
uploadFiles(formData).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- this.form.bondedFeeList.forEach(item => {
|
|
|
- if(item.confirmWay =='附件'){
|
|
|
+ this.form.bondedFeeList.forEach((item) => {
|
|
|
+ if (item.confirmWay == "附件") {
|
|
|
item.linkUrls = res.fileNames;
|
|
|
item.fileNames = res.newFileNames;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
//this.form.linkUrls = res.fileNames;
|
|
|
//this.form.fileNames = res.newFileNames;
|
|
|
- console.log("6666666666-form",this.form)
|
|
|
+ console.log("6666666666-form", this.form);
|
|
|
addQUOTABONDED(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
@@ -751,8 +776,7 @@ export default {
|
|
|
);
|
|
|
},
|
|
|
|
|
|
- handleChange(file, fileList) {
|
|
|
- },
|
|
|
+ handleChange(file, fileList) {},
|
|
|
handleRemove(file, fileList) {
|
|
|
this.fileList = fileList;
|
|
|
},
|
gks