00517d7a by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents f9953433 ed2d1b5f
......@@ -127,7 +127,7 @@
// 单选
singleElection (row) {
this.selected = this.data.indexOf(row);
this.$emit('row-click', val)
this.$emit('row-click', row)
},
tableRowClassName ({ row, rowIndex }) {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:02
-->
<template>
<div>
<el-button type="primary" native-type="submit" @click="openDialog">新增常用</el-button>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" v-show="addDialog">
<el-form-item prop="commonOpinion">
<div class="invalid-reson">常用意见:</div>
<el-input v-model="form.commonOpinion" placeholder="请输入常用意见" type="textarea" :rows="4"></el-input>
</el-form-item>
<el-form-item class="text-center">
<el-button @click="closeaddDiglog">取 消</el-button>
<el-button type="primary" @click="addOpinion">确 定</el-button>
</el-form-item>
</el-form>
<lb-table :heightNumSetting="true"
@row-dblclick="handleRowClick"
:pagination="false" :column="columns" :minHeight="300" :data="tableData.data">
</lb-table>
<div style="height:15px"></div>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import { getUserCommonOpinion, addUserCommonOpinion, delUserCommonOpinion } from "@/api/fqsq.js"
export default {
components: {},
props: {
formData: {
type: Object,
default: {}
}
},
data () {
return {
addDialog: false,
columns: [
{
label: '序号',
type: 'index',
width: '50',
},
{
prop: "opinion",
label: "意见描述",
},
{
label: '操作',
width: '100',
render: (h, scope) => {
return (
<div>
<el-button type="text" onClick={() => { this.useCommonOpinion(scope.row) }}>使用</el-button>
<el-button type="text" onClick={() => { this.deleteOpinion(scope.row) }}>删除</el-button>
</div>
)
}
}
],
tableData: {
total: 0,
data: [],
},
form: {
commonOpinion: '',
},
rules: {
commonOpinion: [
{ required: true, message: '请输入常用意见', trigger: 'blur' }
]
}
}
},
mounted () {
this.getList()
},
methods: {
getList () {
getUserCommonOpinion().then(res => {
this.tableData.data = res.result
})
},
//新增常用意见
addOpinion () {
this.$refs.form.validate(valid => {
if (valid) {
addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
if (res.code == 200) {
this.$message.success("新增成功")
this.closeaddDiglog();
this.getList()
} else {
this.$message.error(res.message)
}
})
} else {
return false;
}
});
},
//打开新增弹窗
openDialog () {
this.addDialog = true
},
//关闭新增弹窗
closeaddDiglog () {
this.addDialog = false
this.$refs['form'].resetFields();
},
handleRowClick (item) {
this.useCommonOpinion(item)
},
//使用常用意见
useCommonOpinion (item) {
store.dispatch('workflow/setOptions', item.opinion);
this.$popupCacel()
},
//删除常用意见
deleteOpinion (item) {
this.$confirm("确定要删除吗, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
delUserCommonOpinion({ bsmOpinion: item.bsmOpinion }).then(res => {
if (res.code == 200) {
this.$message.success("删除成功")
this.getList()
} else {
this.$message.error(res.message)
}
})
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
},
//关闭列表弹窗
closeDialog () {
this.form.commonOpinion = "";
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
@import "~@/styles/dialogBox.scss";
.invalid-reson {
margin-bottom: 10px;
}
.dialog-footer {
margin-top: 10px;
display: flex;
justify-content: flex-end;
}
</style>
......@@ -104,7 +104,7 @@ export default {
mounted() {
this.delel=this.$parent.isEdit
this.loadBdcdylist();
this.getleftMenubl();
// this.getleftMenubl();
},
......@@ -121,7 +121,7 @@ export default {
},
methods: {
//读取申请单元信息
loadBdcdylist(add) {
loadBdcdylist() {
var formdata = new FormData();
if(this.bsmSlsq){
formdata.append("bsmSlsq", this.bsmSlsq);
......@@ -130,9 +130,6 @@ export default {
if (res.code === 200 && res.result) {
this.currentSelectProps = res.result[0];
this.$emit("getCurrentSelectProps", this.currentSelectProps);
if(add){
this.$parent.getQllxByBdcdyid()
}
}
});
}
......@@ -141,9 +138,13 @@ export default {
},
// 获取右侧菜单
getleftMenubl(row) {
leftMenubl(this.bsmSlsq).then((res) => {
this.supplementarylist = res.result;
if(row){
if(row==1){
this.delel=false
}
if(row&&row!=1){
this.supplementarylist.forEach((item,index) => {
if(item.bsmRepair==row.bsmRepair){
this.activeIndex=index.toString()
......
......@@ -48,6 +48,7 @@
placeholder="请输入审批意见"
v-model="item.shyj"
></el-input>
<el-button class="opinion_btn" @click="commonOpinion(index)" v-if="ableOperation">常用意见</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -74,7 +75,7 @@
</div>
</el-form>
</div>
<div class="submit_button" v-if="!$route.query.viewtype">
<div class="submit_button" v-if="ableOperation">
<el-button type="primary" @click="onSubmit('ruleFormRef')"
>保存</el-button
>
......@@ -93,6 +94,7 @@ export default {
data() {
return {
isNoData: false,
currentindex:0,
ableOperation: true,
tableData: [{ jdmc: "初审" }],
rules: {
......@@ -103,19 +105,29 @@ export default {
};
},
watch: {},
watch: {
yjsqOptions: {
handler (val) {
this.add(val)
},
deep: true,
immediate: true
},
},
created() {},
mounted() {
this.propsParam.isEdit=this.$parent.isEdit
this.propsParam = this.$attrs;
if (this.$route.query.viewtype) {
this.ableOperation = false
}
this.getShList();
},
methods: {
deleClick(){
console.log("111 ");
if(this.tableData.length<=1){
console.log("w222");
this.$message.error("最少填写一条初审意见");
}else if(this.tableData.length>=2){
console.log("3333");
this.tableData=this.tableData.slice(0,-1)
}
......@@ -175,23 +187,15 @@ export default {
return false;
}
},
// onSubmit() {
// this.$refs.tablelist[index].validate((valid) => {
// if (valid) {
// this.tableData.forEach((item, index) => {
// item["bsmBusiness"] = this.$parent.bsmRepair;
// }),
// addidea(this.tableData).then((res) => {
// if (res.code === 200) {
// this.$message.success("保存成功");
// this.refresh += 1;
// } else {
// this.$message.error(res.message);
// }
// });
// }
// });
// },
//打开常用意见列表弹窗
commonOpinion (index) {
this.currentindex=index
this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
},
add(val){
this.$set(this.tableData[this.currentindex],'shyj',val)
}
},
};
</script>
......
......@@ -34,7 +34,8 @@ export default {
//批量按钮名称
batchButtonName: '',
// 受理申请信息
slsq: {}
slsq: {},
isshow:true
}
},
mounted () {
......@@ -54,6 +55,14 @@ export default {
if (res.code === 200) {
this.leftButtonList = res.result.button;
this.rightButtonList = res.result.operation;
console.log("this.rightButtonList[1].name",this.rightButtonList[1].name);
if(this.rightButtonList[1].name!="删除"){
this.$refs.Menu.getleftMenubl(1);
}else{
this.$refs.Menu.getleftMenubl();
}
console.log("this.rightButtonList ",this.rightButtonList);
// this.rightButtonList.splice(0,2)
}
})
......
......@@ -37,8 +37,7 @@ export default {
//根据tabname获取选中的表单 此操作为了获取后端返回的表单对象,使用里面的是否可操作的属性
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
console.log(item, 'item11111111111');
this.currentSelectTab = item;
break;
}
}
......