diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue
index e34c8d9..8c67c0c 100644
--- a/src/views/InvoicingRequests/edit.vue
+++ b/src/views/InvoicingRequests/edit.vue
@@ -129,7 +129,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="纳税人识别号" prop="taxpayer_identification_number">
- <el-input v-model="formData.taxpayer_identification_number" clearable
+ <el-input v-model="formData.taxpayer_identification_number" clearable v-type="'code'"
placeholder="请输入纳税人识别号" />
</el-form-item>
@@ -188,7 +188,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="邮寄单号" prop="mailing_no">
- <el-input v-model="formData.mailing_no" clearable placeholder="请输入邮寄单号" />
+ <el-input v-model="formData.mailing_no" clearable placeholder="请输入邮寄单号" v-type="'code'" />
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/project_labor_contract/edit.vue b/src/views/project_labor_contract/edit.vue
index e59fc4d..03386ef 100644
--- a/src/views/project_labor_contract/edit.vue
+++ b/src/views/project_labor_contract/edit.vue
@@ -18,7 +18,7 @@
<el-input class="w-[220px]" v-model="person_name" clearable placeholder="请选择项目人员" />
</el-form-item> </el-col>
<el-col :span="8">
- <el-form-item label="身份证号" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ <el-form-item label="身份证号">
<el-input class="w-[220px]" v-model="idcard" clearable placeholder="系统自动填写" />
</el-form-item> </el-col>
<el-col :span="8">
diff --git a/src/views/project_manager_appointment/edit.vue b/src/views/project_manager_appointment/edit.vue
index 6d16e00..9f73519 100644
--- a/src/views/project_manager_appointment/edit.vue
+++ b/src/views/project_manager_appointment/edit.vue
@@ -86,7 +86,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="项目交付日期" prop="delivery_date"
- :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '不可为空', trigger: 'blur' }, { validator: checkDate, trigger: 'blur' }]">
<el-date-picker v-model="formData.delivery_date" clearable type="date"
value-format="YYYY-MM-DD " placeholder="选择项目交付日期" class="flex-1 !flex">
</el-date-picker>
@@ -218,6 +218,19 @@ const formData = reactive({
})
+const checkDate = (rule: any, value: any, callback: any) => {
+ if (new Date(formData.delivery_date) < new Date(formData.project_approval_date)) {
+ callback(new Error('项目交付日期不能早于立项日期'))
+ }
+ else if (new Date(formData.delivery_date) < new Date(formData.start_date)) {
+ callback(new Error('项目交付日期不能早于项目开始日期'))
+
+ }
+ else {
+ callback()
+ }
+}
+
// 表单验证
const formRules = reactive<any>({
diff --git a/src/views/quality_detection_temp/index.vue b/src/views/quality_detection_temp/index.vue
index 9da8d36..e4b8b14 100644
--- a/src/views/quality_detection_temp/index.vue
+++ b/src/views/quality_detection_temp/index.vue
@@ -54,8 +54,7 @@
@click="handleDelete(row.id)">
删除
</el-button>
- <el-button v-perms="['quality.quality_detection_temp/detail']" link
- @click="handleDetail(row.id)">
+ <el-button v-perms="['quality.quality_detection_temp/detail']" link @click="handleDetail(row)">
详情
</el-button>
</template>
@@ -133,11 +132,11 @@ const handleDelete = async (id: number | any[]) => {
}
// 详情
const handleDetail = async (id: any) => {
- let res = await qualitydetectiontempDetail({ id })
+ // let res = await qualitydetectiontempDetail({ id })
showDetail.value = true
await nextTick()
detailRef.value?.open()
- detailRef.value?.setFormData(res)
+ detailRef.value?.setFormData(id)
}
diff --git a/src/views/safety_modify/detail.vue b/src/views/safety_modify/detail.vue
index e14b652..c9726af 100644
--- a/src/views/safety_modify/detail.vue
+++ b/src/views/safety_modify/detail.vue
@@ -30,6 +30,9 @@
<el-descriptions-item label="检查单位" label-align="left" align="left" label-class-name="my-label">
{{ formData.check_company }}
</el-descriptions-item>
+ <el-descriptions-item label="整改人" label-align="left" align="left" label-class-name="my-label">
+ {{ formData.modify_user }}
+ </el-descriptions-item>
<el-descriptions-item label="整改单位" label-align="left" align="left" label-class-name="my-label">
{{ formData.modify_company }}
</el-descriptions-item>
@@ -45,9 +48,7 @@
<el-descriptions-item label="检查结果" label-align="left" align="left" label-class-name="my-label">
{{ formData.check_result }}
</el-descriptions-item>
- <el-descriptions-item label="整改人" label-align="left" align="left" label-class-name="my-label">
- {{ formData.modify_user }}
- </el-descriptions-item>
+
</el-descriptions>
</popup>
</div>
diff --git a/src/views/safety_modify/edit.vue b/src/views/safety_modify/edit.vue
index 98398fa..0e2abd4 100644
--- a/src/views/safety_modify/edit.vue
+++ b/src/views/safety_modify/edit.vue
@@ -65,6 +65,11 @@
<el-input v-model="formData.check_company" clearable placeholder="请输入检查单位" />
</el-form-item>
</el-col>
+ <el-col :span="8">
+ <el-form-item label="整改人" prop="modify_user">
+ <el-input v-model="formData.modify_user" clearable placeholder="请输入整改人" />
+ </el-form-item>
+ </el-col>
<el-col :span="8">
@@ -98,11 +103,6 @@
</el-col>
- <el-col :span="8">
- <el-form-item label="整改人" prop="modify_user">
- <el-input v-model="formData.modify_user" clearable placeholder="请输入整改人" />
- </el-form-item>
- </el-col>
<!-- <el-col :span="24">
diff --git a/src/views/safety_target/edit.vue b/src/views/safety_target/edit.vue
index d722fe2..284d042 100644
--- a/src/views/safety_target/edit.vue
+++ b/src/views/safety_target/edit.vue
@@ -55,14 +55,12 @@
</el-col>
<el-col :span="24">
<el-form-item label="合格率(%)" prop="pass_rate">
- <el-input-number v-model="formData.pass_rate" :min="0" :max="100" class="flex flex-1"
- placeholder="偏差范围为0-100" />
+ <el-input v-model="formData.pass_rate" clearable placeholder="请输入" type="number" />
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="允许偏差" prop="deviation">
- <el-input-number v-model="formData.deviation" :min="1" :max="200" class="flex flex-1"
- placeholder="偏差范围为1-200" />
+ <el-form-item label="允许偏差" prop="deviation" :rules="[{ validator: checkNum, trigger: 'blur' }]">
+ <el-input v-model="formData.deviation" clearable placeholder="请输入" type="number" />
</el-form-item>
</el-col>
<el-col :span="24">
@@ -140,6 +138,13 @@ const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑安全目标表' : '新增安全目标表'
})
+const checkNum = (rules: any, value: any, callback: any) => {
+ (+value < 1 || +value > 200) ? callback(new Error("偏差范围为1-200"))
+ : callback();
+}
+
+
+
// 表单数据
const formData = reactive({
id: '',