|
|
@@ -71,7 +71,7 @@
|
|
|
<span class="history-title flex between">
|
|
|
<div>拍摄记录</div>
|
|
|
<div class="c-666 fs-12" v-if="goodsList.length">
|
|
|
- <el-button @click="delAll" class="input-button" type="primary" size="mini">一键删除</el-button>
|
|
|
+ <el-button :disabled="runLoading || takePictureLoading" @click="delAll" class="input-button" type="primary" size="mini">一键删除</el-button>
|
|
|
</div>
|
|
|
</span>
|
|
|
<img class="divider-line" referrerpolicy="no-referrer" src="@/assets/images/Photography/divider-line.png" />
|
|
|
@@ -86,8 +86,8 @@
|
|
|
<div class="flex between flex-item c-333">
|
|
|
<div class="chaochu flex-item flex left">货号：{{ item.goods_art_no }}</div>
|
|
|
<div>
|
|
|
- <el-button size="small" type="primary" @click="reTakePictureNos(item.goods_art_no,item)" plain>重拍</el-button>
|
|
|
- <el-button size="small" @click="delGoods({goods_art_nos:[item.goods_art_no]})">删除</el-button>
|
|
|
+ <el-button size="small" :disabled="runLoading || takePictureLoading" type="primary" @click="reTakePictureNos(item.goods_art_no,item)" plain>重拍</el-button>
|
|
|
+ <el-button size="small" :disabled="runLoading || takePictureLoading" @click="delGoods({goods_art_nos:[item.goods_art_no]})">删除</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="flex between flex-item c-333">
|
|
|
@@ -113,7 +113,7 @@
|
|
|
<div class="image-slot"></div>
|
|
|
</template>
|
|
|
</el-image>
|
|
|
- <div class="reset-button" @click="reTakePicture(image)">重拍</div>
|
|
|
+ <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image)">重拍</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -126,11 +126,14 @@
|
|
|
</el-popover>
|
|
|
|
|
|
|
|
|
- <el-image :src="getFilePath(image.image_path)" fit="contain" v-else>
|
|
|
+ <div class="flex el-image_view" v-else>
|
|
|
+ <el-image :src="getFilePath(image.image_path)" fit="contain">
|
|
|
<template #error>
|
|
|
<div class="image-slot"></div>
|
|
|
+ <el-button :disabled="runLoading || takePictureLoading" class="reset-button" @click="reTakePicture(image)">重拍</el-button>
|
|
|
</template>
|
|
|
</el-image>
|
|
|
+ </div>
|
|
|
</component>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -699,7 +702,7 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
|
|
|
*/
|
|
|
function openPhotographyDetail() {
|
|
|
|
|
|
- if(takePictureLoading.value){
|
|
|
+ if(runLoading.value || takePictureLoading.value){
|
|
|
ElMessage.error('正在拍摄中，请稍候')
|
|
|
return;
|
|
|
}
|
|
|
@@ -1240,6 +1243,7 @@ function openPhotographyDetail() {
|
|
|
position: absolute;
|
|
|
left:50%;
|
|
|
top:50%;
|
|
|
+ padding: 0px;
|
|
|
margin-left:-20px;
|
|
|
margin-top:-10px;
|
|
|
color: #ffffff;
|
