雷海东 / factory-web · 提交

转到一个项目

作者 雷海东
提交 b000664618c4e8e83391f83d64f2729dbc94bcca 1 个父辈 4f7710c3

算法基本工资字段删除

内嵌 并排对比
正在显示 2 个修改的文件 包含 0 行增加 和 12 行删除
@@ -155,11 +155,6 @@ @@ -155,11 +155,6 @@
155 dataIndex: 'jobId' 155 dataIndex: 'jobId'
156 }, 156 },
157 { 157 {
158 - title:'基本工资',  
159 - align:"center",  
160 - dataIndex: 'basicSalary'  
161 - },  
162 - {  
163 title:'总工资算法', 158 title:'总工资算法',
164 align:"center", 159 align:"center",
165 dataIndex: 'zongPrice' 160 dataIndex: 'zongPrice'
@@ -210,7 +205,6 @@ @@ -210,7 +205,6 @@
210 let fieldList=[]; 205 let fieldList=[];
211 fieldList.push({type:'string',value:'jobTitle',text:'岗位'}) 206 fieldList.push({type:'string',value:'jobTitle',text:'岗位'})
212 fieldList.push({type:'string',value:'jobId',text:'岗位编号'}) 207 fieldList.push({type:'string',value:'jobId',text:'岗位编号'})
213 - fieldList.push({type:'number',value:'basicSalary',text:'基本工资'})  
214 fieldList.push({type:'string',value:'zongPrice',text:'总工资算法'}) 208 fieldList.push({type:'string',value:'zongPrice',text:'总工资算法'})
215 fieldList.push({type:'number',value:'bili',text:'计算比例'}) 209 fieldList.push({type:'number',value:'bili',text:'计算比例'})
216 fieldList.push({type:'string',value:'notes',text:'备注'}) 210 fieldList.push({type:'string',value:'notes',text:'备注'})
@@ -14,11 +14,6 @@ @@ -14,11 +14,6 @@
14 </a-form-model-item> 14 </a-form-model-item>
15 </a-col> 15 </a-col>
16 <a-col :span="24"> 16 <a-col :span="24">
17 - <a-form-model-item label="基本工资" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="basicSalary">  
18 - <a-input-number v-model="model.basicSalary" placeholder="请输入基本工资" style="width: 100%" />  
19 - </a-form-model-item>  
20 - </a-col>  
21 - <a-col :span="24">  
22 <a-form-model-item label="总工资算法" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zongPrice"> 17 <a-form-model-item label="总工资算法" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zongPrice">
23 <a-input v-model="model.zongPrice" placeholder="请输入总工资算法" ></a-input> 18 <a-input v-model="model.zongPrice" placeholder="请输入总工资算法" ></a-input>
24 </a-form-model-item> 19 </a-form-model-item>
@@ -72,7 +67,6 @@ @@ -72,7 +67,6 @@
72 validatorRules: { 67 validatorRules: {
73 jobId: [{ required: true, message: '请输入岗位编号!' }], 68 jobId: [{ required: true, message: '请输入岗位编号!' }],
74 jobTitle: [{ required: true, message: '请输入岗位名称!' }], 69 jobTitle: [{ required: true, message: '请输入岗位名称!' }],
75 - basicSalary: [{ required: true, message: '请输入基本工资!' }],  
76 bili: [{ required: true, message: '请输入计算比例!' }], 70 bili: [{ required: true, message: '请输入计算比例!' }],
77 zongPrice: [{ required: true, message: '请输入总工资算法!' }], 71 zongPrice: [{ required: true, message: '请输入总工资算法!' }],
78 }, 72 },