|
@@ -124,8 +124,11 @@
|
|
|
</template>
|
|
|
<!-- 打印状态 -->
|
|
|
<template slot="printStateWord" slot-scope="text, record">
|
|
|
- <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{record.printStateDictValue}}</span>
|
|
|
- <span @click="handlePrint(record)" class="link-bule" v-else>{{record.printStateDictValue}}</span>
|
|
|
+ <span v-if="record.printState">
|
|
|
+ <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{ record.printStateDictValue }}</span>
|
|
|
+ <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStateDictValue }}</span>
|
|
|
+ </span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
@@ -171,8 +174,8 @@
|
|
|
@close="visibleAudit=false"
|
|
|
@ok="auditOrder('WAIT_OUT_WAREHOUSE')"
|
|
|
@fail="auditOrder('AUDIT_REJECT')" />
|
|
|
- <!-- 打印状态 -->
|
|
|
- <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="printIsShow=false"></printModal>
|
|
|
+ <!-- 打印状态 -->
|
|
|
+ <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancelModal"></printModal>
|
|
|
</a-card>
|
|
|
</template>
|
|
|
|
|
@@ -192,7 +195,7 @@ import printModal from './printStatusModal.vue'
|
|
|
export default {
|
|
|
name: 'TransferOutList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, basicInfoModal, printModal,rangeDate, auditModal, AllocateType, dealerSubareaScopeList },
|
|
|
+ components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSubareaScopeList },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -218,7 +221,7 @@ export default {
|
|
|
},
|
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
|
exportLoading: false,
|
|
|
- printIsShow:false,
|
|
|
+ printIsShow: false,
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
this.disabled = true
|
|
@@ -240,12 +243,12 @@ export default {
|
|
|
visibleAudit: false,
|
|
|
auditInfo: null,
|
|
|
spinningAudit: false,
|
|
|
- openModal: false ,// 新增编辑 弹框
|
|
|
- printInfo:null
|
|
|
+ openModal: false, // 新增编辑 弹框
|
|
|
+ printInfo: null
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- // dataIndex: 'printStateDictValue',
|
|
|
+ // dataIndex: 'printStateDictValue',
|
|
|
columns () {
|
|
|
const arr = [
|
|
|
{ title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
|
|
@@ -262,7 +265,7 @@ export default {
|
|
|
{ title: '费用类型', dataIndex: 'costTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调拨类型', scopedSlots: { customRender: 'allocateType' }, width: '6%', align: 'center' },
|
|
|
{ title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '打印状态', scopedSlots: { customRender: 'printStateWord' },width: '6%', align: 'center' },
|
|
|
+ { title: '打印状态', scopedSlots: { customRender: 'printStateWord' }, width: '6%', align: 'center' },
|
|
|
{ title: '打印次数', dataIndex: 'printCount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '对单状态', dataIndex: 'checkStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
@@ -278,6 +281,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 关闭打印状态弹窗
|
|
|
+ cancelModal () {
|
|
|
+ this.printIsShow = false
|
|
|
+ this.$refs.table.refresh(true)
|
|
|
+ },
|
|
|
custChange (val) {
|
|
|
this.queryParam.receiverSn = val.key || ''
|
|
|
// this.queryParam.receiverName = val.name || ''
|
|
@@ -410,16 +418,16 @@ export default {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
this.tableHeight = window.innerHeight - tableSearchH - 238
|
|
|
},
|
|
|
- handlePrint(item){
|
|
|
- let obj={
|
|
|
- no:item.allocateNo,
|
|
|
- targetName:item.targetName,
|
|
|
- id:item.id,
|
|
|
- printState:item.printState
|
|
|
+ handlePrint (item) {
|
|
|
+ const obj = {
|
|
|
+ no: item.allocateNo,
|
|
|
+ targetName: item.targetName,
|
|
|
+ allocateSn: item.allocateSn,
|
|
|
+ printState: item.printState
|
|
|
}
|
|
|
- this.printInfo=obj;
|
|
|
- this.$nextTick(()=>{
|
|
|
- this.printIsShow = true
|
|
|
+ this.printInfo = obj
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.printIsShow = true
|
|
|
})
|
|
|
}
|
|
|
},
|