|
@@ -88,11 +88,11 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6" style="text-align: right;">
|
|
|
<!-- 附件管理 -->
|
|
|
- <!-- <el-button-group>
|
|
|
+ <!-- <el-button-group>
|
|
|
<el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
|
|
|
|
|
|
<!-- 切换 -->
|
|
|
- <!-- <el-button-group>
|
|
|
+ <!-- <el-button-group>
|
|
|
<el-button size="small" icon="el-icon-d-arrow-left" :disabled="!handleBasicEdit"
|
|
|
@click="handleChangePage('first')" />
|
|
|
<el-button size="small" icon="el-icon-arrow-left" :disabled="!handleBasicEdit"
|
|
@@ -406,7 +406,7 @@
|
|
|
<div slot="empty"></div>
|
|
|
</el-select>
|
|
|
|
|
|
- <!-- <el-select size="small" v-else-if="mt.attribute == 'select' && mt.dictId" placeholder="请选择"
|
|
|
+ <!-- <el-select size="small" v-else-if="mt.attribute == 'select' && mt.dictId" placeholder="请选择"
|
|
|
:disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[mt.prop]" :key="scope.row[mt.prop]">
|
|
|
<el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
|
|
|
:value="d.dictValue">
|
|
@@ -786,9 +786,11 @@ export default {
|
|
|
},
|
|
|
// 返回
|
|
|
handleBack() {
|
|
|
- this.$router.push({
|
|
|
- path: `/basic/material/basicFile`,
|
|
|
- });
|
|
|
+ this.$store.dispatch('tagsView/delView', this.$route)
|
|
|
+ this.$router.go(-1)
|
|
|
+ // this.$router.push({
|
|
|
+ // path: `/basic/material/basicFile`,
|
|
|
+ // });
|
|
|
|
|
|
},
|
|
|
// 附件按钮
|
|
@@ -1920,10 +1922,10 @@ export default {
|
|
|
param.diCode = param.diCode.replace(/ /g, '');
|
|
|
console.log(param, '保存物料以及相关页签param');
|
|
|
materialApi.insertMaterialInfo(param).then(res => {
|
|
|
-
|
|
|
+
|
|
|
console.log(res, '保存物料以及相关页签');
|
|
|
if (res.code == 200) cb();
|
|
|
- }).catch((error)=>{
|
|
|
+ }).catch((error) => {
|
|
|
this.loading = false;
|
|
|
})
|
|
|
},
|
|
@@ -2024,7 +2026,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
created() {
|
|
|
-
|
|
|
+ console.log(this, 'created');
|
|
|
// 基本信息
|
|
|
this.handleRest();
|
|
|
if (window.name === '') {
|
|
@@ -2034,7 +2036,7 @@ export default {
|
|
|
console.log('页面被刷新')
|
|
|
}
|
|
|
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
</script>
|
|
|
|