|
|
|
@ -13,20 +13,6 @@ |
|
|
|
<el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<!-- <el-form-item :label="'卷号:'">--> |
|
|
|
<!-- <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
<!-- <el-form-item label="出入库类型:">--> |
|
|
|
<!-- <el-select v-model="searchData.transType" placeholder="请选择" clearable style="width: 120px">--> |
|
|
|
<!-- <el-option--> |
|
|
|
<!-- v-for="i in findTrans"--> |
|
|
|
<!-- :key ="i.transType"--> |
|
|
|
<!-- :label="i.transType"--> |
|
|
|
<!-- :value="i.transType">--> |
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button> |
|
|
|
@ -71,14 +57,25 @@ |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</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-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick"> |
|
|
|
<el-tab-pane label="卷明细" name="detail"> |
|
|
|
<el-table |
|
|
|
:data="dataList2" |
|
|
|
:height="secondHeight" |
|
|
|
:height="height" |
|
|
|
border |
|
|
|
style="width: 100%; "> |
|
|
|
<el-table-column |
|
|
|
@ -102,15 +99,7 @@ |
|
|
|
</el-tabs> |
|
|
|
|
|
|
|
|
|
|
|
<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> |
|
|
|
|
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
@ -217,7 +206,7 @@ export default { |
|
|
|
serialNumber: '200003TableTransType', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "出入库类型", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'transType', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -253,7 +242,7 @@ export default { |
|
|
|
serialNumber: '200003TableTransDate', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "出入库日期", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'transDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
@ -271,7 +260,7 @@ export default { |
|
|
|
serialNumber: '200003TableWarehouseId', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "仓库编码", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'warehouseID', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -307,7 +296,7 @@ export default { |
|
|
|
serialNumber: '200003TablePartNo', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "物料编码", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'partNo', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -325,7 +314,7 @@ export default { |
|
|
|
serialNumber: '200003TablePartDesc', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "料号描述", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'partDesc', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -343,7 +332,7 @@ export default { |
|
|
|
serialNumber: '200003TableNum', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "卷数量", |
|
|
|
columnWidth: 100, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'num', |
|
|
|
headerAlign: 'right', |
|
|
|
align: "right", |
|
|
|
@ -361,7 +350,7 @@ export default { |
|
|
|
serialNumber: '200003TableTransQty', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "出入库数量", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'transQty', |
|
|
|
headerAlign: 'right', |
|
|
|
align: "right", |
|
|
|
@ -379,7 +368,7 @@ export default { |
|
|
|
serialNumber: '200003TableBatchNo', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "批号", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'batchNo', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -397,7 +386,7 @@ export default { |
|
|
|
serialNumber: '200003TableLocationID', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "库位", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'locationID', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -415,7 +404,7 @@ export default { |
|
|
|
serialNumber: '200003TableWdrNo', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "W/D/R", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'wdrNo', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -433,7 +422,7 @@ export default { |
|
|
|
serialNumber: '200003TableManufactureDate', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "生产日期", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'manufactureDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
@ -451,7 +440,7 @@ export default { |
|
|
|
serialNumber: '200003TableOrderRef1', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "关联单号", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'orderRef1', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -487,7 +476,7 @@ export default { |
|
|
|
serialNumber: '200003TableEnterDate', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "录入时间", |
|
|
|
columnWidth: 110, |
|
|
|
columnWidth: 130, |
|
|
|
columnProp: 'enterDate', |
|
|
|
headerAlign: 'center', |
|
|
|
align: "center", |
|
|
|
@ -505,7 +494,7 @@ export default { |
|
|
|
serialNumber: '200003TableUserName', |
|
|
|
tableId: "200003Table", |
|
|
|
tableName: "录入人", |
|
|
|
columnWidth: 100, |
|
|
|
columnWidth: 105, |
|
|
|
columnProp: 'userName', |
|
|
|
headerAlign: 'left', |
|
|
|
align: "left", |
|
|
|
@ -655,9 +644,7 @@ export default { |
|
|
|
|
|
|
|
mounted () { |
|
|
|
this.$nextTick(() => { |
|
|
|
this.height = window.innerHeight / 2 - 30 |
|
|
|
/*第二个表格高度的动态调整*/ |
|
|
|
this.secondHeight = window.innerHeight - this.height - 180 |
|
|
|
this.height = (window.innerHeight- 260) / 2 |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -736,169 +723,6 @@ export default { |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
|
|
|
|
// // 新增按钮 |
|
|
|
// addModal () { |
|
|
|
// this.modalData = { |
|
|
|
// flag: '1', |
|
|
|
// site: '', |
|
|
|
// creator: this.$store.state.user.name, |
|
|
|
// locationId: '', |
|
|
|
// locationName: '', |
|
|
|
// active: 'Y', |
|
|
|
// warehouseId: '', |
|
|
|
// locationDescription: '', |
|
|
|
// keeper: '', |
|
|
|
// remarks: '', |
|
|
|
// } |
|
|
|
// this.modalDisableFlag = false |
|
|
|
// this.modalFlag = true |
|
|
|
// }, |
|
|
|
|
|
|
|
// // 修改按钮 |
|
|
|
// updateModal (row) { |
|
|
|
// this.modalData = { |
|
|
|
// flag: '2', |
|
|
|
// id:row.id, |
|
|
|
// site: row.site, |
|
|
|
// creator: this.$store.state.user.name, |
|
|
|
// warehouseId: row.warehouseId, |
|
|
|
// locationId: row.locationId, |
|
|
|
// active: row.active, |
|
|
|
// locationName: row.locationName, |
|
|
|
// locationDescription: row.locationDescription, |
|
|
|
// keeper: row.keeper, |
|
|
|
// remarks: row.remarks, |
|
|
|
// } |
|
|
|
// this.modalDisableFlag = true |
|
|
|
// this.modalFlag = true |
|
|
|
// }, |
|
|
|
|
|
|
|
// 删除方法 |
|
|
|
// deleteModal (row) { |
|
|
|
// this.$confirm(`是否删除这个检验方法?`, '提示', { |
|
|
|
// confirmButtonText: '确定', |
|
|
|
// cancelButtonText: '取消', |
|
|
|
// type: 'warning' |
|
|
|
// }).then(() => { |
|
|
|
// deleteLocation(row).then(({data}) => { |
|
|
|
// if (data && data.code === 0) { |
|
|
|
// this.getDataList() |
|
|
|
// this.$message({ |
|
|
|
// message: '操作成功', |
|
|
|
// type: 'success', |
|
|
|
// duration: 1500, |
|
|
|
// onClose: () => {} |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// }).catch(() => { |
|
|
|
// }) |
|
|
|
// }, |
|
|
|
|
|
|
|
// 新增/修改方法 |
|
|
|
// saveData () { |
|
|
|
// if (this.modalData.site === '' || this.modalData.site == null) { |
|
|
|
// this.$message.warning('请输入工厂编码！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
// if (this.modalData.warehouseId === '' || this.modalData.warehouseId == null) { |
|
|
|
// this.$message.warning('请选择仓库编码！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
// if(this.modalData.locationName === ''|| this.modalData.locationName == null){ |
|
|
|
// this.$message.warning('请输入库位名称！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
// if(this.modalData.locationId === ''|| this.modalData.locationId == null){ |
|
|
|
// this.$message.warning('请输入库位编码！') |
|
|
|
// return |
|
|
|
// } |
|
|
|
// if (this.modalData.flag === '1') { // 新增 |
|
|
|
// saveLocation(this.modalData).then(({data}) => { |
|
|
|
// if (data && data.code === 0) { |
|
|
|
// this.getDataList() |
|
|
|
// this.modalFlag = false |
|
|
|
// this.$message({ |
|
|
|
// message: '操作成功', |
|
|
|
// type: 'success', |
|
|
|
// duration: 1500, |
|
|
|
// onClose: () => {} |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } else { // 修改 |
|
|
|
// updateLocation(this.modalData).then(({data}) => { |
|
|
|
// if (data && data.code === 0) { |
|
|
|
// this.getDataList() |
|
|
|
// this.modalFlag = false |
|
|
|
// this.$message({ |
|
|
|
// message: '操作成功', |
|
|
|
// type: 'success', |
|
|
|
// duration: 1500, |
|
|
|
// onClose: () => {} |
|
|
|
// }) |
|
|
|
// } else { |
|
|
|
// this.$alert(data.msg, '错误', { |
|
|
|
// confirmButtonText: '确定' |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }) |
|
|
|
// } |
|
|
|
// }, |
|
|
|
|
|
|
|
// 查询检验类型 |
|
|
|
inspectionTypeSearch () { |
|
|
|
let tempData = { |
|
|
|
site: this.$store.state.user.site |
|
|
|
} |
|
|
|
inspectionTypeSearch(tempData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.options = data.rows |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 校验用户是否收藏 |
|
|
|
favoriteIsOk () { |
|
|
|
let userFavorite = { |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
languageCode: this.$i18n.locale |
|
|
|
} |
|
|
|
userFavoriteList(userFavorite).then(({data}) => {for (let i = 0; i < data.list.length; i++) { |
|
|
|
if(this.$route.meta.menuId === data.list[i].menuId){ |
|
|
|
this.favorite = true |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 收藏 OR 取消收藏 |
|
|
|
favoriteFunction () { |
|
|
|
let userFavorite = { |
|
|
|
userId: this.$store.state.user.id, |
|
|
|
functionId: this.$route.meta.menuId, |
|
|
|
} |
|
|
|
if (this.favorite) { |
|
|
|
removeUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = false |
|
|
|
}) |
|
|
|
} else { |
|
|
|
// 收藏 |
|
|
|
saveUserFavorite(userFavorite).then(({data}) => { |
|
|
|
this.$message.success(data.msg) |
|
|
|
this.favorite = true |
|
|
|
}) |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
//导出excel |
|
|
|
async createExportData() { |
|
|
|
|
