|
|
@@ -449,11 +449,21 @@
|
|
|
align: 'center',
|
|
|
minWidth: 120,
|
|
|
formatter: (row, column) => {
|
|
|
- return row.isUnpack==1?'是':'否'
|
|
|
+ return row.isUnpack == 1 ? '是' : '否';
|
|
|
},
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ prop: 'isComeCheck',
|
|
|
+ label: '是否来料检验',
|
|
|
+ align: 'center',
|
|
|
+ minWidth: 120,
|
|
|
+ formatter: (row, column) => {
|
|
|
+ return row.isComeCheck == 1 ? '是' : '否';
|
|
|
+ },
|
|
|
+ showOverflowTooltip: true
|
|
|
+ },
|
|
|
+
|
|
|
{
|
|
|
prop: 'measuringUnit',
|
|
|
label: '计量单位',
|
|
|
@@ -625,34 +635,33 @@
|
|
|
return this.sxtList.find((item) => item.value == Number(e));
|
|
|
},
|
|
|
|
|
|
- toBomManager(row) {
|
|
|
- let rowData = {
|
|
|
- categoryId: row.id,
|
|
|
- categoryName: row.name,
|
|
|
- code: row.code,
|
|
|
-
|
|
|
+ toBomManager(row) {
|
|
|
+ let rowData = {
|
|
|
+ categoryId: row.id,
|
|
|
+ categoryName: row.name,
|
|
|
+ code: row.code,
|
|
|
|
|
|
- rootPathIdParent: row.categoryLevelPathIdParent,
|
|
|
- isProduct: row.isProduct == 1
|
|
|
- };
|
|
|
- this.$refs.bomDrawer.open(rowData);
|
|
|
- },
|
|
|
- //采购
|
|
|
- moveTo() {
|
|
|
- this.$refs.DialogMoveToRef.open(this.selection);
|
|
|
- },
|
|
|
- successUpload(response) {
|
|
|
- this.isLoading = false;
|
|
|
- },
|
|
|
- errorUpload(response) {
|
|
|
- this.isLoading = false;
|
|
|
- },
|
|
|
- // 上传备品备件
|
|
|
- beforeUpload(file) {
|
|
|
- if (file.size / 1024 / 1024 > this.size) {
|
|
|
- this.$message.error(`大小不能超过 ${this.size}MB`);
|
|
|
- return false;
|
|
|
- }
|
|
|
+ rootPathIdParent: row.categoryLevelPathIdParent,
|
|
|
+ isProduct: row.isProduct == 1
|
|
|
+ };
|
|
|
+ this.$refs.bomDrawer.open(rowData);
|
|
|
+ },
|
|
|
+ //采购
|
|
|
+ moveTo() {
|
|
|
+ this.$refs.DialogMoveToRef.open(this.selection);
|
|
|
+ },
|
|
|
+ successUpload(response) {
|
|
|
+ this.isLoading = false;
|
|
|
+ },
|
|
|
+ errorUpload(response) {
|
|
|
+ this.isLoading = false;
|
|
|
+ },
|
|
|
+ // 上传备品备件
|
|
|
+ beforeUpload(file) {
|
|
|
+ if (file.size / 1024 / 1024 > this.size) {
|
|
|
+ this.$message.error(`大小不能超过 ${this.size}MB`);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
if (this.limit > 0 && this.fileList.length === this.limit) {
|
|
|
this.$message.error(`最多上传 ${this.limit}个文件`);
|
|
|
@@ -845,37 +854,36 @@
|
|
|
this.reload();
|
|
|
},
|
|
|
|
|
|
- $route: {
|
|
|
- handler(route) {
|
|
|
- this.pageShow = false;
|
|
|
-
|
|
|
- if (route.query && route.query.isWt) {
|
|
|
-
|
|
|
- getBomGetById(route.query.businessId).then((res) => {
|
|
|
- let rowData = {
|
|
|
- categoryId: res.data.categoryId,
|
|
|
- categoryName: res.data.name,
|
|
|
- code: res.data.categoryCode,
|
|
|
- rootPathIdParent: res.data.rootCategoryLevelId,
|
|
|
- isProduct: res.data.rootCategoryLevelId == 9 ? true : false,
|
|
|
- versions: res.data.versions,
|
|
|
- bomType: res.data.bomType,
|
|
|
- isWt: true,
|
|
|
- isBtn: route.query.isBtn,
|
|
|
- };
|
|
|
- this.$nextTick(() => {
|
|
|
- this.$refs.bomDrawer.open(rowData);
|
|
|
- this.pageShow = true;
|
|
|
+ $route: {
|
|
|
+ handler(route) {
|
|
|
+ this.pageShow = false;
|
|
|
+
|
|
|
+ if (route.query && route.query.isWt) {
|
|
|
+ getBomGetById(route.query.businessId).then((res) => {
|
|
|
+ let rowData = {
|
|
|
+ categoryId: res.data.categoryId,
|
|
|
+ categoryName: res.data.name,
|
|
|
+ code: res.data.categoryCode,
|
|
|
+ rootPathIdParent: res.data.rootCategoryLevelId,
|
|
|
+ isProduct: res.data.rootCategoryLevelId == 9 ? true : false,
|
|
|
+ versions: res.data.versions,
|
|
|
+ bomType: res.data.bomType,
|
|
|
+ isWt: true,
|
|
|
+ isBtn: route.query.isBtn
|
|
|
+ };
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.bomDrawer.open(rowData);
|
|
|
+ this.pageShow = true;
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.pageShow = true;
|
|
|
- }
|
|
|
- },
|
|
|
- immediate: true
|
|
|
+ } else {
|
|
|
+ this.pageShow = true;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ immediate: true
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
-};
|
|
|
+ };
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
.upload {
|