|
|
|
|
@ -11,9 +11,9 @@
|
|
|
|
|
<a-col
|
|
|
|
|
:md="6"
|
|
|
|
|
:lg="6"
|
|
|
|
|
:xl="4"
|
|
|
|
|
:xl="!advanced?3:4"
|
|
|
|
|
:key="findex"
|
|
|
|
|
v-show="(findex < 4 && !advanced) || advanced"
|
|
|
|
|
v-show="(findex < 6 && !advanced) || advanced"
|
|
|
|
|
class="from-label">
|
|
|
|
|
<a-form-item style="padding-left: 10px; padding-right: 10px" :label="formLabel.title">
|
|
|
|
|
<formLabel
|
|
|
|
|
@ -29,7 +29,7 @@
|
|
|
|
|
</a-form-item>
|
|
|
|
|
</a-col>
|
|
|
|
|
</template>
|
|
|
|
|
<a-col :xl="formBtnCol || (!advanced && 8)" :lg="24" :md="24" :sm="24">
|
|
|
|
|
<a-col style="padding: 0px;" :xl="!advanced?6:8" :lg="24" :md="24" :sm="24">
|
|
|
|
|
<span
|
|
|
|
|
class="table-page-search-submitButtons"
|
|
|
|
|
:style="(advanced && { float: 'right', overflow: 'hidden' }) || {}">
|
|
|
|
|
@ -349,20 +349,34 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<template #dzRemark="{ row }">
|
|
|
|
|
<div >
|
|
|
|
|
<a-popover placement="topLeft" :content="row.dzRemark">
|
|
|
|
|
<a-icon style="cursor: pointer;" @click="handleOpenMark(row,1)" type="edit" />
|
|
|
|
|
{{ row.dzRemark }}
|
|
|
|
|
<a-spin :spinning="row.dzmarkLoading">
|
|
|
|
|
<a-popover placement="topLeft">
|
|
|
|
|
<template slot="content">
|
|
|
|
|
{{ row.dzRemark }}
|
|
|
|
|
</template>
|
|
|
|
|
<div style="display: flex;align-items: center;">
|
|
|
|
|
<a-input @blur="getBlurMark(row,1)" @focus="getFocusMark(row,1)" style="margin-top: 0px;" v-model="row.dzRemark" default-value="mysite">
|
|
|
|
|
</a-input>
|
|
|
|
|
<a-icon v-show="row.rowDzMark" style="cursor: pointer;margin-left: 5px;color:#36cfc9;" @mousedown.native="handleSaveMark(row,1)" type="check-circle" theme="filled" />
|
|
|
|
|
</div>
|
|
|
|
|
</a-popover>
|
|
|
|
|
</div>
|
|
|
|
|
</a-spin>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<template #czRemark="{ row }">
|
|
|
|
|
<div >
|
|
|
|
|
<a-popover placement="topLeft" :content="row.czRemark">
|
|
|
|
|
<a-icon style="cursor: pointer;" @click="handleOpenMark(row,2)" type="edit" />
|
|
|
|
|
{{ row.czRemark }}
|
|
|
|
|
</a-popover>
|
|
|
|
|
<a-spin :spinning="row.czmarkLoading">
|
|
|
|
|
<a-popover placement="topLeft">
|
|
|
|
|
<template slot="content">
|
|
|
|
|
{{ row.czRemark }}
|
|
|
|
|
</template>
|
|
|
|
|
<div style="display: flex;align-items: center;">
|
|
|
|
|
<a-input @blur="getBlurMark(row,2)" @focus="getFocusMark(row,2)" style="margin-top: 0px;" v-model="row.czRemark" default-value="mysite">
|
|
|
|
|
</a-input>
|
|
|
|
|
<a-icon v-show="row.rowCzMark" style="cursor: pointer;margin-left: 5px;color:#36cfc9;" @mousedown.native="handleSaveMark(row,2)" type="check-circle" theme="filled" />
|
|
|
|
|
</div>
|
|
|
|
|
</a-popover>
|
|
|
|
|
</a-spin>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
@ -764,23 +778,6 @@
|
|
|
|
|
</a-form>
|
|
|
|
|
</a-modal>
|
|
|
|
|
|
|
|
|
|
<a-modal :title="marktitle" :visible="markFlag" >
|
|
|
|
|
<div style="margin-top:20px">
|
|
|
|
|
<a-input v-if="marktitle==='操作备注'" v-model="editRowData.czRemark"></a-input>
|
|
|
|
|
<a-input v-if="marktitle==='单证备注'" v-model="editRowData.dzRemark"></a-input>
|
|
|
|
|
</div>
|
|
|
|
|
<template slot="footer">
|
|
|
|
|
<a-button key="back" @click="markFlag = false">取消</a-button>
|
|
|
|
|
<a-popconfirm
|
|
|
|
|
title="确定修改吗"
|
|
|
|
|
ok-text="是"
|
|
|
|
|
cancel-text="否"
|
|
|
|
|
@confirm="handleSaveMark(editRowData)"
|
|
|
|
|
>
|
|
|
|
|
<a-button key="submit" type="primary" :loading="markLoading" >确定</a-button>
|
|
|
|
|
</a-popconfirm>
|
|
|
|
|
</template>
|
|
|
|
|
</a-modal>
|
|
|
|
|
</a-spin>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
@ -848,7 +845,6 @@ export default {
|
|
|
|
|
spinning: false,
|
|
|
|
|
isUpload: false,
|
|
|
|
|
markFlag: false,
|
|
|
|
|
markLoading: false,
|
|
|
|
|
marktitle: '',
|
|
|
|
|
refshYZloading: false,
|
|
|
|
|
nowFirst: false,
|
|
|
|
|
@ -2012,6 +2008,10 @@ export default {
|
|
|
|
|
item.bookstatus = bookstatus
|
|
|
|
|
item.refshYzitemLoad = false
|
|
|
|
|
item.atdLoading = false
|
|
|
|
|
item.rowDzMark = false
|
|
|
|
|
item.rowCzMark = false
|
|
|
|
|
item.czmarkLoading = false
|
|
|
|
|
item.dzmarkLoading = false
|
|
|
|
|
let hasGoods = 0
|
|
|
|
|
item.goodsStatusList.map((gitem, gindex) => {
|
|
|
|
|
if (gitem.finishTime || gitem.remark) {
|
|
|
|
|
@ -2104,23 +2104,26 @@ export default {
|
|
|
|
|
addCancel() {
|
|
|
|
|
this.addVisible = false
|
|
|
|
|
},
|
|
|
|
|
handleSaveMark(row) {
|
|
|
|
|
handleSaveMark(row, type) {
|
|
|
|
|
const data = {
|
|
|
|
|
id: row.id,
|
|
|
|
|
czRemark: row.czRemark,
|
|
|
|
|
dzRemark: row.dzRemark
|
|
|
|
|
}
|
|
|
|
|
this.markLoading = true
|
|
|
|
|
if (type === 1) {
|
|
|
|
|
row.dzmarkLoading = true
|
|
|
|
|
} else {
|
|
|
|
|
row.czmarkLoading = true
|
|
|
|
|
}
|
|
|
|
|
SaveInList(data).then(res => {
|
|
|
|
|
if (res.success) {
|
|
|
|
|
this.$message.success('修改成功')
|
|
|
|
|
this.markFlag = false
|
|
|
|
|
this.editRow.czRemark = row.czRemark
|
|
|
|
|
this.editRow.dzRemark = row.dzRemark
|
|
|
|
|
this.markLoading = false
|
|
|
|
|
row.dzmarkLoading = false
|
|
|
|
|
row.czmarkLoading = false
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error(res.message)
|
|
|
|
|
this.markLoading = false
|
|
|
|
|
row.dzmarkLoading = false
|
|
|
|
|
row.czmarkLoading = false
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
@ -2200,6 +2203,20 @@ export default {
|
|
|
|
|
pressEnterFun() {
|
|
|
|
|
this.tableRefresh()
|
|
|
|
|
},
|
|
|
|
|
getFocusMark(row, type) {
|
|
|
|
|
if (type === 1) {
|
|
|
|
|
row.rowDzMark = true
|
|
|
|
|
} else {
|
|
|
|
|
row.rowCzMark = true
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
getBlurMark(row, type) {
|
|
|
|
|
if (type === 1) {
|
|
|
|
|
row.rowDzMark = false
|
|
|
|
|
} else {
|
|
|
|
|
row.rowCzMark = false
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
remarkhover(e, data) {
|
|
|
|
|
if (data.bookremark.length > 0) {
|
|
|
|
|
const maxWidth = window.innerWidth
|
|
|
|
|
|
