修复台湾盘点的一些问题

taiwan-tingli
yiming 4 years ago
parent 441b39d860
commit 7ab3649f9e

@ -312,7 +312,7 @@ export default {
}).then(res => { }).then(res => {
if(res.code==200){ if(res.code==200){
this.$emit('sure',false) this.$emit('sure',false)
this.$message.success('新增球成功'); this.$message.success('新增球成功');
} }
}).catch(err => { }).catch(err => {
@ -324,7 +324,7 @@ export default {
}).then(res => { }).then(res => {
if(res.code==200){ if(res.code==200){
this.$emit('sure',false) this.$emit('sure',false)
this.$message.success('编辑球成功'); this.$message.success('编辑球成功');
} }
}).catch(err => { }).catch(err => {

@ -46,6 +46,7 @@
:key="index" :key="index"
> >
<span slot="tab"> <span slot="tab">
{{ getRandom(index, latticeColumn, nums.column, total.column) }} {{ getRandom(index, latticeColumn, nums.column, total.column) }}
<!-- <a-icon :id="`${shelveId}-row-${getRandom(index,latticeRow,nums.row,total.row)}`"/> --> <!-- <a-icon :id="`${shelveId}-row-${getRandom(index,latticeRow,nums.row,total.row)}`"/> -->
<a-icon type="close-circle" v-if="status.column[index] === 1" style="color: #d81e06" /> <a-icon type="close-circle" v-if="status.column[index] === 1" style="color: #d81e06" />
@ -216,7 +217,7 @@ export default {
getStatusBg(row,column,status) { getStatusBg(row,column,status) {
var dom = document.getElementById(this.shelveId+"-"+row+'-'+column); var dom = document.getElementById(this.shelveId+"-"+row+'-'+column);
var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf'; var color = status == 1 ?'#d81e06': (status == 2 || status == 3 )? '#1afa29': '#bfbfbf';
dom.style.background = color dom.style.background = color
}, },
getStatusTab(tab,status,rowColumn){ getStatusTab(tab,status,rowColumn){

@ -26,12 +26,12 @@
</ul> </ul>
</div> </div>
<div class="img-box"> <div class="img-box">
<viewer v-if="checkObj.checkPic" style="height: 300px"> <viewer v-if="checkObj.checkPic">
<img :src="imgUrl+checkObj.checkPic"/> <img :src="imgUrl+checkObj.checkPic"/>
</viewer> </viewer>
<div <div
v-else v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:400px;"> style="display: flex;justify-content: left;width:100px;height:400px;float:left">
暫無圖片 暫無圖片
</div> </div>
<p>盤點圖</p> <p>盤點圖</p>
@ -39,14 +39,7 @@
</div> </div>
</div> </div>
<div class="bottom-btn" >
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对
</a-button>
</div>
<!-- <div class="bottom-btn" <!-- <div class="bottom-btn"
> >
<a-button class="btn" @click="prev()"></a-button> <a-button class="btn" @click="prev()"></a-button>
@ -55,7 +48,14 @@
</a-button> </a-button>
</div> --> </div> -->
</div> </div>
<div class="bottom-btn" >
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对
</a-button>
</div>
<Model <Model
:visible.sync="visible" :visible.sync="visible"
@ -65,6 +65,7 @@
@close="closeModel" @close="closeModel"
/> />
</div> </div>
</template> </template>
<script> <script>
import Model from "./model.vue" import Model from "./model.vue"
@ -101,9 +102,18 @@ export default {
key: 'lotnum' key: 'lotnum'
}, },
{ {
label:'隨行工單號', label:'貨架號',
key: 'orderNum' key: 'shelveId'
},
{
label:'行',
key: 'row'
}, },
{
label:'列',
key: 'column'
},
{ {
label:'盤點任務號', label:'盤點任務號',
key: 'checkNum' key: 'checkNum'
@ -123,7 +133,7 @@ export default {
}, },
], ],
statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"} statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"人工核對正確"}
} }
}, },
@ -416,7 +426,7 @@ export default {
&-content { &-content {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: left;
padding-left: 25px; padding-left: 25px;
.img-box { .img-box {
@ -425,17 +435,17 @@ export default {
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
font-size: 17px; font-size: 17px;
height: 400px; height: 800px;
margin-right: 10px; margin-right: 10px;
img { viewer {
height: 100% width: 100%
} }
p { p {
height: 25px; height: 25px;
} }
ul { ul {
width: 100% / 4; width: 500px;
height: 100%; height: 100%;
margin-bottom: 0; margin-bottom: 0;
padding-inline-start: 0; padding-inline-start: 0;

@ -124,7 +124,7 @@ export default {
name: "historyCheck", name: "historyCheck",
data() { data() {
return { return {
statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"}, statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"人工核對正確"},
queryParam: { queryParam: {
lotnum: '', lotnum: '',
shelveId:'', shelveId:'',

Loading…
Cancel
Save