Merge remote-tracking branch 'origin/master'

src/views/debit-pay/material/components/order/dataModal.vue

@@ -22,7 +22,7 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="计量期：">
+                                <el-form-item label="计量期：" prop="meterPeriodId">
                                     <el-select v-model="baseForm.meterPeriodId" placeholder="选择计量期" filterable clearable block>
                                         <el-option v-for="item in key1Data" :key="item.id" :label="item.periodName" :value="item.id" />
                                     </el-select>
@@ -249,6 +249,12 @@ const baseFormRules = {
         trigger: 'blur',
         message: '请输入业务日期',
     },
+    meterPeriodId:{
+        required: true,
+        trigger: 'blur',
+        message: '请选择材料计量期',
+    },
+
 }
 const modalSaving = ref(false)
 const modalSave = async () => {

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

@@ -142,7 +142,7 @@ const getKey1Data = async ()=>{
     if (!error && code === 200) {
         key1Data.value = getArrValue(data)
         if (key1Data.value.length > 0) {
-            searchForm.value.meterPeriodId = key1Data.value[0].id
+            searchForm.value.meterPeriodId = key1Data.value[key1Data.value.length - 1].id
         }
         
     } else {

src/views/debit-pay/start-work/components/order/dataModal.vue

@@ -126,6 +126,9 @@ const getKey1Data = async ()=>{
     })
     if (!error && code === 200) {
         key1Data.value = getArrValue(data)
+        if (key1Data.value.length > 0) {
+            baseForm.value.meterPeriodId = key1Data.value[ key1Data.value.length - 1].id
+        }
     } else {
         key1Data.value = []
     }