|
|
@@ -5,7 +5,7 @@
|
|
|
ref="queryForm"
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
- label-width="90px"
|
|
|
+ label-width="86px"
|
|
|
>
|
|
|
<el-form-item label="指标名称" prop="quotaName">
|
|
|
<el-input v-model="queryParams.quotaName"></el-input>
|
|
|
@@ -28,6 +28,18 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="年份" prop="year">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParams.year"
|
|
|
+ type="year"
|
|
|
+ placeholder="请选择年份"
|
|
|
+ size="mini"
|
|
|
+ class="year-picker"
|
|
|
+ format="yyyy 年"
|
|
|
+ value-format="yyyy"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -77,48 +89,71 @@
|
|
|
<el-table :data="QUOTABONDEDList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column
|
|
|
- label="保税区名称"
|
|
|
+ label="年份"
|
|
|
align="center"
|
|
|
- prop="bondedName"
|
|
|
- width="140"
|
|
|
+ prop="year"
|
|
|
+ width="100"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="指标名称"
|
|
|
+ label="保税区名称"
|
|
|
align="center"
|
|
|
- prop="quotaName"
|
|
|
- width="180"
|
|
|
+ prop="bondedName"
|
|
|
+ width="200"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="得分"
|
|
|
+ label="审核状态"
|
|
|
align="center"
|
|
|
- prop="score"
|
|
|
- ></el-table-column>
|
|
|
+ prop="approvalStatus"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{
|
|
|
+ scope.row.approvalStatus == 0 || scope.row.approvalStatus == null
|
|
|
+ ? "未审核"
|
|
|
+ : scope.row.approvalStatus == 1
|
|
|
+ ? "审核中"
|
|
|
+ : scope.row.approvalStatus == 2
|
|
|
+ ? "审核通过"
|
|
|
+ : "审核拒绝"
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
- label="录入方式"
|
|
|
+ label="审核时间"
|
|
|
align="center"
|
|
|
- prop="enterType"
|
|
|
+ prop="approvalTime"
|
|
|
+ width="160"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="数值"
|
|
|
+ label="审核人"
|
|
|
align="center"
|
|
|
- prop="numValue"
|
|
|
+ prop="approvalName"
|
|
|
+ width="140"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
- label="文字说明"
|
|
|
+ label="上报状态"
|
|
|
align="center"
|
|
|
- prop="remark"
|
|
|
- width="280"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column label="附件" align="center" prop="fileNames" width="80">
|
|
|
+ prop="reportStatus"
|
|
|
+ width="120"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
- <el-link
|
|
|
- style="text-decoration: underline; color: #36aafd"
|
|
|
- @click="download(scope.row.fileNames)"
|
|
|
- >{{ scope.row.fileNames }}</el-link
|
|
|
- >
|
|
|
+ <span v-if="scope.row.reportStatus == 0 || scope.row.reportStatus == null">未上报</span>
|
|
|
+ <span v-if="scope.row.reportStatus == 1">已上报</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center" fixed="right" width="180">
|
|
|
+ <el-table-column
|
|
|
+ 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="
|
|
|
@@ -130,7 +165,6 @@
|
|
|
@click="handleApprove(scope.row)"
|
|
|
>提交审核</el-button
|
|
|
>
|
|
|
-
|
|
|
<el-button
|
|
|
v-if="
|
|
|
scope.row.auditStatus == 1 &&
|
|
|
@@ -143,7 +177,6 @@
|
|
|
@click="handleAdminApprove(scope.row)"
|
|
|
>审核</el-button
|
|
|
>
|
|
|
-
|
|
|
<el-button
|
|
|
v-if="
|
|
|
scope.row.approvalStatus == 1 &&
|
|
|
@@ -197,6 +230,19 @@
|
|
|
append-to-body
|
|
|
>
|
|
|
<el-form ref="form" :model="form" :rules="rules">
|
|
|
+ <el-form-item label-width="100px" label="年份" prop="year">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="form.year"
|
|
|
+ type="year"
|
|
|
+ placeholder="请选择年份"
|
|
|
+ size="mini"
|
|
|
+ class="year-picker"
|
|
|
+ format="yyyy 年"
|
|
|
+ value-format="yyyy"
|
|
|
+ style="width: 60%"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label-width="100px" label="保税区" prop="bondedName">
|
|
|
<el-select
|
|
|
:disabled="isAppoval"
|
|
|
@@ -205,9 +251,8 @@
|
|
|
clearable
|
|
|
filterable
|
|
|
@change="selectBondedChange"
|
|
|
- style="width: 100%"
|
|
|
+ style="width: 60%"
|
|
|
>
|
|
|
- <!-- <el-option v-for="dict in BONDEDList" :key="dict.id" :label="dict.bondedName" :value="dict" />-->
|
|
|
<el-option
|
|
|
v-for="item in deptList"
|
|
|
:key="item.deptId"
|
|
|
@@ -217,88 +262,56 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label-width="100px" label="辅助指标" prop="quotaName">
|
|
|
- <el-select
|
|
|
- :disabled="isAppoval"
|
|
|
- v-model="form.quotaName"
|
|
|
- placeholder="请选择辅助指标"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- @change="selectQuotaChange"
|
|
|
- style="width: 100%"
|
|
|
+ <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-upload
|
|
|
+ class="upload-demo"
|
|
|
+ ref="upload"
|
|
|
+ :headers="upload.headers"
|
|
|
+ :action="upload.url"
|
|
|
+ :on-success="handleFileSuccess.bind(null, index)"
|
|
|
+ :auto-upload="true"
|
|
|
+ :file-list="dict.fileList"
|
|
|
+ :on-remove="handleRemove"
|
|
|
+ :on-change="handleChange"
|
|
|
+ :multiple="true"
|
|
|
+ >
|
|
|
+ <div v-if="isAppoval" slot="tip" class="el-upload__tip">
|
|
|
+ 审核无法修改
|
|
|
+ </div>
|
|
|
+ <el-button slot="trigger" size="small" type="primary"
|
|
|
+ >选取文件</el-button
|
|
|
+ >
|
|
|
+ </el-upload>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ v-if="dict.confirmWay == '文字说明'"
|
|
|
+ label-width="70px"
|
|
|
+ prop="remark"
|
|
|
+ label="说明"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="dict in QUOTAFEEList"
|
|
|
- :key="dict.id"
|
|
|
- :label="dict.quotaName"
|
|
|
- :value="dict"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label-width="100px" label="录入方式" prop="enterType">
|
|
|
- <el-select
|
|
|
- :disabled="isAppoval"
|
|
|
- v-model="form.enterType"
|
|
|
- placeholder="请选择录入方式"
|
|
|
- clearable
|
|
|
- filterable
|
|
|
- style="width: 100%"
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ :disabled="isAppoval"
|
|
|
+ v-model="dict.remark"
|
|
|
+ rows="5"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ v-if="dict.confirmWay == '数值'"
|
|
|
+ label-width="70px"
|
|
|
+ prop="numValue"
|
|
|
+ label="数值"
|
|
|
>
|
|
|
- <el-option value="附件">附件</el-option>
|
|
|
- <el-option value="文字说明">文字说明</el-option>
|
|
|
- <el-option value="数值">数值</el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.enterType == '附件'"
|
|
|
- label-width="100px"
|
|
|
- prop="linkUrls"
|
|
|
- label="上传附件"
|
|
|
- >
|
|
|
- <el-upload
|
|
|
- class="upload-demo"
|
|
|
- ref="upload"
|
|
|
- action="#"
|
|
|
- :file-list="fileList"
|
|
|
- :auto-upload="false"
|
|
|
- :on-remove="handleRemove"
|
|
|
- :on-change="handleChange"
|
|
|
- :multiple="true"
|
|
|
- >
|
|
|
- <div v-if="isAppoval" slot="tip" class="el-upload__tip">
|
|
|
- 审核无法修改
|
|
|
- </div>
|
|
|
- <el-button slot="trigger" size="small" type="primary"
|
|
|
- >选取文件</el-button
|
|
|
- >
|
|
|
- </el-upload>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.enterType == '文字说明'"
|
|
|
- label-width="100px"
|
|
|
- prop="remark"
|
|
|
- label="说明"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="textarea"
|
|
|
- :disabled="isAppoval"
|
|
|
- v-model="form.remark"
|
|
|
- rows="5"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- v-if="form.enterType == '数值'"
|
|
|
- label-width="100px"
|
|
|
- prop="numValue"
|
|
|
- label="数值"
|
|
|
- >
|
|
|
- <el-input :disabled="isAppoval" v-model="form.numValue"></el-input>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-form-item label-width="100px" prop="score" label="分值">
|
|
|
- <el-input :disabled="isAppoval" v-model="form.score"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ <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>
|
|
|
<div slot="footer" v-if="!isAppoval" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
@@ -328,17 +341,32 @@ import {
|
|
|
setAdminApprove,
|
|
|
setAdminReport,
|
|
|
} from "@/api/norm/QUOTABONDED";
|
|
|
-
|
|
|
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 { getToken } from "@/utils/auth";
|
|
|
export default {
|
|
|
name: "QUOTABONDED",
|
|
|
data() {
|
|
|
return {
|
|
|
+ // 用户导入参数
|
|
|
+ upload: {
|
|
|
+ // 是否显示弹出层（用户导入）
|
|
|
+ open: false,
|
|
|
+ // 弹出层标题（用户导入）
|
|
|
+ title: '',
|
|
|
+ // 是否禁用上传
|
|
|
+ isUploading: false,
|
|
|
+ // 是否更新已经存在的用户数据
|
|
|
+ updateSupport: 0,
|
|
|
+ // 设置上传的请求头部
|
|
|
+ headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
+ // 上传的地址
|
|
|
+ url: process.env.VUE_APP_BASE_API + '/common/upload'
|
|
|
+ },
|
|
|
+ uploadUrl: process.env.VUE_APP_BASE_API + "/common/uploads",
|
|
|
isAppoval: false,
|
|
|
// 根路径
|
|
|
baseURL: process.env.VUE_APP_BASE_API,
|
|
|
@@ -369,29 +397,17 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- id: null,
|
|
|
- createTime: null,
|
|
|
- createBy: null,
|
|
|
- updateTime: null,
|
|
|
- updateBy: null,
|
|
|
- delFlag: null,
|
|
|
- deptId: null,
|
|
|
- bondedId: null,
|
|
|
bondedName: null,
|
|
|
- quotaId: null,
|
|
|
quotaName: null,
|
|
|
- score: null,
|
|
|
- status: null,
|
|
|
- startTime: null,
|
|
|
- stopTime: null,
|
|
|
- linkUrls: null,
|
|
|
- remark: null,
|
|
|
- fileNames: null,
|
|
|
+ year: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
+ year: [
|
|
|
+ { required: true, message: "年份不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
bondedName: [
|
|
|
{ required: true, message: "综保区名称不能为空", trigger: "blur" },
|
|
|
],
|
|
|
@@ -402,12 +418,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
- listQUOTAFEERole().then((response) => {
|
|
|
- response.data.forEach((item, index) => {
|
|
|
- response.data[index].status = item.status == 0 ? false : true;
|
|
|
- });
|
|
|
- this.QUOTAFEEList = response.data;
|
|
|
- });
|
|
|
+ this.listQUOTAFEERole();
|
|
|
// listAllBONDED().then((response) => {
|
|
|
// this.BONDEDList = response.rows;
|
|
|
// });
|
|
|
@@ -417,6 +428,19 @@ export default {
|
|
|
methods: {
|
|
|
checkPermi,
|
|
|
checkRole,
|
|
|
+ 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 = ''
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
// 获取保税区列表
|
|
|
getDeptList() {
|
|
|
this.loading = true;
|
|
|
@@ -494,6 +518,7 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
+ this.listQUOTAFEERole();
|
|
|
this.isAppoval = false;
|
|
|
this.reset();
|
|
|
this.open = true;
|
|
|
@@ -505,21 +530,41 @@ export default {
|
|
|
const id = row.id || this.ids;
|
|
|
getQUOTABONDED(id).then((response) => {
|
|
|
this.form = response.data;
|
|
|
- this.form.linkUrls = this.baseURL + response.data.linkUrls;
|
|
|
- this.fileList = [];
|
|
|
- this.fileList.push({
|
|
|
- name: response.data.fileNames,
|
|
|
- url: response.data.linkUrls,
|
|
|
+ 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.open = true;
|
|
|
+ this.$forceUpdate();
|
|
|
this.title = "辅助指标录入修改";
|
|
|
});
|
|
|
},
|
|
|
+ // 文件上传成功处理
|
|
|
+ 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("1111111111",this.QUOTAFEEList)
|
|
|
+ },
|
|
|
/** 提交按钮 */
|
|
|
async submitForm() {
|
|
|
+ this.form.bondedFeeList = this.QUOTAFEEList;
|
|
|
+ console.log("44444444-form",this.form)
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if (!(parseInt(this.form.score) == this.form.score)) {
|
|
|
+ /*if (!(parseInt(this.form.score) == this.form.score)) {
|
|
|
this.$message.error("得分必须为整数");
|
|
|
return;
|
|
|
}
|
|
|
@@ -540,7 +585,7 @@ export default {
|
|
|
) {
|
|
|
this.$message.error("数值必须为整数或小数");
|
|
|
return;
|
|
|
- }
|
|
|
+ }*/
|
|
|
if (this.form.id != null) {
|
|
|
if (this.form.enterType == "附件") {
|
|
|
if (this.fileList.length < 1) {
|
|
|
@@ -554,8 +599,15 @@ export default {
|
|
|
});
|
|
|
uploadFiles(formData).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- this.form.linkUrls = res.fileNames;
|
|
|
- this.form.fileNames = res.newFileNames;
|
|
|
+ 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)
|
|
|
updateQUOTABONDED(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
@@ -590,9 +642,15 @@ export default {
|
|
|
});
|
|
|
uploadFiles(formData).then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
- this.form.linkUrls = res.fileNames;
|
|
|
- this.form.fileNames = res.newFileNames;
|
|
|
-
|
|
|
+ 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)
|
|
|
addQUOTABONDED(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
@@ -694,7 +752,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
handleChange(file, fileList) {
|
|
|
- this.fileList = fileList;
|
|
|
},
|
|
|
handleRemove(file, fileList) {
|
|
|
this.fileList = fileList;
|
gks