|
@@ -521,9 +521,11 @@
|
|
|
:model="listItem"
|
|
|
:ref="'form' + listItem.normfeeId"
|
|
|
:key="listItem.normfeeId"
|
|
|
- :disabled="listItem.sendValue == 1"
|
|
|
+ :disabled="listItem.sendValue == 1 || (listItem.sendValue == undefined)"
|
|
|
label-width="350px"
|
|
|
>
|
|
|
+ <!-- <span>{{ listItem.sendValue == 1 }}</span> -->
|
|
|
+
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
|
|
|
@@ -658,9 +660,10 @@
|
|
|
:model="listItem"
|
|
|
:ref="'form' + listItem.normfeeId"
|
|
|
:key="listItem.normfeeId"
|
|
|
- :disabled="listItem.sendValue == 1"
|
|
|
+ :disabled="listItem.sendValue == 1 || (listItem.sendValue == undefined)"
|
|
|
label-width="350px"
|
|
|
>
|
|
|
+ <!-- <span>{{ listItem.sendValue == 1 }}</span> -->
|
|
|
<!-- label-width="350px" -->
|
|
|
<el-col :span="8">
|
|
|
<el-form-item
|
|
@@ -688,7 +691,7 @@
|
|
|
</div>
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-if="audit && (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button>
|
|
|
+ <el-button v-if="audit && (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核123</el-button>
|
|
|
<el-button type="primary" @click="submitForm('edit')" v-if="edit"
|
|
|
>确 定</el-button
|
|
|
>
|
|
@@ -1250,7 +1253,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.open = true;
|
|
|
- this.title = this.deptName + this.form.month + "数据采集";
|
|
|
+ this.title = this.deptName + this.form.year + "年" + this.form.month + "数据采集";
|
|
|
//深拷贝,而不是拷贝地址
|
|
|
this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
|
|
|
let dataList = response.data.feeLists;
|
|
@@ -1273,6 +1276,16 @@ export default {
|
|
|
},
|
|
|
|
|
|
handleAudit(row) {
|
|
|
+ let is = false;
|
|
|
+ row.feeLists.forEach(item=>{
|
|
|
+ if(item.collCalue == null || item.collCalue == "" || item.collCalue == undefined){
|
|
|
+ return is = true;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ if(is){
|
|
|
+ this.$message.error("数据未填写齐全,禁止提交!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
let data = {
|
|
|
type: "1",
|
|
|
gatherId: row.id,
|
|
@@ -1314,7 +1327,7 @@ export default {
|
|
|
this.deptName = item.label;
|
|
|
}
|
|
|
})
|
|
|
- this.title = this.deptName + this.form.month + "数据采集";
|
|
|
+ this.title = this.deptName + this.form.year + "年" + this.form.month + "数据采集";
|
|
|
//深拷贝,而不是拷贝地址
|
|
|
this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
|
|
|
//去重获取tab
|