徐滕 2 týždňov pred
rodič
commit
a9ef9fbfac

+ 10 - 10
src/views/common/reimbursement/ReimbursementComponent.vue

@@ -37,7 +37,7 @@
         </div>
         <div v-if="tenantFlag === 'pg' && inputForm.sourceType === '1'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'" size="default"
                     @click="insertEvent('detail')" plain>
@@ -181,7 +181,7 @@
         </div>
         <div v-else-if="tenantFlag === 'cw' && inputForm.sourceType === '1'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'" size="default"
                     @click="insertEvent('detail')" plain>
@@ -325,7 +325,7 @@
         </div>
         <div v-else-if="tenantFlag !== 'pg' && inputForm.sourceType === '1'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('detail')" plain>
@@ -464,7 +464,7 @@
 
         <div v-if="inputForm.sourceType === '2'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                合同报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                合同报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('contract_detail')" plain>
@@ -586,7 +586,7 @@
         </div>
         <div v-if="inputForm.sourceType === '3' && tenantFlag === 'cw'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                报告报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                报告报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('report_detail')" plain>
@@ -731,7 +731,7 @@
         </div>
         <div v-else-if="inputForm.sourceType === '3' && tenantFlag !== 'cw'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                报告报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                报告报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('report_detail')" plain>
@@ -870,7 +870,7 @@
 
         <div v-if="inputForm.sourceType === '4'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                其他报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                其他报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('others')" plain>
@@ -1010,7 +1010,7 @@
         </div>
         <div v-if="inputForm.sourceType === '5'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                采购报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                采购报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || this.formReadOnly" @click="insertEvent('procured')" plain>
                     新增报销单
@@ -1128,7 +1128,7 @@
         </div>
         <div v-if="inputForm.sourceType === '8'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                中审项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                中审项目报销详情<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 20px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('zs_project_detail')" plain>
@@ -1289,7 +1289,7 @@
         </div>
         <div v-if="inputForm.reimbursementType === '0'">
             <el-divider content-position="left"><i class="el-icon-document"></i>
-                专用发票信息<span style="color: red;">(报销信息仅可登记一条报销单。可在报销单后操作栏新增xml格式数电发票信息)</span>
+                专用发票信息<span style="color: red;">(报销信息仅可登记一条报销单(每个报销流程仅针对一张白色或蓝色报销单)。可在报销单后操作栏新增xml格式数电发票信息)</span>
                 <!-- <el-button size="default" style="margin-left: 10px" type="primary"
                     :disabled="method === 'view' || status === 'audit' || status === 'taskFormDetail'"
                     @click="insertEvent('amount')" plain>

+ 1 - 1
src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -46,7 +46,7 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="身份证号码" prop="idCard"
-							:rules="[{ required: true, validator: validator.isCardId, trigger: 'blur' }]">
+							:rules="[{ validator: validator.isCardId, trigger: 'blur' }]">
 							<el-input v-model="inputForm.idCard"
 								@blur="idCardOnly(inputForm.idCard, inputForm.id)"></el-input>
 						</el-form-item>

+ 1 - 1
src/views/sys/user/UserForm.vue

@@ -139,7 +139,7 @@
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="身份证号码" prop="idCard"
-						:rules="[{ required: true, validator: validator.isCardId, trigger: 'blur' }]">
+						:rules="[{ validator: validator.isCardId, trigger: 'blur' }]">
 						<el-input v-model="inputForm.idCard"
 							@blur="idCardOnly(inputForm.idCard, inputForm.id)"></el-input>
 					</el-form-item>