|
@@ -116,7 +116,7 @@
|
|
|
<el-table-column fixed="right" label="操作" align="center">
|
|
|
<template slot-scope="{row}">
|
|
|
<div>
|
|
|
- <el-button v-if="row.declareResult == null || row.declareResult == '审核拒绝'" type="text" size="small"
|
|
|
+ <el-button v-if="row.declareResult == null || row.declareResult == '审核拒绝'" type="text" size="small"
|
|
|
@click="openDeclareDialog(row)">申报</el-button>
|
|
|
<el-button v-if="row.declareResult == '审核中' || row.declareResult == '审核通过' || row.declareResult == '审核拒绝'" type="text" size="small"
|
|
|
@click="checkDetail(row.cid)">查看</el-button>
|
|
@@ -226,9 +226,11 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.listQuery.reportNo = this.$route.query.productionNo;
|
|
|
- this.listQuery.orderId = this.$route.query.orderId;
|
|
|
- this.declareForm.orderId = this.$route.query.orderId;
|
|
|
-
|
|
|
+ if (this.$route.query.orderId){
|
|
|
+ this.listQuery.orderId = this.$route.query.orderId;
|
|
|
+ this.declareForm.orderId = this.$route.query.orderId;
|
|
|
+ }
|
|
|
+
|
|
|
this.$route.query.productionId;
|
|
|
this.$route.query.orderName;
|
|
|
this.getList();
|
|
@@ -285,6 +287,10 @@ export default {
|
|
|
this.declareForm.productionId = row.productionId;
|
|
|
},
|
|
|
declareMarket() {
|
|
|
+ if (!this.declareForm.reportNo){
|
|
|
+ this.$message.error("未出产品,不能申报。");
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.$refs.declareForm.validate(valid => {
|
|
|
if (valid) {
|
|
|
let total = 0;
|