|
|
|
@ -88,32 +88,80 @@ |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- form --> |
|
|
|
<el-dialog append-to-body :close-on-click-modal="false" :modal-append-to-body="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title"> |
|
|
|
<el-dialog :class="unreachable.length !== 0 ? 'stock-dialog':''" append-to-body :close-on-click-modal="false" :modal-append-to-body="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title"> |
|
|
|
<span class="dialog-right-top" /> |
|
|
|
<span class="dialog-left-bottom" /> |
|
|
|
<div class="setting-dialog"> |
|
|
|
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px"> |
|
|
|
<el-form-item label="盘点单号" prop="stockBill"> |
|
|
|
<el-input v-model="form.stockBill" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="盘点类型" prop="stockTypeName"> |
|
|
|
<el-input v-model="form.stockTypeName" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="目标位置" prop="stockRegion"> |
|
|
|
<el-input v-model="form.stockRegion" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="目标数量" prop="stockGridNumName"> |
|
|
|
<el-input v-model="form.stockGridNumName" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-row> |
|
|
|
<el-form-item label="备注" prop="stockRemarks"> |
|
|
|
<el-input v-model="form.stockRemarks" type="textarea" style="width: 572px;" :rows="4" /> |
|
|
|
<div class="setting-dialog" style="display: flex; justify-content: flex-start;"> |
|
|
|
<div :style=" {'width': unreachable.length !== 0 ? '670px':''}"> |
|
|
|
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="80px"> |
|
|
|
<el-form-item label="盘点单号" prop="stockBill"> |
|
|
|
<el-input v-model="form.stockBill" disabled /> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button type="text" @click="crud.cancelCU">取消</el-button> |
|
|
|
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">保存</el-button> |
|
|
|
<el-form-item label="盘点类型" prop="stockTypeName"> |
|
|
|
<el-input v-model="form.stockTypeName" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="目标位置" prop="stockRegion"> |
|
|
|
<el-input v-model="form.stockRegion" disabled /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item |
|
|
|
class="stockGridNumName-style" |
|
|
|
label="目标数量" |
|
|
|
prop="stockGridNumName" |
|
|
|
> |
|
|
|
<span v-if="stockInfoLoading" class="el-icon-loading" /> |
|
|
|
<!-- <el-input v-else disabled v-html="form.stockGridNumName" /> --> |
|
|
|
<div v-else style="display: flex; justify-content: flex-start;"> |
|
|
|
<el-input disabled v-html="form.stockGridNumName" /> |
|
|
|
<el-popover |
|
|
|
class="stock-popover" |
|
|
|
placement="top-start" |
|
|
|
width="250" |
|
|
|
trigger="hover" |
|
|
|
> |
|
|
|
<div> |
|
|
|
<span style="display:block; font-weight: bold; margin-bottom: 10px;">A / B / C 层位 </span> |
|
|
|
A：开启盘点功能 且 当前可盘点 层位数量<br> |
|
|
|
B：开启盘点功能 且 当前不可盘点 层为数量<br> |
|
|
|
C：具备盘点功能的 层位数量 |
|
|
|
</div> |
|
|
|
<i slot="reference" class="iconfont icon-zhuyi-lan" /> |
|
|
|
</el-popover> |
|
|
|
</div> |
|
|
|
</el-form-item> |
|
|
|
<el-row> |
|
|
|
<el-form-item label="备注" prop="stockRemarks"> |
|
|
|
<el-input v-model="form.stockRemarks" type="textarea" style="width: 572px;" :rows="4" /> |
|
|
|
</el-form-item> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer" style="padding-right: 20px;"> |
|
|
|
<el-button type="text" @click="crud.cancelCU">取消</el-button> |
|
|
|
<el-button :disabled="isBtnDisabled" :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">保存</el-button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div v-if="unreachable.length !== 0" style="width: 500px; margin-left: 10px;"> |
|
|
|
<div class="stock-info-tips"> |
|
|
|
<p>注意：系统检查到，有参与本次盘点的摄像头无法连接！仅<i>{{ reachable.length }}</i>/个层架位可盘点。</p> |
|
|
|
<span>不可盘点具体情况如下：</span> |
|
|
|
</div> |
|
|
|
<div style="display: flex; justify-content: space-between;"> |
|
|
|
<el-card class="box-card"> |
|
|
|
<div slot="header"> |
|
|
|
<span>无法连接的摄像头（ <i style="color: #f53f3f; font-weight: bold; font-style: normal;">{{ ipStatusFalseNum }}</i> /个)</span> |
|
|
|
</div> |
|
|
|
<div v-for="(item,index) in ipStatusFalse" :key="index" class="stock-info-item"> |
|
|
|
<span> {{ item.ip }} </span> |
|
|
|
</div> |
|
|
|
</el-card> |
|
|
|
<el-card class="box-card"> |
|
|
|
<div slot="header"> |
|
|
|
<span>无法盘点的层架位（ <i style="color: #f53f3f; font-weight: bold; font-style: normal;">{{ unreachable.length }}</i> /个）</span> |
|
|
|
</div> |
|
|
|
<div v-for="(item,index) in unreachable" :key="index" class="stock-info-item"> |
|
|
|
<span> {{ item.gridName }} </span> |
|
|
|
</div> |
|
|
|
</el-card> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
@ -199,11 +247,12 @@ |
|
|
|
</ul> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="progress" label="进度" min-width="140"> |
|
|
|
<el-table-column prop="progress" label="进度" min-width="120" :show-overflow-tooltip="true"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span>{{ scope.row.progress !== null ? scope.row.progress : '-' }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="detailsRemarks" label="备注" min-width="100" :show-overflow-tooltip="true" /> |
|
|
|
<el-table-column prop="state" label="状态" width="80"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="scope.row.state === 0" class="row-state row-lending state-active">已终止</span> |
|
|
|
@ -229,7 +278,7 @@ |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<!-- 排队中会多一个“删除盘点” 进行中的多一个“终止盘点” --> |
|
|
|
<el-button v-if="detailInfo.state === 1" :loading="crud.delAllLoading" type="primary" class="end-btn" @click="toDelete"><i class="iconfont icon-stop" />删除盘点</el-button> |
|
|
|
<el-button v-if="detailInfo.state === 2" type="primary" class="end-btn" @click="toStopStockBill"><i class="iconfont icon-stop" />终止盘点</el-button> |
|
|
|
<el-button v-if="detailInfo.state === 2" :loading="stopLoading" type="primary" class="end-btn" @click="toStopStockBill"><i class="iconfont icon-stop" />终止盘点</el-button> |
|
|
|
<el-button :loading="crud.status.cu === 2" type="primary" @click="detailVisible=false">确定</el-button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
@ -250,7 +299,7 @@ import { mapGetters } from 'vuex' |
|
|
|
import { parseTime, saveAs, getBlob } from '@/utils/index' |
|
|
|
import qs from 'qs' |
|
|
|
|
|
|
|
const defaultForm = { stockTypeName: '全量盘点', stockType: 1, stockBill: null, stockRegion: '全部区域', stockGridNum: null, stockGridNumName: null, totalGridNum: null, stockRemarks: null, regionId: null, shelfId: null, gridShelf: null, gridId: null } |
|
|
|
const defaultForm = { stockTypeName: '全量盘点', stockType: 1, stockBill: null, stockRegion: '全部区域', stockGridNum: null, stockGridNumName: null, totalGridNum: null, stockRemarks: null, regionId: null, shelfId: null, gridShelf: null, gridId: null, reableGridIds: [], unReableGridIds: [] } |
|
|
|
export default { |
|
|
|
name: 'CheckLog', |
|
|
|
components: { crudOperation, rrOperation, pagination, taskStockLogEcharts, DateRangePicker }, |
|
|
|
@ -285,6 +334,7 @@ export default { |
|
|
|
blurryTime: null, |
|
|
|
tabIndex: 0, |
|
|
|
detailVisible: false, |
|
|
|
stopLoading: false, |
|
|
|
dbRowData: {}, |
|
|
|
detailInfo: {}, |
|
|
|
taskStockLogData: [], |
|
|
|
@ -313,7 +363,14 @@ export default { |
|
|
|
stockGridNumName: [ |
|
|
|
{ required: true, message: '请输入目标数量', trigger: 'blur' } |
|
|
|
] |
|
|
|
} |
|
|
|
}, |
|
|
|
stockInfo: null, |
|
|
|
ipStatusList: [], |
|
|
|
ipStatusFalseNum: 0, |
|
|
|
unreachable: [], |
|
|
|
reachable: [], |
|
|
|
isBtnDisabled: true, |
|
|
|
stockInfoLoading: false |
|
|
|
} |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
@ -333,6 +390,8 @@ export default { |
|
|
|
} |
|
|
|
}, |
|
|
|
[CRUD.HOOK.afterRefresh](crud) { |
|
|
|
this.isBtnDisabled = true |
|
|
|
this.stockInfoLoading = false |
|
|
|
}, |
|
|
|
// 新增前 |
|
|
|
[CRUD.HOOK.beforeToAdd]() { |
|
|
|
@ -345,18 +404,65 @@ export default { |
|
|
|
'shelfId': null |
|
|
|
} |
|
|
|
} |
|
|
|
Promise.all([ |
|
|
|
|
|
|
|
this.stockInfoLoading = true |
|
|
|
const stockInfoPromise = crudStockTaskLog.FetchStockGirdSuccess() |
|
|
|
.then(stockInfo => { |
|
|
|
this.stockInfoLoading = false |
|
|
|
return stockInfo |
|
|
|
}) |
|
|
|
.catch(error => { |
|
|
|
this.stockInfoLoading = false |
|
|
|
console.error('stockInfo 接口失败:', error) |
|
|
|
throw error |
|
|
|
}) |
|
|
|
|
|
|
|
const otherPromises = [ |
|
|
|
crudStockTaskLog.FetchNewBillNo(), |
|
|
|
crudStockTaskLog.FetchStockGirdNum(), |
|
|
|
crudStockTaskLog.FetchTotalGirdNum(params) |
|
|
|
]).then(([newBillNoRes, stockGridNumRes, totalGirdNumRes]) => { |
|
|
|
this.crud.form.stockBill = newBillNoRes |
|
|
|
this.crud.form.stockGridNumName = stockGridNumRes + ' / ' + totalGirdNumRes + ' 层位' |
|
|
|
this.crud.form.stockGridNum = stockGridNumRes |
|
|
|
this.crud.form.totalGridNum = totalGirdNumRes |
|
|
|
}).catch(error => { |
|
|
|
console.error(error) |
|
|
|
}) |
|
|
|
] |
|
|
|
|
|
|
|
Promise.all([stockInfoPromise, ...otherPromises]) |
|
|
|
.then(([stockInfo, newBillNoRes, stockGridNumRes, totalGirdNumRes]) => { |
|
|
|
console.log('stockInfo', stockInfo) |
|
|
|
this.stockInfo = stockInfo |
|
|
|
|
|
|
|
const ipStatusList = stockInfo |
|
|
|
? Object.entries(stockInfo.ipReachableCache).map(([ip, status]) => ({ ip, status })) |
|
|
|
: [] |
|
|
|
this.ipStatusList = ipStatusList |
|
|
|
this.ipStatusFalse = this.ipStatusList.filter(item => !item.status) |
|
|
|
this.ipStatusFalseNum = this.ipStatusList.filter(item => !item.status).length |
|
|
|
this.reachable = stockInfo.reachable |
|
|
|
this.unreachable = stockInfo.unreachable |
|
|
|
// 测试 |
|
|
|
// this.reachable = stockInfo.unreachable |
|
|
|
// this.unreachable = [] |
|
|
|
|
|
|
|
if (stockInfo && this.reachable.length !== 0) { |
|
|
|
this.isBtnDisabled = false |
|
|
|
} else { |
|
|
|
this.isBtnDisabled = true |
|
|
|
} |
|
|
|
|
|
|
|
this.crud.form.stockBill = newBillNoRes |
|
|
|
this.crud.form.stockGridNumName = stockInfo |
|
|
|
? `<span style="color: #00b42a;">${this.reachable.length}</span> / |
|
|
|
<span style="color: #f53f3f;">${this.unreachable.length}</span> / |
|
|
|
${totalGirdNumRes} 层位` |
|
|
|
: '数据加载失败' |
|
|
|
this.crud.form.stockGridNum = stockGridNumRes |
|
|
|
this.crud.form.totalGridNum = totalGirdNumRes |
|
|
|
}) |
|
|
|
.catch(error => { |
|
|
|
console.error('整体请求失败:', error) |
|
|
|
this.isBtnDisabled = true |
|
|
|
}) |
|
|
|
}, |
|
|
|
[CRUD.HOOK.afterAddCancel]() { |
|
|
|
this.isBtnDisabled = true |
|
|
|
this.stockInfoLoading = false |
|
|
|
}, |
|
|
|
// 初始化编辑时 |
|
|
|
[CRUD.HOOK.beforeToEdit](crud, form) { |
|
|
|
@ -366,6 +472,8 @@ export default { |
|
|
|
// 提交前做的操作 |
|
|
|
[CRUD.HOOK.afterValidateCU](crud) { |
|
|
|
console.log(crud.form) |
|
|
|
crud.form.reableGridIds = this.reachable.map(item => item.gridId) |
|
|
|
crud.form.unReableGridIds = this.unreachable.map(item => item.gridId) |
|
|
|
delete crud.form.stockGridNumName |
|
|
|
delete crud.form.stockTypeName |
|
|
|
return true |
|
|
|
@ -469,6 +577,8 @@ export default { |
|
|
|
handleCloseDialog() { |
|
|
|
this.detailVisible = false |
|
|
|
this.tabIndex = 0 |
|
|
|
this.isBtnDisabled = true |
|
|
|
this.stockInfoLoading = false |
|
|
|
}, |
|
|
|
toDelete() { |
|
|
|
this.$confirm('此操作将删除当前盘点单任务<span>你是否还要继续？</span>', '提示', { |
|
|
|
@ -490,6 +600,7 @@ export default { |
|
|
|
} else { |
|
|
|
this.$message({ message: res.message, type: 'error', offset: 8 }) |
|
|
|
} |
|
|
|
this.handleCloseDialog() |
|
|
|
this.crud.delAllLoading = false |
|
|
|
}).catch(err => { |
|
|
|
this.crud.delAllLoading = false |
|
|
|
@ -506,6 +617,7 @@ export default { |
|
|
|
type: 'warning', |
|
|
|
dangerouslyUseHTMLString: true |
|
|
|
}).then(() => { |
|
|
|
this.stopLoading = true |
|
|
|
const params = { |
|
|
|
'id': this.dbRowData.billId |
|
|
|
} |
|
|
|
@ -517,10 +629,14 @@ export default { |
|
|
|
} else { |
|
|
|
this.$message({ message: res.message, type: 'error', offset: 8 }) |
|
|
|
} |
|
|
|
this.handleCloseDialog() |
|
|
|
this.stopLoading = false |
|
|
|
}).catch(err => { |
|
|
|
console.log(err) |
|
|
|
this.stopLoading = false |
|
|
|
}) |
|
|
|
}).catch(() => { |
|
|
|
this.stopLoading = false |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -628,4 +744,61 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.stock-dialog{ |
|
|
|
::v-deep .el-dialog{ |
|
|
|
width: 1220px !important; |
|
|
|
} |
|
|
|
} |
|
|
|
.stockGridNumName-style{ |
|
|
|
::v-deep .el-form-item__content{ |
|
|
|
width: auto !important; |
|
|
|
padding: 0 10px; |
|
|
|
.stock-popover{ |
|
|
|
display: inline-block; |
|
|
|
margin-left: 6px; |
|
|
|
color: #0348f3; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
.stock-info-tips{ |
|
|
|
line-height: 24px; |
|
|
|
margin-bottom: 20px; |
|
|
|
p{ |
|
|
|
color: #0c0e1e; |
|
|
|
i{ |
|
|
|
display: inline-block; |
|
|
|
padding: 0 4px; |
|
|
|
font-weight: bold; |
|
|
|
font-style: normal; |
|
|
|
color: #00b42a; |
|
|
|
} |
|
|
|
} |
|
|
|
span{ |
|
|
|
display: block; |
|
|
|
} |
|
|
|
} |
|
|
|
::v-deep .el-card { |
|
|
|
flex: 1; |
|
|
|
margin-right: 15px; |
|
|
|
.el-card__header{ |
|
|
|
color: #0c0e1e; |
|
|
|
// font-size: 16px; |
|
|
|
background-color: #fff !important; |
|
|
|
border-bottom: 1px solid #ebeef5 !important; |
|
|
|
} |
|
|
|
.el-card__body{ |
|
|
|
height: 180px; |
|
|
|
overflow: hidden; |
|
|
|
overflow-y: scroll; |
|
|
|
} |
|
|
|
.stock-info-item{ |
|
|
|
display: flex; justify-content: space-between; padding: 4px 20px; |
|
|
|
span{ |
|
|
|
display: block; |
|
|
|
height: 26px; |
|
|
|
line-height: 26px; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
</style> |
