Merge remote-tracking branch 'origin/master'

src/views/debit-pay/admin/periods.vue

@@ -231,9 +231,10 @@ const editModalSave = async () => {
         saveLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
+            getTableData()
+            editModalClose()
         }
-        getTableData()
-    editModalClose()
+      
 }
 const editModalClose = () => {
     editModalShow.value = false

src/views/project/debit/contract/check-list.vue

@@ -153,6 +153,13 @@
                             </el-form-item>
                         </el-col>
                     </template>
+                    <el-col v-if="formModel.nodeTier === 0" :span="24">
+                        <el-form-item label="清单类型：">
+                            <el-select v-model="formModel.formType" block placeholder="请选择">
+                                <el-option v-for="item in formtypeOptions" :key="item.id" :label="item.dictValue" :value="item.dictKey" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="备注：">
                             <el-input v-model="formModel.remark" :autosize="{ minRows: 4, maxRows: 8 }" type="textarea" />