生产管理bug修改
This commit is contained in:
parent
2797934736
commit
d9ef69f89f
@ -109,8 +109,8 @@
|
||||
</template>
|
||||
|
||||
<script setup name="castrate">
|
||||
import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate/castrate'
|
||||
import { checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate'
|
||||
import { checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof'
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
@ -405,5 +405,5 @@ onMounted(() => {
|
||||
getList()
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
|
||||
})
|
||||
</script>
|
@ -107,11 +107,7 @@
|
||||
</template>
|
||||
|
||||
<script setup name="FixHoof">
|
||||
<<<<<<< HEAD
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
|
||||
=======
|
||||
import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof'
|
||||
>>>>>>> d6ae5f3654d4c07227a4547ae1732ddb570bda9f
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
@ -355,9 +351,6 @@ function getSheepfoldOptions() {
|
||||
})
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
onMounted(() => {
|
||||
=======
|
||||
//校验羊只是否存在 失焦时校验
|
||||
async function validateSheep() {
|
||||
if (!form.value.manageTags) return;
|
||||
@ -385,7 +378,6 @@ async function validateSheep() {
|
||||
/* 只保留一个 onMounted */
|
||||
|
||||
getList()
|
||||
>>>>>>> d6ae5f3654d4c07227a4547ae1732ddb570bda9f
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user