Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
d1ba0311 by renchao@pashanhoo.com
Options

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

2 parents ae1a2884 0b9411ce
Inline Side-by-side
Showing 7 changed files with 101 additions and 44 deletions
This file is too large to display.
No preview for this file type
......@@ -17,56 +17,53 @@ export function addRepairRecord (data) {
data
})
}
/**
* @description: 删除流程
* @param {*} data
* @param {*} params
* @author: renchao
*/
export function deleteFlow (data) {
export function deleteFlow (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/deleteFlow',
method: 'post',
data
method: 'get',
params:params
})
}
/**
* @description: 删除补录记录
* @param {*} data
* @param {*} params
* @author: renchao
*/
export function deleteRepairRecord (data) {
export function deleteRepairRecord (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/deleteRepairRecord',
method: 'post',
data
url: SERVER.SERVERAPI + '/rest/djbRepair/deleteRepairRecord?bsmRepair='+params,
method: 'get',
})
}
/**
* @description: 初始化内容
* @param {*} data
* @param {*} params
* @author: renchao
*/
export function init (data) {
export function init (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/init',
method: 'post',
data
url: SERVER.SERVERAPI + '/rest/djbRepair/init?bsmRepair='+params,
method: 'get',
})
}
/**
* @description: 左侧菜单集合
* @param {*} data
* @param {*} params
* @author: renchao
*/
export function leftMenubl (data) {
export function leftMenubl (params) {
return request({
url: SERVER.SERVERAPI + '/rest/djbRepair/leftMenu',
method: 'post',
data
url: SERVER.SERVERAPI + '/rest/djbRepair/leftMenu?bsmSlsq='+params,
method: 'get',
params
})
}
......
......@@ -44,7 +44,8 @@
<script>
import { mapGetters } from 'vuex'
import { leftMenu } from "@/api/fqsq.js"
import { leftMenubl } from "@/api/djbbl.js"
import { deleteRepairRecord } from "@/api/djbbl.js"
import { leftMenubl } from "@/api/djbbl.js"
import { deleteSlbdcdy } from "@/api/ywbl.js";
import { getBdcqljqtsx } from "@/api/registerBook.js";
import { loadTreeData, getNode } from "./djbFrameData.js";
......@@ -107,13 +108,14 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
}
})
})
this.getleftMenubl()
},
// 获取右侧菜单
getleftMenubl(){
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
leftMenubl(formdata).then((res) => {
// var formdata = new FormData();
// formdata.append("bsmSlsq", this.bsmSlsq);
leftMenubl(this.bsmSlsq).then((res) => {
this.supplementarylist=res.result;
}
)
......@@ -123,24 +125,34 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
this.$parent.tabset();
},
//申请单元点击事件
unitClick (index) {
this.$parent.currentSelectProps=this.supplementarylist[index];
this.$parent.tabset();
unitClick (index) {
this.currentSelectProps=this.supplementarylist[index];
// this.$parent.tabset();
// console.log("this.currentSelectProps", this.supplementarylist[index]);
// this.currentSelectProps.batchOperation = false;
// this.activeIndex = index.toString();
// //选中表单传递数据
// this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.$emit('getCurrentSelectProps', this.currentSelectProps);
// this.$parent.stepForm(index);
// this.$store.dispatch('user/refreshPage', false);
},
//登记簿点击事件
djbClick () {
console.log("this.currentSelectProps",this.currentSelectProps);
this.loadBdcdylist ()
// console.log("this.currentSelectProps",this.currentSelectProps);
this.currentSelectProps.batchOperation = true;
this.$parent.getdjblist()
},
// 删除补录记录
handleDel(row){
console.log("是",row);
deleteRepairRecord(row.bsmRepair).then((res) => {
if (res.code === 200) {
alert("删除成功")
}
})
},
//补录信息点击事件
blxxClick () {
this.$parent.tabset()
......
......@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</el-form>-->
<div class="btn">
<el-button type="primary" @click="slxxsubmitForm">保存</el-button>
......@@ -52,7 +52,7 @@
</template>
<script>
import { mapGetters } from "vuex";
import { init } from "@/api/djbbl.js";
import { init } from "@/api/djbbl.js"
export default {
props: {
currentSelectProps: {
......@@ -60,6 +60,7 @@ export default {
default: () => {},
},
},
data() {
return {
//传递参数
......@@ -85,8 +86,7 @@ export default {
...mapGetters(["dictData"]),
},
created() {
this.init2();
//console.log("this.propsParam", this.propsParam);
this.init()
// this.clmlInitList(1)
},
mounted() {
......@@ -110,8 +110,20 @@ export default {
},
methods: {
init2() {
console.log("this.currentSelectProps", this.currentSelectProps);
init() {
init(this.propsParam.bsmRepair).then((res) => {
if (res.code === 200) {
console.log("/rest/djbRepair/init",res);
// this.tableData = res.result;
// if (this.tableData.length < datas.columns().emptycolNum) {
// this.emptycolNum =
// datas.columns().emptycolNum - this.tableData.length;
// } else {
// this.emptycolNum = 0;
// }
}
});
},
// 受理信息保存
slxxsubmitForm() {
......
......@@ -26,7 +26,6 @@ export default {
getHomeNoticeList().then(res => {
if (res.result) {
this.noticeList = res.result.noticeList
console.log("this.noticeList11111111111111111111111111111111111",this.noticeList);
}
})
},
......
......@@ -124,15 +124,19 @@ export default {
methods: {
getCurrentSelectProps (val) {
this.currentSelectProps = val
this.getdjblist()
if(this.currentSelectProps.bsmRepair){
this.tabset()
}else{
this.getdjblist()
}
},
// 获取登记簿列表
// 获取渲染登记簿列表
getdjblist(){
getBdcqljqtsx({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
console.log("登记簿列表",res);
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
......@@ -154,11 +158,44 @@ export default {
}, 200)
},
// // 获取渲染补录信息列表
// getdjblist(){
// console.log("执行1",this.currentSelectProps);
// getBdcqljqtsx({
// bdcdyid: this.currentSelectProps.bdcdyid,
// bdcdyh: this.currentSelectProps.bdcdyh,
// }).then((res) => {
// if (res.code === 200) {
// this.treedata = loadTreeData(res.result, this.bdcdyh);
// this.$nextTick(function () {
// this.defaultNode = getNode(this.currentSelectProps.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
// this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
// });
// }
// });
// setTimeout(() => {
// let settree=JSON.parse(JSON.stringify(this.treedata))
// this.tabdata=[...settree,...settree[1].children[0].children[0].children]
// this.tabdata.forEach((item,index,arr) => {
// arr[index].name=item.label;
// arr[index].value=item.id
// })
// this.tabList=this.tabdata
// //console.log("登记簿列表",this.tabList);
// }, 200)
// },
// 增加补录记录
addRepairRecord(){
addRepairRecord({
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
}).then((res) => {
bsmQlxx:"a8a979f688fc9afc6ca7f0c124f64ede",
bsmSlsq:this.bsmSlsq,
bsmSldy:this.currentSelectProps.bsmSldy,
operate:"C",
qllx:this.currentSelectProps.qllx
}).then((res) => {
console.log("添加补录记录",res);
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
......@@ -199,7 +236,7 @@ export default {
if (activeName && activeName != 0) this.getFromRouter(activeName)
},
//切换选项卡内容组件
getFromRouter (tabname) {
getFromRouter (tabname) {
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
},
......