Merge branch 'dev-2.19.0' into dev

* dev-2.19.0:
  flx：更改++

src/views/Grain/template/index.vue

@@ -16,7 +16,6 @@
 						<!-- 生效状态 0:未生效 1:生效 -->
 						<a-select-option :value="0">未生效</a-select-option>
 						<a-select-option :value="1">生效</a-select-option>
-
 					</a-select>
 				</div>
 				<div class="btnBox">
@@ -80,7 +79,9 @@
 	]
 
 	const { DEl, change, tableData, onSearch, handlePageChange, pagination, Search, onReset, SearchFormDel } =
-		listPagination({ inspectionName: '', effectiveStatus: '' }, Grain.LHJCLISTlist, Grain.LHJCLISTdel, { sortOrder: 'ASCEND' })
+		listPagination({ inspectionName: '', effectiveStatus: '' }, Grain.LHJCLISTlist, Grain.LHJCLISTdel, {
+			sortOrder: 'ASCEND'
+		})
 
 	// 查看表单数据
 	const onView = (record, row) => {

src/views/Grain/template/templateDel.vue

@@ -105,8 +105,8 @@
 		formState.value = res
 		tableData.value = []
 		tableData.value = res.items
-		checked1.value = res.effectiveStatus == 0 ? true : false
-		checked2.value = res.effectiveStatus == 1 ? true : false
+		checked1.value = res.effectiveStatus == 1 ? true : false
+		checked2.value = res.effectiveStatus == 0 ? true : false
 	}
 	const optionsGender = ref([])
 	const getGender = async () => {
@@ -208,13 +208,13 @@
 
 	// 新增
 	const pustFrom = async (value) => {
-		value.effectiveStatus = checked1.value == true ? 0 : checked2.value == true ? 1 : ''
+		value.effectiveStatus = checked1.value == true ? 1 : checked2.value == true ? 0 : ''
 		const delDate = { ...value, items: tableData.value }
 		const res = await Grain.LHJCLISTadd(delDate)
 	}
 	// 编辑
 	const pustEdit = async (value) => {
-		value.effectiveStatus = checked1.value == true ? 0 : checked2.value == true ? 1 : ''
+		value.effectiveStatus = checked1.value == true ? 1 : checked2.value == true ? 0 : ''
 		const delDate = { ...value, items: tableData.value }
 		const res = await Grain.LHJCLISTedit(delDate)
 	}