This commit is contained in:
parent
7e105f1f9d
commit
05fc8db3f8
|
|
@ -23,7 +23,7 @@ import { ref } from 'vue'
|
|||
|
||||
const props = defineProps({
|
||||
title: { type: String, default: '提示' },
|
||||
content: { type: String, default: '是否确定?' },
|
||||
content: { type: String, default: '是否确定提交?' },
|
||||
showClose: { type: Boolean, default: true },
|
||||
leftBtn: { type: String, default: '取 消' },
|
||||
rightBtn: { type: String, default: '确 定' },
|
||||
|
|
|
|||
|
|
@ -244,6 +244,7 @@
|
|||
<button class="btn-cont" @click="submitCode">确认</button>
|
||||
</div> -->
|
||||
</view>
|
||||
<PopupConfirm ref="popupConfirm" />
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -262,6 +263,8 @@ import { baseURL } from '@/utils/http'
|
|||
import eselect from '@/components/tree-select/eselect.vue'
|
||||
import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
|
||||
import PreviewImg from '@/components/PreviewImg/index.vue'
|
||||
import PopupConfirm from '@/components/PopupConfirm'
|
||||
|
||||
const taskInfo = ref({})
|
||||
const maId = ref('') //编码
|
||||
const maCode = ref('') //编码
|
||||
|
|
@ -287,6 +290,7 @@ const keyWord = ref('')
|
|||
const total = ref(0)
|
||||
const remark = ref('')
|
||||
const isRadioCheck = ref(true)
|
||||
const popupConfirm = ref()
|
||||
|
||||
const leftClick = () => {
|
||||
// 返回
|
||||
|
|
@ -699,13 +703,15 @@ const onCodeIdentify = () => {
|
|||
})
|
||||
}
|
||||
//提交
|
||||
const submitCode = () => {
|
||||
const submitCode = async () => {
|
||||
console.log(taskInfo.value)
|
||||
if (selectCodeList.value.length == 0) {
|
||||
uni.showToast({ title: '请添加退料设备!', icon: 'none' })
|
||||
} else if (apDetection.value == '不合格' && bmFileInfos.value.length == 0) {
|
||||
uni.showToast({ title: '请上传附件!', icon: 'none' })
|
||||
} else {
|
||||
const { data: confirm } = await popupConfirm.value.openPopup()
|
||||
if (!confirm) return
|
||||
let obj = {
|
||||
// maId: maId.value,
|
||||
// maCode: maCode.value,
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@
|
|||
<button class="btn-cont" @click="submitNum">确认</button>
|
||||
</div>
|
||||
</view>
|
||||
<PopupConfirm ref="popupConfirm" />
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
|
@ -165,8 +166,9 @@ import { ref, reactive } from 'vue'
|
|||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { getUseType,insertApp } from '../../services/back.js';
|
||||
import eselect from '@/components/tree-select/eselect.vue'
|
||||
const taskInfo = ref({})
|
||||
import PopupConfirm from '@/components/PopupConfirm'
|
||||
|
||||
const taskInfo = ref({})
|
||||
const maTypeSelectList = ref([])
|
||||
const typeId = ref()//类型
|
||||
const maCodeSelectList = ref([])
|
||||
|
|
@ -174,6 +176,7 @@ const typeCode = ref("")//规格型号
|
|||
const typeList = ref([])
|
||||
const isExpanded = ref(false)
|
||||
const treeSelect = ref()
|
||||
const popupConfirm = ref()
|
||||
|
||||
const leftClick = () => {
|
||||
// 返回
|
||||
|
|
@ -263,7 +266,7 @@ const selectMaCode = (e) => {
|
|||
treeSelect.value.showLabel = '' // 清空下拉框的显示文本
|
||||
}
|
||||
//提交
|
||||
const submitNum = () => {
|
||||
const submitNum = async () => {
|
||||
console.log(taskInfo.value)
|
||||
console.log(typeList.value)
|
||||
// 校验 preNum 必须大于 0
|
||||
|
|
@ -284,6 +287,8 @@ const submitNum = () => {
|
|||
return
|
||||
}
|
||||
}
|
||||
const { data: confirm } = await popupConfirm.value.openPopup()
|
||||
if (!confirm) return
|
||||
let obj = {
|
||||
"backApplyInfo":taskInfo.value,
|
||||
"backApplyDetailsList":typeList.value
|
||||
|
|
@ -295,7 +300,10 @@ const submitNum = () => {
|
|||
uni.showToast({ title: '编辑成功', icon: 'none' })
|
||||
const pages = getCurrentPages()
|
||||
console.log('🚀 ~ submitNum ~ pages:', pages)
|
||||
uni.redirectTo({ url: '/pages/back/index' })
|
||||
// uni.redirectTo({ url: '/pages/back/index' })
|
||||
uni.navigateBack({
|
||||
delta: 1, // 返回到已存在的页面
|
||||
})
|
||||
}else{
|
||||
uni.showToast({ title: res.msg, icon: 'none' })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,12 +71,15 @@
|
|||
|
||||
</div>
|
||||
</view>
|
||||
<PopupConfirm ref="popupConfirm" />
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, reactive } from 'vue'
|
||||
import { getBackInfo,deleteNumType, submitBackApply } from '@/services/back.js';
|
||||
import { onLoad,onShow } from '@dcloudio/uni-app'
|
||||
import PopupConfirm from '@/components/PopupConfirm'
|
||||
|
||||
const keyWord = ref('')
|
||||
const id = ref('')
|
||||
const taskId = ref('')
|
||||
|
|
@ -86,6 +89,7 @@ const tableList = ref([])
|
|||
const taskInfo = ref({})
|
||||
const swipeRef = ref()
|
||||
const isNew = ref(false)
|
||||
const popupConfirm = ref()
|
||||
|
||||
// 右滑按钮组
|
||||
const options = ref([
|
||||
|
|
@ -188,6 +192,8 @@ const onClick = (e, item, itemIndex) => {
|
|||
|
||||
const isSubmit = ref(false)
|
||||
const submit = async () => {
|
||||
const { data: confirm } = await popupConfirm.value.openPopup()
|
||||
if (!confirm) return
|
||||
if (isSubmit.value) return
|
||||
isSubmit.value = true
|
||||
let param = {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@
|
|||
|
||||
<script setup>
|
||||
import { onMounted } from 'vue'
|
||||
import VConsole from 'vconsole'
|
||||
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
new VConsole()
|
||||
}
|
||||
// 定义自定义事件
|
||||
const emit = defineEmits(['scanSuccess', 'scanError'])
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
type="number"
|
||||
:clearable="false"
|
||||
placeholder="出库数量"
|
||||
@change="onChangeNumber"
|
||||
@input="onChangeNumber"
|
||||
/>
|
||||
</uni-forms-item>
|
||||
<!-- <uni-forms-item label="出库数量:">
|
||||
|
|
|
|||
Loading…
Reference in New Issue