Merge remote-tracking branch 'origin/master'

src/views/debit-pay/material/book.vue

@@ -20,7 +20,7 @@
         <!-- 新增/修改 -->
         <hc-new-dialog v-model="formModalShow" is-to-body widths="30rem" :title="modalTitle" :loading="saveLoading" @save="formModalSave" @close="formModalClose">
             <el-form ref="formRef" class="p-4" :model="formModel" :rules="formRules" label-position="top">
-                <el-form-item label="计量期：">
+                <el-form-item label="计量期：" prop="meterPeriodId">
                     <el-select v-if="editType === 'add'" v-model="formModel.meterPeriodId" placeholder="选择计量期" filterable clearable block @change="selectPeriod">
                         <el-option v-for="item in periodData" :key="item.id" :label="item.periodName" :value="item.id" />
                     </el-select>
@@ -28,7 +28,7 @@
                         <el-option v-for="item in key1Data" :key="item.id" :label="item.periodName" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="报表名称：">
+                <el-form-item label="报表名称：" prop="statementName">
                     <el-input v-model="formModel.statementName" />
                 </el-form-item>
                 <el-form-item label="报表期：">
@@ -50,7 +50,7 @@ import { onMounted, ref } from 'vue'
 import bookApi from '~api/debit-pay/material/book.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import { useAppStore } from '~src/store'
-import { getArrValue, getObjValue } from 'js-fast-way'
+import { formValidate, getArrValue, getObjValue } from 'js-fast-way'
 const useAppState = useAppStore()
 const contractId = ref(useAppState.getContractId)
 const projectId = ref(useAppState.getProjectId)
@@ -186,10 +186,26 @@ const removeProPay = async (id) => {
 //表单
 const formRef = ref(null)
 const formModel = ref({})
-const formRules = []
+const formRules = {
+    meterPeriodId: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择计量期',
+    },
+    statementName: {
+        required: true,
+        trigger: 'blur',
+        message: '请输入报表名称',
+    },
+}
+ 
+
 
 const saveLoading = ref(false)
 const formModalSave = async () => {
+    const isValidate = await formValidate(formRef.value)
+    if (!isValidate) return false
+
     saveLoading.value = true
     const { error, code, msg } = await bookApi.submit({
         ...formModel.value,

src/views/debit-pay/start-work/book.vue

@@ -20,7 +20,7 @@
         <!-- 新增/修改 -->
         <hc-new-dialog v-model="formModalShow" is-to-body widths="30rem" :title="modalTitle" :loading="saveLoading" @save="formModalSave" @close="formModalClose">
             <el-form ref="formRef" class="p-4" :model="formModel" :rules="formRules" label-position="top">
-                <el-form-item label="计量期：">
+                <el-form-item label="计量期：" prop="meterPeriodId">
                     <el-select v-if="editType === 'add'" v-model="formModel.meterPeriodId" placeholder="选择计量期" filterable clearable block @change="selectPeriod">
                         <el-option v-for="item in periodData" :key="item.id" :label="item.periodName" :value="item.id" />
                     </el-select>
@@ -28,7 +28,7 @@
                         <el-option v-for="item in key1Data" :key="item.id" :label="item.periodName" :value="item.id" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="报表名称：">
+                <el-form-item label="报表名称：" prop="statementName">
                     <el-input v-model="formModel.statementName" />
                 </el-form-item>
                 <el-form-item label="报表期：">
@@ -50,7 +50,7 @@ import { onMounted, ref } from 'vue'
 import bookApi from '~api/debit-pay/material/book.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import { useAppStore } from '~src/store'
-import { getArrValue, getObjValue } from 'js-fast-way'
+import { formValidate, getArrValue, getObjValue } from 'js-fast-way'
 const useAppState = useAppStore()
 const contractId = ref(useAppState.getContractId)
 const projectId = ref(useAppState.getProjectId)
@@ -186,10 +186,23 @@ const removeProPay = async (id) => {
 //表单
 const formRef = ref(null)
 const formModel = ref({})
-const formRules = []
+const formRules = {
+    meterPeriodId: {
+        required: true,
+        trigger: 'blur',
+        message: '请选择计量期',
+    },
+    statementName: {
+        required: true,
+        trigger: 'blur',
+        message: '请输入报表名称',
+    },
+}
 
 const saveLoading = ref(false)
 const formModalSave = async () => {
+    const isValidate = await formValidate(formRef.value)
+    if (!isValidate) return false
     saveLoading.value = true
     const { error, code, msg } = await bookApi.submit({
         ...formModel.value,