b0f20c14 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 89c3674a 74ac93b7
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-04 13:29:47 4 * @LastEditTime: 2023-08-16 16:40:38
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm" 7 <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <el-row> 10 <el-row>
11 <el-col :span="8"> 11 <el-col :span="8">
12 <el-form-item label="权利人类型" prop="sqrlx"> 12 <el-form-item label="权利人类型" prop="sqrlx">
13 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择"> 13 <el-select clearable v-model="ruleForm.sqrlx" class="width100" :disabled="!showButton" placeholder="请选择">
14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 14 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
15 </el-option> 15 </el-option>
16 </el-select> 16 </el-select>
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
18 </el-col> 18 </el-col>
19 <el-col :span="8"> 19 <el-col :span="8">
20 <el-form-item label="姓名/名称" prop="sqrmc"> 20 <el-form-item label="姓名/名称" prop="sqrmc">
21 <el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input> 21 <el-input v-model="ruleForm.sqrmc" maxlegth="15" :disabled="!showButton"></el-input>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
24 <el-col :span="8"> 24 <el-col :span="8">
25 <el-form-item label="证件种类" prop="zjzl"> 25 <el-form-item label="证件种类" prop="zjzl">
26 <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择"> 26 <el-select clearable v-model="ruleForm.zjzl" :disabled="!showButton" class="width100" placeholder="请选择">
27 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 27 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
28 </el-option> 28 </el-option>
29 </el-select> 29 </el-select>
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
33 <el-row> 33 <el-row>
34 <el-col :span="8"> 34 <el-col :span="8">
35 <el-form-item label="证件号" prop="zjh"> 35 <el-form-item label="证件号" prop="zjh">
36 <el-input v-model="ruleForm.zjh" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input> 36 <el-input v-model="ruleForm.zjh" :disabled="!showButton" maxlength="15" oninput="this.value=this.value.replace(/[^\X0-9]/g,'')"></el-input>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 <el-col :span="8"> 39 <el-col :span="8">
40 <el-form-item label="联系电话" prop="dh"> 40 <el-form-item label="联系电话" prop="dh">
41 <el-input v-model="ruleForm.dh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 41 <el-input v-model="ruleForm.dh" :disabled="!showButton" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="份数" prop="fs"> 45 <el-form-item label="份数" prop="fs">
46 <el-input v-model="ruleForm.fs" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 46 <el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 49
...@@ -51,17 +51,17 @@ ...@@ -51,17 +51,17 @@
51 <el-row> 51 <el-row>
52 <el-col :span="8"> 52 <el-col :span="8">
53 <el-form-item label="法人名称" prop="frmc"> 53 <el-form-item label="法人名称" prop="frmc">
54 <el-input v-model="ruleForm.frmc"></el-input> 54 <el-input v-model="ruleForm.frmc" :disabled="!showButton"></el-input>
55 </el-form-item> 55 </el-form-item>
56 </el-col> 56 </el-col>
57 <el-col :span="8"> 57 <el-col :span="8">
58 <el-form-item label="国家/地区" prop="gj"> 58 <el-form-item label="国家/地区" prop="gj">
59 <el-input v-model="ruleForm.gj"></el-input> 59 <el-input v-model="ruleForm.gj" :disabled="!showButton"></el-input>
60 </el-form-item> 60 </el-form-item>
61 </el-col> 61 </el-col>
62 <el-col :span="8"> 62 <el-col :span="8">
63 <el-form-item label="户籍所在省市" prop="hjszss"> 63 <el-form-item label="户籍所在省市" prop="hjszss">
64 <el-input v-model="ruleForm.hjszss"></el-input> 64 <el-input v-model="ruleForm.hjszss" :disabled="!showButton"></el-input>
65 </el-form-item> 65 </el-form-item>
66 </el-col> 66 </el-col>
67 </el-row> 67 </el-row>
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
69 <el-row> 69 <el-row>
70 <el-col :span="16"> 70 <el-col :span="16">
71 <el-form-item label="地址" prop="txdz"> 71 <el-form-item label="地址" prop="txdz">
72 <el-input v-model="ruleForm.txdz"></el-input> 72 <el-input v-model="ruleForm.txdz" :disabled="!showButton"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 <el-col :span="8"> 75 <el-col :span="8">
76 <el-form-item label="邮编" prop="yb"> 76 <el-form-item label="邮编" prop="yb">
77 <el-input v-model="ruleForm.yb"></el-input> 77 <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
78 </el-form-item> 78 </el-form-item>
79 </el-col> 79 </el-col>
80 </el-row> 80 </el-row>
...@@ -82,17 +82,17 @@ ...@@ -82,17 +82,17 @@
82 <el-row> 82 <el-row>
83 <el-col :span="8"> 83 <el-col :span="8">
84 <el-form-item label="发证机关" prop="fzjg"> 84 <el-form-item label="发证机关" prop="fzjg">
85 <el-input v-model="ruleForm.fzjg"></el-input> 85 <el-input v-model="ruleForm.fzjg" :disabled="!showButton"></el-input>
86 </el-form-item> 86 </el-form-item>
87 </el-col> 87 </el-col>
88 <el-col :span="8"> 88 <el-col :span="8">
89 <el-form-item label="电子邮件" prop="dzyj"> 89 <el-form-item label="电子邮件" prop="dzyj">
90 <el-input v-model="ruleForm.dzyj"></el-input> 90 <el-input v-model="ruleForm.dzyj" :disabled="!showButton"></el-input>
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
93 <el-col :span="8"> 93 <el-col :span="8">
94 <el-form-item label="权利比例" prop="qlbl"> 94 <el-form-item label="权利比例" prop="qlbl">
95 <el-input v-model="ruleForm.qlbl"></el-input> 95 <el-input v-model="ruleForm.qlbl" :disabled="!showButton"></el-input>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 </el-row> 98 </el-row>
...@@ -100,12 +100,12 @@ ...@@ -100,12 +100,12 @@
100 <el-row> 100 <el-row>
101 <el-col :span="8"> 101 <el-col :span="8">
102 <el-form-item label="工作单位" prop="gzdw"> 102 <el-form-item label="工作单位" prop="gzdw">
103 <el-input v-model="ruleForm.gzdw"></el-input> 103 <el-input v-model="ruleForm.gzdw" :disabled="!showButton"></el-input>
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 <el-col :span="16"> 106 <el-col :span="16">
107 <el-form-item label="代理机构" prop="dlrjg"> 107 <el-form-item label="代理机构" prop="dlrjg">
108 <el-input v-model="ruleForm.dlrjg"></el-input> 108 <el-input v-model="ruleForm.dlrjg" :disabled="!showButton"></el-input>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 </el-row> 111 </el-row>
...@@ -113,17 +113,17 @@ ...@@ -113,17 +113,17 @@
113 <el-row> 113 <el-row>
114 <el-col :span="8"> 114 <el-col :span="8">
115 <el-form-item label="联系电话" prop="dlrdh"> 115 <el-form-item label="联系电话" prop="dlrdh">
116 <el-input v-model="ruleForm.dlrdh" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 116 <el-input v-model="ruleForm.dlrdh" :disabled="!showButton" maxlength="11" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
117 </el-form-item> 117 </el-form-item>
118 </el-col> 118 </el-col>
119 <el-col :span="8"> 119 <el-col :span="8">
120 <el-form-item label="代理人姓名" prop="dlrmc"> 120 <el-form-item label="代理人姓名" prop="dlrmc">
121 <el-input v-model="ruleForm.dlrmc"></el-input> 121 <el-input v-model="ruleForm.dlrmc" :disabled="!showButton"></el-input>
122 </el-form-item> 122 </el-form-item>
123 </el-col> 123 </el-col>
124 <el-col :span="8"> 124 <el-col :span="8">
125 <el-form-item label="代理人证件类型" prop="dlrzjlx"> 125 <el-form-item label="代理人证件类型" prop="dlrzjlx">
126 <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择"> 126 <el-select clearable v-model="ruleForm.dlrzjlx" :disabled="!showButton" class="width100" placeholder="请选择">
127 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 127 <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
128 </el-option> 128 </el-option>
129 </el-select> 129 </el-select>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 16:29:35 4 * @LastEditTime: 2023-08-16 16:44:04
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 width: '50', 51 width: '50',
52 renderHeader: (h, scope) => { 52 renderHeader: (h, scope) => {
53 return <div> { 53 return <div> {
54 this.disabled ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i> 54 !this.disabled ? '序号' : <i class="el-icon-plus pointer" onClick={() => { this.addClick() }}></i>
55 } 55 }
56 </div> 56 </div>
57 }, 57 },
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 return ( 59 return (
60 <div> 60 <div>
61 { 61 {
62 this.disabled ? <span>{scope.$index + 1}</span> : 62 !this.disabled ? <span>{scope.$index + 1}</span> :
63 <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i> 63 <i class="el-icon-minus pointer" onClick={() => { this.deleClick(scope.$index, scope.row) }}></i>
64 } 64 }
65 </div> 65 </div>
...@@ -211,7 +211,6 @@ ...@@ -211,7 +211,6 @@
211 }); 211 });
212 }, 212 },
213 213
214 // 身份证读取
215 /** 214 /**
216 * @description: 身份证读取 215 * @description: 身份证读取
217 * @param {*} row 216 * @param {*} row
......