Commit 65419cc5 by liyuhang19990520

Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

parents 0a106e58 a7ae2e49
......@@ -55,7 +55,7 @@ export default {
col: "3",
},
{
name: "提取单位代码",
name: "提取单位",
id: "tqdwGajgjgdm",
type: "codeTreeDialog",
codeTree: "",
......
......@@ -50,7 +50,7 @@ export default {
col: "3",
},
{
name: "比中单位代码",
name: "比中单位",
id: "bzdwGajgjgdm",
type: "codeTreeDialog",
codeTree: "",
......@@ -68,7 +68,7 @@ export default {
col: "3",
},
{
name: "提取单位代码",
name: "提取单位",
id: "tqdwGajgjgdm",
type: "codeTreeDialog",
codeTree: "",
......
......@@ -103,7 +103,7 @@ export default {
col: "3",
},
{
label: "产权人_常用证件代码:",
label: "产权人_常用证件:",
prop: "cqrCyzjdm",
type: "codeTree",
codeTree: "CODE_ZJ",
......
......@@ -56,7 +56,7 @@ export default {
col: "3",
},
{
name: "物权类别代码",
name: "物权类别",
id: "rysyfwbzhWqlbdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......
......@@ -83,7 +83,7 @@ export default {
col: "3",
},
{
label: "关系人代码补充描述:",
label: "关系人补充描述:",
prop: "gxrRmcDmbcms",
col: "6",
},
......@@ -93,7 +93,7 @@ export default {
col: "3",
},
{
label: "关系人常用证件代码:",
label: "关系人常用证件:",
prop: "gxrCyzjCyzjdm",
col: "3",
},
......@@ -134,7 +134,7 @@ export default {
col: "3",
},
{
label: "关系人民族代码:",
label: "关系人民族:",
prop: "gxrMzdm",
type: "codeTree",
codeTree: "CODE_MZ_MIS",
......@@ -199,14 +199,14 @@ export default {
col: "6",
},
{
label: "关系人职业职业类别代码:",
label: "关系人职业职业类别:",
prop: "gxrZyZylbdm",
type: "codeTree",
codeTree: "CODE_ZY",
col: "3",
},
{
label: "关系人职业代码补充描述:",
label: "关系人职业补充描述:",
prop: "gxrZyDmbcms",
col: "3",
},
......
......@@ -96,7 +96,7 @@ export default {
col: "3",
},
{
name: "性别代码",
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -106,7 +106,7 @@ export default {
codeTree: "CODE_XB",
},
{
name: "民族代码",
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -196,15 +196,15 @@ export default {
width: "200",
},
{
label: "性别代码",
label: "性别",
prop: "xbdm",
},
{
label: "人员类别代码",
label: "人员类别",
prop: "xzgzrylbdm",
},
{
label: "关注级别代码",
label: "关注级别",
prop: "xzgzrygzjbdm",
},
{
......
......@@ -46,7 +46,7 @@ export default {
col: "3",
},
{
name: "性别代码",
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -56,7 +56,7 @@ export default {
codeTree: "CODE_XB",
},
{
name: "民族代码",
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -145,15 +145,15 @@ export default {
width: "200",
},
{
label: "性别代码",
label: "性别",
prop: "xbdm",
},
{
label: "人员类别代码",
label: "人员类别",
prop: "xzgzrylbdm",
},
{
label: "关注级别代码",
label: "关注级别",
prop: "xzgzrygzjbdm",
},
{
......
......@@ -46,7 +46,7 @@ export default {
col: "3",
},
{
name: "性别代码",
name: "性别",
id: "xbdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -56,7 +56,7 @@ export default {
codeTree: "CODE_XB",
},
{
name: "民族代码",
name: "民族",
id: "mzdm",
type: "codeTreeDialog",
props: [], //字典弹框需要的字段
......@@ -145,15 +145,15 @@ export default {
width: "200",
},
{
label: "性别代码",
label: "性别",
prop: "xbdm",
},
{
label: "人员类别代码",
label: "人员类别",
prop: "xzgzrylbdm",
},
{
label: "关注级别代码",
label: "关注级别",
prop: "xzgzrygzjbdm",
},
{
......
......@@ -145,12 +145,12 @@ export default {
col: "3",
},
{
label: "服务对象_基站名称:",
label: "服务对象基站名称:",
prop: "fwdxJzmc",
col: "3",
},
{
label: "服务对象_基站代码:",
label: "服务对象基站:",
prop: "fwdxJzdmStr",
col: "3",
},
......
......@@ -79,7 +79,7 @@ export default {
col: "3",
},
{
label: "物品颜色代码",
label: "物品颜色",
prop: "ryxdydtxsbWpysdm",
type: "codeTree",
codeTree: "CODE_XB",
......
......@@ -13,7 +13,11 @@
<script>
import formCompontent from "@c/form.vue";
import axios from "@/utils/http.js";
import { insertZdcyryxx, updateZdcyryxx, infoZdcyryxx, } from "@/api/zdxx/zdcyryxx.js";
import {
insertZdcyryxx,
updateZdcyryxx,
infoZdcyryxx,
} from "@/api/zdxx/zdcyryxx.js";
export default {
name: "addYhkxs",
components: {
......@@ -57,8 +61,8 @@ export default {
col: "2",
},
{
name: "国籍名称:",
id: "gjmc",
name: "国籍:",
id: "gjdm",
type: "codeTree",
codeTree: "CODE_GJ",
codeOptions: [],
......@@ -67,35 +71,54 @@ export default {
col: "2",
},
{
name: "国籍名称:",
id: "gjmc",
type: "text",
value: "",
prop: "checkEmpty",
placeholder: "请输入",
col: "2",
},
{
name: "户籍地:",
id: "hjddm",
type: "codeTree",
value: "",
codeOptions: [],
codeTree: "CODE_XZQH",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "现住址名称:",
name: "现住址:",
id: "xzzdm",
type: "codeTree",
value: "",
codeTree: "CODE_XZQH",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "现住址名称:",
id: "xzzmc",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "特殊身份:",
id: "tssf",
type: "text",
type: "codeTree",
codeTree: "CODE_SF",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "出生地行政区划代码:",
name: "出生地行政区划:",
id: "csdXzqhdm",
type: "codeTree",
value: "",
......@@ -105,22 +128,40 @@ export default {
col: "2",
},
{
name: "职业类别代码:",
id: "csdXzqhdm",
type: "codeTree",
name: "出生地_地址名称:",
id: "csdDzmc",
type: "text",
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "职业类别:",
id: "zylbdm",
type: "codeTree",
codeTree: "CODE_XYLB",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "学历代码:",
name: "学历:",
id: "xldm",
type: "codeTree",
value: "",
codeTree: "CODE_WHCD",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "婚姻:",
id: "hyzkdm",
type: "codeTree",
value: "",
codeTree: "CODE_HYZK",
codeOptions: [],
placeholder: "请输入",
col: "2",
},
......@@ -140,25 +181,25 @@ export default {
placeholder: "请输入",
col: "2",
},
// {
// name: "是否换岗:",
// id: "sfhgPdbz",
// type: "radio",
// value: "0",
// placeholder: "请输入",
// col: "2",
// radioData: [
// { name: "是", value: "1" },
// { name: "否", value: "0" },
// ],
// },
{
name: "是否换岗:",
id: "sfhgPdbz",
type: "radio",
value: "0",
placeholder: "请输入",
col: "2",
radioData: [
{ name: "是", value: "1" },
{ name: "否", value: "0" },
],
},
{
name: "婚姻:",
id: "hyzkdmStr",
type: "codeTree",
value: "",
codeTree: "CODE_HYZK",
codeTree: "CODE_IF",
codeOptions: [],
value: "0",
placeholder: "请输入",
col: "2",
},
......@@ -266,8 +307,8 @@ export default {
},
getshuju() {
var self = this;
let params = new FormData()
params.append('xxzjbh',this.xxzjbh)
let params = new FormData();
params.append("xxzjbh", this.xxzjbh);
infoZdcyryxx(params).then((res) => {
var result = res.data.rows;
self.propFormField.forEach((fieldItem) => {
......@@ -306,7 +347,7 @@ export default {
this.$store.commit("user/SET_Breadcrumb", this.Menu);
if (this.$route.query.xxzjbh) {
// this.propFormField[0].title = "修改阵地从业人员信息";
this.propFormField[0].title = "修改阵地从业人员信息"
this.propFormField[0].title = "修改阵地从业人员信息";
this.xxzjbh = this.$route.query.xxzjbh;
this.getshuju();
}
......
......@@ -25,8 +25,7 @@ export default {
{
title: "新增阵地交易活动",
id: 1,
objStr: "",
objStr: "jyhd",
index: 0,
data: [
{
......@@ -86,7 +85,7 @@ export default {
col: "2",
},
{
name: "交易地点_行政区划代码:",
name: "交易地点行政区划:",
id: "jyddXzqhdm",
type: "codeTree",
codeTree: "CODE_XZQH",
......@@ -96,7 +95,7 @@ export default {
col: "2",
},
{
name: "交易地点_名称:",
name: "交易地点名称:",
id: "jyddXzqhmc",
type: "text",
value: "",
......@@ -104,19 +103,28 @@ export default {
col: "2",
},
{
name: "交易方式_简要情况:",
name: "交易方式简要情况:",
id: "jyfsJyqk",
type: "text",
type: "textarea",
value: "",
placeholder: "请输入",
col: "2",
col: "18",
},
],
},
{
title: "新增阵地交易活动相关人员",
id: 1,
objStr: "xgry",
index: 0,
data: [
{
name: "姓名:",
id: "xm",
type: "text",
value: "",
placeholder: "请输入",
prop: "checkEmpty",
col: "2",
},
{
......@@ -125,6 +133,7 @@ export default {
type: "text",
value: "",
placeholder: "请输入",
prop: "checkEmpty",
col: "2",
},
{
......@@ -133,10 +142,11 @@ export default {
type: "text",
value: "",
placeholder: "请输入",
prop: "checkEmpty",
col: "2",
},
{
name: "国籍代码:",
name: "国籍:",
id: "gjdm",
type: "codeTree",
codeTree: "CODE_GJ",
......@@ -162,7 +172,7 @@ export default {
col: "2",
},
{
name: "现住址代码:",
name: "现住址:",
id: "xzzdm",
type: "codeTree",
codeTree: "CODE_XZQH",
......@@ -188,7 +198,7 @@ export default {
col: "2",
},
{
name: "出生地_行政区划代码:",
name: "出生地行政区划:",
id: "csdXzqhdm",
type: "codeTree",
codeTree: "CODE_XZQH",
......@@ -198,7 +208,7 @@ export default {
col: "2",
},
{
name: "出生地_地址名称:",
name: "出生地地址名称:",
id: "csdDzmc",
type: "text",
value: "",
......@@ -244,7 +254,7 @@ export default {
col: "2",
},
],
},
}
],
formLabelAlign: {},
stepList: [
......
......@@ -51,7 +51,7 @@ export default {
col: "3",
},
{
label: "出生地_行政区划代码:",
label: "出生地_行政区划:",
prop: "csdXzqhdmStr",
col: "3",
},
......@@ -71,14 +71,14 @@ export default {
col: "3",
},
{
label: "学历代码:",
label: "学历:",
prop: "xldmStr",
col: "3",
},
],
pageFooterProps: [
{
label: "现住址代码:",
label: "现住址:",
prop: "xzzdmStr",
col: "3",
},
......
......@@ -140,7 +140,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "国际代码:",
name: "国际:",
id: "gjdm",
type: "codeTree",
codeTree: "CODE_GJ",
......@@ -174,13 +174,13 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "现住址代码:",
name: "现住址:",
id: "xzzdm",
type: "text",
disabled: false,
// prop: "checkEmpty",
value: "",
placeholder: "请输入现住址代码",
placeholder: "请输入现住址",
col: "2",
icon: "caijiIcon iconfont icontiqu",
},
......@@ -207,7 +207,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "出生地_行政区划代码:",
name: "出生地_行政区划:",
id: "csdXzqhdm",
type: "text",
disabled: false,
......@@ -218,7 +218,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "出生地_地址名称:",
name: "出生地地址名称:",
id: "csdDzmc",
type: "text",
disabled: false,
......@@ -229,18 +229,18 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "职业_职业类别代码:",
name: "职业类别:",
id: "zylbdm",
type: "text",
disabled: false,
// prop: "checkEmpty",
value: "",
placeholder: "请输入职业类别代码",
placeholder: "请输入职业类别",
col: "2",
icon: "caijiIcon iconfont icontiqu",
},
{
name: "婚姻状况代码:",
name: "婚姻状况:",
id: "hyzkdm",
type: "codeTree",
codeTree: "CODE_HYZK",
......@@ -252,7 +252,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "学历代码:",
name: "学历:",
id: "xldm",
type: "text",
disabled: false,
......
......@@ -154,7 +154,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "国际代码:",
name: "国:",
id: "gjdm",
type: "codeTree",
codeTree: "CODE_GJ",
......@@ -193,7 +193,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "现住址代码:",
name: "现住址:",
id: "xzzdm",
type: "codeTree",
codeOptions: [],
......@@ -265,7 +265,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "婚姻状况代码:",
name: "婚姻状况:",
id: "hyzkdm",
type: "codeTree",
codeOptions: [],
......@@ -278,7 +278,7 @@ export default {
icon: "caijiIcon iconfont icontiqu",
},
{
name: "学历代码:",
name: "学历:",
id: "xldm",
type: "text",
disabled: false,
......
......@@ -64,7 +64,7 @@ export default {
objStr: "xgry", //对象中的对应字段
data: [
{
label: "出生地_行政区划代码:",
label: "出生地行政区划:",
prop: "csdXzqhdmStr",
col: "3",
},
......@@ -84,12 +84,12 @@ export default {
col: "3",
},
{
label: "学历代码:",
label: "学历:",
prop: "xldmStr",
col: "3",
},
{
label: "现住址代码:",
label: "现住址:",
prop: "xzzdmStr",
col: "3",
},
......
......@@ -111,7 +111,7 @@ export default {
col: "3",
},
{
label: "证据材料_案事件证据材料类型代码:",
label: "证据材料案事件证据材料类型:",
prop: "zjclLxdm",
col: "3",
},
......
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