|
@@ -284,7 +284,7 @@
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
fixed="right"
|
|
|
- width="170"
|
|
|
+ width="220"
|
|
|
class-name="small-padding fixed-width"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
@@ -322,18 +322,15 @@
|
|
|
checkPermi(['gather:GATHER:approve'])
|
|
|
"
|
|
|
>
|
|
|
- <el-popconfirm
|
|
|
- title="确定提交审核吗?"
|
|
|
- @confirm="handleAudit(scope.row)"
|
|
|
- >
|
|
|
+
|
|
|
<el-button
|
|
|
+ @click="handleDetail(scope.row)"
|
|
|
style="margin: 0 2px"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
slot="reference"
|
|
|
>提交审核</el-button
|
|
|
>
|
|
|
- </el-popconfirm>
|
|
|
</template>
|
|
|
|
|
|
<!-- <template
|
|
@@ -622,8 +619,10 @@
|
|
|
<!-- </el-tabs> -->
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
+
|
|
|
+
|
|
|
<el-button v-if="checkPermi(['gather:GATHER:add'])" type="primary" @click="submitForm('add')">确 定</el-button>
|
|
|
- <el-button v-if="checkPermi(['gather:GATHER:draft'])" @click="submitForm('draft')" type="warning">暂 存</el-button>
|
|
|
+ <el-button v-if="this.form.collStatus!=1 &&checkPermi(['gather:GATHER:draft'])" @click="submitForm('draft')" type="warning">暂 存</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
@@ -689,10 +688,12 @@
|
|
|
</div>
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
+ <el-button v-if="edit && (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button>
|
|
|
<el-button type="primary" @click="submitForm('edit')" v-if="edit"
|
|
|
>确 定</el-button
|
|
|
>
|
|
|
- <el-button @click="submitForm('draft')" v-if="edit" type="warning">暂 存</el-button>
|
|
|
+
|
|
|
+ <el-button @click="submitForm('draft')" v-if="edit && this.form.collStatus!=1" type="warning">暂 存</el-button>
|
|
|
|
|
|
<el-button type="primary" v-if="check" @click="handleCheck(1)"
|
|
|
>通 过</el-button
|
|
@@ -1260,6 +1261,7 @@ export default {
|
|
|
if (res.code) {
|
|
|
this.$message.success("审核成功");
|
|
|
this.getList();
|
|
|
+ this.openDetail = false;
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -1278,11 +1280,11 @@ export default {
|
|
|
getGATHER(id).then((response) => {
|
|
|
//深拷贝,而不是拷贝地址
|
|
|
this.form = JSON.parse(JSON.stringify(response.data));
|
|
|
+ console.log(this.form);
|
|
|
this.openDetail = true;
|
|
|
this.title = "数据查看";
|
|
|
//深拷贝,而不是拷贝地址
|
|
|
this.tabList = JSON.parse(JSON.stringify(response.data.feeLists));
|
|
|
- let dataList = response.data.feeLists;
|
|
|
//去重获取tab
|
|
|
//遍历如果遇到相同的id则删掉
|
|
|
for (var i = 0; i < this.tabList.length - 1; i++) {
|
|
@@ -1298,26 +1300,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // 这里科研失败!想动态绑定校验规则的
|
|
|
- //遍历设置表单校验 我好困
|
|
|
- // for (const i in this.form.feeLists) {
|
|
|
- // this.$set(this.rules,this.form.feeLists[i].normfeeId,[
|
|
|
- // { required: true, message: this.form.feeLists[i].normfeeName+"不能为空", trigger: "blur" }
|
|
|
- // ])
|
|
|
- // }
|
|
|
-
|
|
|
-
|
|
|
- //这里是第二种写法
|
|
|
- //获取分类ID相同的子集
|
|
|
- // for (let index = 0; index < this.tabList.length; index++) {
|
|
|
- // this.$set(this.tabList[index],'list',[])
|
|
|
- // for (let i = 0; i < dataList.length; i++) {
|
|
|
- // if (dataList[i].normId == this.tabList[index].normId) {
|
|
|
- // this.tabList[index].list.push(dataList[i]);
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
});
|
|
|
},
|
|
|
/** 提交按钮 */
|