Commit 61152be8 by 张超军

补采,编辑分别进入指纹擦剂区分

parent 755f3d78
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2022-01-15 14:58:21
* @LastEditTime: 2022-01-17 16:06:18
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -45,7 +45,7 @@ export default [
component: () => import('@/views/zzwlr/xzry.vue')
},
{
path: '/xzry/:type/:barcode',
path: '/xzry/:type/:barcode/:id',
// redirect: "/fingerprintIndex/R4300000000002021125008/admin",
name: 'xzryedit',
hidden: true,
......
......@@ -451,12 +451,11 @@ export default {
if (val.unqualified.indexOf(1) != -1) {
this.$store.commit("layout/delcachePageName", "xzry");
this.$router.push({
path: "/xzry/edit/",
query: { barcode: val.barcode },
path: `/xzry/edit/${val.barcode}/1`,
});
} else {
this.$store.commit("layout/delcachePageName", "htcj");
this.$router.pushToTab({
this.$router.push({
path: `/fingerprintIndex/${val.barcode}/${val.name}`,
query: {
type: 1,
......
......@@ -1571,7 +1571,6 @@ export default {
*/
dealIsGetFinger () {
let self = this
debugger
if (this.rGdzw.length > 0) {
this.rGdzw.forEach((item, index) => {
if (item != 1) {
......@@ -8262,6 +8261,7 @@ export default {
// }
// 关闭tab页
this.$bus.emit("xzryResetForm", "xzry");
this.$bus.emit("xzryResetForm", "xzryedit");
this.$router.push('/htcj')
}, 3000);
}, 1500);
......@@ -8288,6 +8288,7 @@ export default {
// }
// 关闭tab页
this.$bus.emit("xzryResetForm", "xzry");
this.$bus.emit("xzryResetForm", "xzryedit");
this.$router.push('/htcj')
}, 3000);
}, 1500);
......@@ -8386,7 +8387,8 @@ export default {
// }
// 关闭tab页
this.$bus.emit("xzryResetForm", "xzry");
this.$router.push('/htcj')
this.$bus.emit("xzryResetForm", "xzryedit");
this.$router.push('/zljc')
}, 3000);
}, 1500);
}).catch(err => {
......@@ -8409,7 +8411,8 @@ export default {
// }
// 关闭tab页
this.$bus.emit("xzryResetForm", "xzry");
this.$router.push('/htcj')
this.$bus.emit("xzryResetForm", "xzryedit");
this.$router.push('/zljc')
}, 3000);
}, 1500);
})
......@@ -8512,15 +8515,19 @@ export default {
})
}
setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}, 1500);
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// 关闭tab页
this.$bus.emit("xzryResetForm", "xzry");
this.$bus.emit("xzryResetForm", "xzryedit");
this.$router.push('/htcj')
}, 500);
return
}
......
......@@ -363,7 +363,7 @@ export default {
this.$store.commit("layout/delcachePageName", "xzry");
this.$store.commit('layout/delcachePageName', 'xzryedit')
this.$router.push({
path: "/xzry/edit/"+row.barcode
path: "/xzry/edit/"+row.barcode+"/2"
});
},
toAdd() {
......
<!--
* @Author: your name
* @Date: 2021-09-07 10:31:34
* @LastEditTime: 2022-01-15 14:53:05
* @LastEditTime: 2022-01-17 16:08:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\views\zzwlr\Index.vue
......@@ -338,6 +338,7 @@
{ required: true, message: "请输入捺印人联系电话", trigger: "blur" },
],
},
id: ''
};
},
mounted() {
......@@ -349,6 +350,7 @@
// console.log(this.$route.params.type==='edit');
this.edit = "新增人员";
}
this.id = this.$route.params.id
},
methods: {
disabledDate(a) {
......@@ -410,10 +412,10 @@
this.$store.commit('layout/delcachePageName', 'xzryedit')
// this.$refs[formName].resetFields();
// this.$set(this.ruleForm, 'ysxtAsjxgrybh', this.ruleForm.ysxtAsjxgrybh.substring(1, 23))
this.$router.pushToTab({
this.$router.push({
path: `/fingerprintIndex/${reqParam.personDo.ysxtAsjxgrybh}/${this.ruleForm.xm}`,
query: {
type: 1
type: this.id
},
});
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment