Browse Source

Merge remote-tracking branch 'origin/master'

master
常熟吴彦祖 6 days ago
parent
commit
032912cf0f
  1. 11
      src/api/qc/qc_report.js
  2. 104
      src/views/modules/qc/FQCResultEntry.vue
  3. 1
      src/views/modules/qc/qcItem.vue
  4. 204
      src/views/modules/qc/qmsPropertiesItem.vue
  5. 439
      src/views/modules/qc/qmsPropertiesModel.vue
  6. 14
      src/views/modules/report/shipment_report.vue

11
src/api/qc/qc_report.js

@ -47,6 +47,17 @@ export const getPropertiesItemList = data => createAPI('/pms/qcReport/getPropert
// 物料属性实际值(选检验单后按 site+partNo+codeNo 查询,回填结果列)
export const getPartPropertiesValue = data => createAPI('/pms/qcReport/getPartPropertiesValue','post',data)
export const saveQmsPropertiesItem = data => createAPI('/pms/qcReport/saveQmsPropertiesItem','post',data)
export const updateQmsPropertiesItem = data => createAPI('/pms/qcReport/updateQmsPropertiesItem','post',data)
export const deleteQmsPropertiesItem = data => createAPI('/pms/qcReport/deleteQmsPropertiesItem','post',data)
export const saveQmsPropertiesHeader = data => createAPI('/pms/qcReport/saveQmsPropertiesHeader','post',data)
export const updateQmsPropertiesHeader = data => createAPI('/pms/qcReport/updateQmsPropertiesHeader','post',data)
export const deleteQmsPropertiesHeader = data => createAPI('/pms/qcReport/deleteQmsPropertiesHeader','post',data)
export const saveQmsPropertiesDetail = data => createAPI('/pms/qcReport/saveQmsPropertiesDetail','post',data)
export const updateQmsPropertiesDetail = data => createAPI('/pms/qcReport/updateQmsPropertiesDetail','post',data)
export const saveQmsPropertiesDetailList = data => createAPI('/pms/qcReport/saveQmsPropertiesDetailList','post',data)
export const deleteQmsPropertiesDetail = data => createAPI('/pms/qcReport/deleteQmsPropertiesDetail','post',data)
// SPC 过程能力报表
export const getSpcMaterials = data => createAPI('/pms/qcReport/getSpcMaterials', 'post', data)
export const getSpcInspectionItems = data => createAPI('/pms/qcReport/getSpcInspectionItems', 'post', data)

104
src/views/modules/qc/FQCResultEntry.vue

@ -161,6 +161,7 @@
<template v-if="item.columnProp === 'pictureFlag'">
<span :style="{ color: scope.row[item.columnProp] === 'Y' ? 'red' : '' }">{{ scope.row[item.columnProp] === 'Y' ? '是' : scope.row[item.columnProp] === 'N' ? '否' : scope.row[item.columnProp] }}</span>
</template>
<template v-else-if="item.columnProp === 'releaseFlag'">{{ scope.row.releaseFlag === 'Y' ? '是' : '否' }}</template>
<template v-else>{{ scope.row[item.columnProp] }}</template>
</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
@ -531,7 +532,8 @@
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">分批保存</el-button>
<el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" style="margin-left: 40px" @click="Transfer('2')">最终检验完成</el-button>
<el-button v-if="(detailData.state === '待检验' || detailData.state === '待审核') && detailData.releaseFlag !== 'Y'" type="warning" :loading="transferLoadFlag" style="margin-left: 40px" @click="Transfer('3')">临时放行</el-button>
<el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="danger" :loading="transferLoadFlag" :style="{marginLeft: detailData.releaseFlag === 'Y' ? '40px' : '10px'}" @click="Transfer('2')">最终检验完成</el-button>
</el-footer>
</el-dialog>
@ -1620,6 +1622,60 @@
fixed: '',
columnWidth: 200,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1ReleaseFlag',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'releaseFlag',
headerAlign: "center",
align: "center",
columnLabel: '放行标识',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1ReleaseTime',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'releaseTime',
headerAlign: "center",
align: "center",
columnLabel: '放行时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1ReleaseByName',
tableId: "301015Table1",
tableName: "FQC检验记录表",
columnProp: 'releaseByName',
headerAlign: "center",
align: "center",
columnLabel: '放行人',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
],
//项目清单
detailData: {
@ -1649,6 +1705,7 @@
responsiblePerson: '',
responsiblePersonName: '',
state: '',
releaseFlag: 'N',
passQty: '',
notPassQty: '',
batchQualifiedQty: ''
@ -3543,6 +3600,13 @@
})
return false
}
const releasedNos = this.FAISelections.filter(item => item.releaseFlag === 'Y').map(item => item.inspectionNo)
if (releasedNos.length > 0) {
this.$alert('检验单号 ' + releasedNos.join('、') + ' 已临时放行,不允许删除,请先取消审核!', '提示', {
confirmButtonText: '确定'
})
return false
}
this.$confirm(`是否删除该 `+ this.FAISelections.length +` 条检验记录?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -3596,7 +3660,7 @@
},
Transfer (type) {
if (type === '2') {
if (type === '2' || type === '3') {
if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {
this.$message.warning('请选择检验结论!')
return
@ -3777,6 +3841,7 @@
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
this.detailData.releaseFlag = row.releaseFlag || 'N'
if (row.state === '待检验') {
this.detailData.passQty = row.samplingQty
} else {
@ -3897,7 +3962,7 @@
return
}
for (let i = 0; i < this.FAISelections.length; i++) {
if (this.FAISelections[i].state !== '已完成') {
if (this.FAISelections[i].state !== '已完成' && this.FAISelections[i].releaseFlag !== 'Y') {
tempData1 = tempData1 + this.FAISelections[i].inspectionNo + '、'
}
}
@ -4237,6 +4302,37 @@
return s
},
appendReleaseColumns () {
const extras = [
{ columnProp: 'releaseFlag', columnLabel: '放行标识', columnWidth: 90 },
{ columnProp: 'releaseTime', columnLabel: '放行时间', columnWidth: 150 },
{ columnProp: 'releaseByName', columnLabel: '放行人', columnWidth: 100 }
]
extras.forEach(extra => {
if (this.columnList1.some(item => item.columnProp === extra.columnProp)) {
return
}
this.columnList1.push({
userId: this.$store.state.user.name,
functionId: 301015,
serialNumber: '301015Table1' + extra.columnProp,
tableId: '301015Table1',
tableName: 'FQC检验记录表',
columnProp: extra.columnProp,
headerAlign: 'center',
align: 'center',
columnLabel: extra.columnLabel,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: extra.columnWidth
})
})
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {
@ -4252,6 +4348,7 @@
switch (columnId) {
case 1:
this.columnList1 = data.rows
this.appendReleaseColumns()
this.showDefault = false
break;
case 2:
@ -4282,6 +4379,7 @@
switch (columnId) {
case 1:
this.columnList1 = data.rows
this.appendReleaseColumns()
this.showDefault = false
break;
case 2:

1
src/views/modules/qc/qcItem.vue

@ -1352,6 +1352,7 @@
flag: '2',
// bu: row.site + '_' + row.buNo,
site: row.site,
buNo: row.buNo,
itemNo: row.itemNo,
itemDesc: row.itemDesc,
valueTypeDb: row.valueTypeDb,

204
src/views/modules/qc/qmsPropertiesItem.vue

@ -0,0 +1,204 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="项目编码">
<el-input v-model="searchData.propertiesItemNo" clearable style="width: 140px"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="searchData.itemDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button v-if="authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="authSave" type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
style="width: 100%;">
<el-table-column prop="propertiesItemNo" header-align="center" align="center" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" header-align="center" align="left" label="项目名称" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="defaultValue" header-align="center" align="left" label="默认值" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="valueType" header-align="center" align="center" label="值类型" min-width="100"></el-table-column>
<el-table-column prop="valueTypeDb" header-align="center" align="center" label="值类型标识" width="110"></el-table-column>
<el-table-column prop="valueChooseFlag" header-align="center" align="center" label="可选" width="70"></el-table-column>
<el-table-column prop="calcFlag" header-align="center" align="center" label="计算" width="70"></el-table-column>
<el-table-column prop="calcFormula" header-align="center" align="left" label="计算公式" min-width="180" show-overflow-tooltip></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="160" label="操作">
<template slot-scope="scope">
<a v-if="authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
<a v-if="authDelete" type="text" size="small" @click="deleteModal(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-dialog :title="modalData.edit ? '编辑属性项目' : '新增属性项目'" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="项目编码" required>
<el-input v-model="modalData.propertiesItemNo" :disabled="modalData.edit" maxlength="20"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="modalData.itemDesc" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="默认值">
<el-input v-model="modalData.defaultValue" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="值类型">
<el-input v-model="modalData.valueType" maxlength="20"></el-input>
</el-form-item>
<el-form-item label="值类型标识">
<el-input v-model="modalData.valueTypeDb" maxlength="1" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="可选">
<el-select v-model="modalData.valueChooseFlag" clearable style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计算">
<el-select v-model="modalData.calcFlag" clearable style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item label="计算公式">
<el-input v-model="modalData.calcFormula" type="textarea" :rows="3" maxlength="4000"></el-input>
</el-form-item>
</el-form>
<span slot="footer">
<el-button @click="modalFlag = false">取消</el-button>
<el-button type="primary" @click="saveModal()">确定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import { getPropertiesItemList, saveQmsPropertiesItem, updateQmsPropertiesItem, deleteQmsPropertiesItem } from '@/api/qc/qc_report.js'
export default {
data () {
return {
height: 200,
searchData: { propertiesItemNo: '', itemDesc: '' },
dataList: [],
pageIndex: 1,
pageSize: 20,
totalPage: 0,
modalFlag: false,
modalData: {},
authSearch: false,
authSave: false,
authUpdate: false,
authDelete: false,
menuId: this.$route.meta.menuId
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 180
})
this.getButtonAuthData()
if (this.authSearch) {
this.getDataList()
}
},
methods: {
getDataList () {
getPropertiesItemList({
propertiesItemNo: this.searchData.propertiesItemNo,
itemDesc: this.searchData.itemDesc,
page: this.pageIndex,
limit: this.pageSize
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = (data.page && data.page.list) || []
this.totalPage = (data.page && data.page.totalCount) || 0
} else {
this.dataList = []
this.totalPage = 0
this.$message.error((data && data.msg) || '查询失败')
}
})
},
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
emptyForm () {
return {
edit: false,
propertiesItemNo: '',
itemDesc: '',
defaultValue: '',
valueType: '',
valueTypeDb: '',
valueChooseFlag: '',
calcFlag: '',
calcFormula: ''
}
},
addModal () {
this.modalData = this.emptyForm()
this.modalFlag = true
},
updateModal (row) {
this.modalData = { ...this.emptyForm(), ...row, edit: true }
this.modalFlag = true
},
saveModal () {
const request = this.modalData.edit ? updateQmsPropertiesItem : saveQmsPropertiesItem
request(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.modalFlag = false
this.getDataList()
} else {
this.$message.error((data && data.msg) || '操作失败')
}
})
},
deleteModal (row) {
this.$confirm('确定删除该属性项目?', '提示', { type: 'warning' }).then(() => {
deleteQmsPropertiesItem({ propertiesItemNo: row.propertiesItemNo }).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.getDataList()
} else {
this.$message.error((data && data.msg) || '删除失败')
}
})
}).catch(() => {})
},
getButtonAuthData () {
this.authSearch = this.isAuth(this.menuId + ':search')
this.authSave = this.isAuth(this.menuId + ':save')
this.authUpdate = this.isAuth(this.menuId + ':update')
this.authDelete = this.isAuth(this.menuId + ':delete')
}
}
}
</script>
<style scoped>
.el-table /deep/ .cell{
height: auto;
line-height: 1.5;
}
</style>

439
src/views/modules/qc/qmsPropertiesModel.vue

@ -0,0 +1,439 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="模板编码">
<el-input v-model="searchData.codeNo" clearable style="width: 140px"></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="searchData.codeDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button v-if="authSearch" type="primary" @click="getDataList()">查询</el-button>
<el-button v-if="authSave" type="primary" @click="addModal()">新增</el-button>
</el-form-item>
</el-form>
<el-table
:height="height"
:data="dataList"
border
style="width: 100%;">
<el-table-column prop="codeNo" header-align="center" align="center" label="模板编码" min-width="140"></el-table-column>
<el-table-column prop="codeDesc" header-align="center" align="left" label="模板名称" min-width="220" show-overflow-tooltip></el-table-column>
<el-table-column prop="functionType" header-align="center" align="center" label="功能类型" width="100"></el-table-column>
<el-table-column prop="active" header-align="center" align="center" label="启用" width="80">
<template slot-scope="scope">{{ scope.row.active === 'Y' ? '是' : scope.row.active === 'N' ? '否' : scope.row.active }}</template>
</el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="160" label="操作">
<template slot-scope="scope">
<a v-if="authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
<a v-if="authDetail" type="text" size="small" @click="detailModal(scope.row)">属性项目</a>
<a v-if="authDelete" type="text" size="small" @click="deleteModal(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 200, 500]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-dialog :title="modalData.edit ? '编辑属性模板' : '新增属性模板'" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="500px">
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="模板编码" required>
<el-input v-model="modalData.codeNo" :disabled="modalData.edit" maxlength="20"></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="modalData.codeDesc" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="功能类型">
<el-input v-model="modalData.functionType" maxlength="1" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="启用">
<el-select v-model="modalData.active" clearable style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<span slot="footer">
<el-button @click="modalFlag = false">取消</el-button>
<el-button type="primary" @click="saveModal()">确定</el-button>
</span>
</el-dialog>
<el-dialog title="属性项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailFlag" width="940px">
<el-form :inline="true" label-position="top">
<el-form-item label="模板编码">
<el-input v-model="currentHeader.codeNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="模板名称">
<el-input v-model="currentHeader.codeDesc" readonly style="width: 240px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button v-if="authDetail" type="primary" @click="addFastModal()">新增</el-button>
</el-form-item>
</el-form>
<div class="rq">
<el-table
:height="400"
:data="detailList"
border
style="width: 100%;">
<el-table-column prop="lineNo" header-align="center" align="center" label="序号" width="70"></el-table-column>
<el-table-column prop="propertiesItemNo" header-align="center" align="center" label="项目编码" min-width="120"></el-table-column>
<el-table-column prop="itemDesc" header-align="center" align="left" label="项目名称" min-width="160" show-overflow-tooltip></el-table-column>
<el-table-column header-align="center" align="right" min-width="140" label="默认值">
<template slot-scope="scope">
<el-input v-model="scope.row.defaultValue" maxlength="100" style="height: 11px;width:98%"></el-input>
</template>
</el-table-column>
<el-table-column header-align="center" align="center" min-width="110" label="属性类型">
<template slot-scope="scope">
<el-select v-model="scope.row.itemType" clearable style="width: 98%">
<el-option label="单条" value="单条"></el-option>
<el-option label="多条" value="多条"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="100" label="操作">
<template slot-scope="scope">
<a v-if="authDetail" type="text" size="small" @click="deleteDetail(scope.row)">删除</a>
</template>
</el-table-column>
</el-table>
</div>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="saveDetail()">保存</el-button>
<el-button type="primary" @click="detailFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="新增" @close="loadDetail" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1100px">
<div style="font-size: 12px">
<el-form :inline="true" label-position="top" :model="chooseSearch">
<el-form-item label="项目编码">
<el-input v-model="chooseSearch.propertiesItemNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="项目名称">
<el-input v-model="chooseSearch.itemDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="loadChooseList()">查询</el-button>
</el-form-item>
</el-form>
</div>
<el-container style="margin-top: 0px;">
<el-main style="width: 720px; padding: 1px">
<span style="font-size: 12px">可选项目:</span>
<el-table
height="400px"
:data="itemList1"
border
ref="itemTable1"
@row-click="itemClickRow1"
@selection-change="selectionItem1"
highlight-current-row
style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50"></el-table-column>
<el-table-column prop="propertiesItemNo" header-align="center" align="center" min-width="80" label="项目编码"></el-table-column>
<el-table-column prop="itemDesc" header-align="center" align="center" min-width="120" label="项目名称"></el-table-column>
<el-table-column prop="defaultValue" header-align="center" align="center" min-width="100" label="默认值"></el-table-column>
</el-table>
</el-main>
<el-main style="width: 111px;padding: 1px">
<div style="margin-top: 182px;margin-left: 18px">
<el-button type="primary" @click="addItem()">添加&gt;&gt;</el-button>
</div>
<div style="margin-top: 15px;margin-left: 18px">
<el-button type="primary" @click="deleteItem()">删除&lt;&lt;</el-button>
</div>
</el-main>
<el-main style="width: 400px;padding: 1px">
<span style="font-size: 12px">已有项目:</span>
<el-table
height="400px"
:data="itemList2"
border
ref="itemTable2"
@row-click="itemClickRow2"
@selection-change="selectionItem2"
highlight-current-row
style="width: 100%">
<el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50"></el-table-column>
<el-table-column prop="propertiesItemNo" header-align="center" align="center" min-width="80" label="项目编码"></el-table-column>
<el-table-column prop="itemDesc" header-align="center" align="center" min-width="200" label="项目名称"></el-table-column>
</el-table>
</el-main>
</el-container>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {
getPropertiesModelList,
getPropertiesModelDetail,
getPropertiesItemList,
saveQmsPropertiesHeader,
updateQmsPropertiesHeader,
deleteQmsPropertiesHeader,
saveQmsPropertiesDetail,
saveQmsPropertiesDetailList,
deleteQmsPropertiesDetail
} from '@/api/qc/qc_report.js'
export default {
data () {
return {
height: 200,
searchData: { codeNo: '', codeDesc: '' },
dataList: [],
pageIndex: 1,
pageSize: 20,
totalPage: 0,
modalFlag: false,
modalData: {},
detailFlag: false,
detailList: [],
currentHeader: {},
fastAddFlag: false,
chooseSearch: { propertiesItemNo: '', itemDesc: '' },
itemList1: [],
itemList2: [],
itemSelections1: [],
itemSelections2: [],
authSearch: false,
authSave: false,
authUpdate: false,
authDelete: false,
authDetail: false,
menuId: this.$route.meta.menuId
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 180
})
this.getButtonAuthData()
if (this.authSearch) {
this.getDataList()
}
},
methods: {
getDataList () {
getPropertiesModelList({
codeNo: this.searchData.codeNo,
codeDesc: this.searchData.codeDesc,
page: this.pageIndex,
limit: this.pageSize
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = (data.page && data.page.list) || []
this.totalPage = (data.page && data.page.totalCount) || 0
} else {
this.dataList = []
this.totalPage = 0
this.$message.error((data && data.msg) || '查询失败')
}
})
},
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
},
addModal () {
this.modalData = { edit: false, codeNo: '', codeDesc: '', functionType: '', active: 'Y' }
this.modalFlag = true
},
updateModal (row) {
this.modalData = { ...row, edit: true }
this.modalFlag = true
},
saveModal () {
const request = this.modalData.edit ? updateQmsPropertiesHeader : saveQmsPropertiesHeader
request(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.modalFlag = false
this.getDataList()
} else {
this.$message.error((data && data.msg) || '操作失败')
}
})
},
deleteModal (row) {
this.$confirm('删除模板会同时删除其属性项目明细,是否继续?', '提示', { type: 'warning' }).then(() => {
deleteQmsPropertiesHeader({ codeNo: row.codeNo }).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.getDataList()
} else {
this.$message.error((data && data.msg) || '删除失败')
}
})
}).catch(() => {})
},
detailModal (row) {
this.currentHeader = { ...row }
this.detailFlag = true
this.loadDetail()
},
loadDetail () {
getPropertiesModelDetail({ codeNo: this.currentHeader.codeNo }).then(({data}) => {
this.detailList = (data && data.code === 0 && data.rows) || []
})
},
addFastModal () {
this.chooseSearch = { propertiesItemNo: '', itemDesc: '' }
this.itemSelections1 = []
this.itemSelections2 = []
this.itemList1 = []
this.itemList2 = []
this.fastAddFlag = true
this.loadChooseList()
},
loadChooseList () {
const codeNo = this.currentHeader.codeNo
Promise.all([
getPropertiesItemList({
propertiesItemNo: this.chooseSearch.propertiesItemNo,
itemDesc: this.chooseSearch.itemDesc,
page: 1,
limit: 9999
}),
getPropertiesModelDetail({ codeNo })
]).then(([itemRes, detailRes]) => {
const items = (itemRes.data && itemRes.data.page && itemRes.data.page.list) || []
const details = (detailRes.data && detailRes.data.code === 0 && detailRes.data.rows) || []
const used = {}
details.forEach(row => { used[row.propertiesItemNo] = true })
this.itemList1 = items.filter(row => !used[row.propertiesItemNo])
this.itemList2 = details
})
},
itemClickRow1 (row) {
this.$refs.itemTable1.toggleRowSelection(row)
},
itemClickRow2 (row) {
this.$refs.itemTable2.toggleRowSelection(row)
},
selectFlag () {
return true
},
selectionItem1 (val) {
this.itemSelections1 = val
},
selectionItem2 (val) {
this.itemSelections2 = val
},
addItem () {
if (this.itemSelections1 == null || this.itemSelections1.length === 0) {
this.$message.warning('请选择可选项目!')
return
}
const items = this.itemSelections1.slice()
const next = (index) => {
if (index >= items.length) {
this.itemSelections1 = []
this.loadChooseList()
return
}
const item = items[index]
saveQmsPropertiesDetail({
codeNo: this.currentHeader.codeNo,
propertiesItemNo: item.propertiesItemNo,
defaultValue: item.defaultValue || '',
itemType: ''
}).then(({data}) => {
if (data && data.code === 0) {
next(index + 1)
} else {
this.$alert((data && data.msg) || '添加失败', '错误', { confirmButtonText: '确定' })
this.loadChooseList()
}
})
}
next(0)
},
deleteItem () {
if (this.itemSelections2 == null || this.itemSelections2.length === 0) {
this.$message.warning('请选择已有项目!')
return
}
const items = this.itemSelections2.slice()
const next = (index) => {
if (index >= items.length) {
this.itemSelections2 = []
this.loadChooseList()
return
}
deleteQmsPropertiesDetail({
codeNo: this.currentHeader.codeNo,
lineNo: items[index].lineNo
}).then(({data}) => {
if (data && data.code === 0) {
next(index + 1)
} else {
this.$alert((data && data.msg) || '删除失败', '错误', { confirmButtonText: '确定' })
this.loadChooseList()
}
})
}
next(0)
},
saveDetail () {
saveQmsPropertiesDetailList({
codeNo: this.currentHeader.codeNo,
itemList: this.detailList
}).then(({data}) => {
if (data && data.code === 0) {
this.detailFlag = false
this.$message.success('操作成功')
} else {
this.$alert((data && data.msg) || '保存失败', '错误', { confirmButtonText: '确定' })
}
})
},
deleteDetail (row) {
this.$confirm('确定删除该模板明细?', '提示', { type: 'warning' }).then(() => {
deleteQmsPropertiesDetail({ codeNo: this.currentHeader.codeNo, lineNo: row.lineNo }).then(({data}) => {
if (data && data.code === 0) {
this.$message.success('操作成功')
this.loadDetail()
} else {
this.$message.error((data && data.msg) || '删除失败')
}
})
}).catch(() => {})
},
getButtonAuthData () {
this.authSearch = this.isAuth(this.menuId + ':search')
this.authSave = this.isAuth(this.menuId + ':save')
this.authUpdate = this.isAuth(this.menuId + ':update')
this.authDelete = this.isAuth(this.menuId + ':delete')
this.authDetail = this.isAuth(this.menuId + ':detail')
}
}
}
</script>
<style scoped>
.el-table /deep/ .cell{
height: auto;
line-height: 1.5;
}
</style>

14
src/views/modules/report/shipment_report.vue

@ -3,12 +3,12 @@
<!-- 顶部操作栏 -->
<div class="toolbar">
<el-button type="warning" @click="openTemplateDialog">选择模板</el-button>
<el-button type="primary" @click="openSelectDialog">选择检验单</el-button>
<el-button type="primary" :disabled="!selectedTemplateCode" @click="openSelectDialog">选择检验单</el-button>
<el-button type="success" @click="printReport">打印</el-button>
</div>
<!-- 报表主体 -->
<div class="report-content" v-if="selectedTemplateCode || reportData.inspectionNo">
<div class="report-content" v-if="selectedTemplateCode">
<!-- 上半部分:基本信息表格 -->
<div class="report-header">
<h2 style="text-align: center; margin-bottom: 10px;">出货报告打印报表</h2>
@ -17,7 +17,7 @@
<tr>
<td class="label-cell">选择检验单:</td>
<td class="value-cell">
<el-button size="small" @click="openSelectDialog">{{ reportData.inspectionNo || '请选择' }}</el-button>
<el-button size="small" :disabled="!selectedTemplateCode" @click="openSelectDialog">{{ reportData.inspectionNo || '请选择' }}</el-button>
</td>
<td class="label-cell">报告日期</td>
<td class="value-cell">{{ currentDate }}</td>
@ -491,6 +491,10 @@ export default {
// 确认选择检验单:填充报表数据("结果"列改由主表行"选择"检验明细项目赋值)
confirmSelectionlection() {
if (!this.selectedTemplateCode) {
this.$message.warning('请先选择属性模板')
return
}
if (this.selectedRow) {
this.reportData = { ...this.selectedRow }
this.selectDialogVisible = false
@ -766,6 +770,10 @@ export default {
// 打印报表(仅打印主页面报表内容)
printReport() {
if (!this.selectedTemplateCode) {
this.$message.warning('请先选择属性模板')
return
}
if (!this.reportData.inspectionNo) {
this.$message.warning('请先选择检验单')
return

Loading…
Cancel
Save