|
|
@@ -29,7 +29,7 @@
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
|
|
|
- <el-button size="small" @click="handleQuery">查询</el-button> -->
|
|
|
+ <el-button size="small" @click="handleQuery">查询</el-button> -->
|
|
|
<el-button size="small" @click="handleRefresh">刷新</el-button>
|
|
|
|
|
|
</el-button-group>
|
|
|
@@ -47,7 +47,7 @@
|
|
|
启用
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
|
|
|
- <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
|
|
|
+ <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -56,7 +56,7 @@
|
|
|
<el-button-group>
|
|
|
<el-button size="small" @click="handleQueryForm">申请单查询</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
<!-- 导入导出 -->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -64,7 +64,7 @@
|
|
|
<el-button size="small" @click="handleImport">批量导入</el-button>
|
|
|
<el-button size="small" @click="handleExport">批量导出</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
@@ -109,7 +109,7 @@
|
|
|
<el-col :span="6" style="text-align: right;">
|
|
|
<!-- 附件管理 -->
|
|
|
<!-- <el-button-group>
|
|
|
- <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
|
|
|
+ <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
|
|
|
|
|
|
<!-- 切换 -->
|
|
|
<!-- <el-button-group>
|
|
|
@@ -120,7 +120,7 @@
|
|
|
<el-button size="small" icon="el-icon-arrow-right" :disabled="!handleBasicEdit"
|
|
|
@click="handleChangePage('next')" />
|
|
|
<el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
|
|
|
- @click="handleChangePage('end')" /></el-button-group> -->
|
|
|
+ @click="handleChangePage('end')" /></el-button-group> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -430,7 +430,7 @@
|
|
|
: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">
|
|
|
- </el-option></el-select> -->
|
|
|
+ </el-option></el-select> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
<el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)" />
|
|
|
@@ -901,7 +901,7 @@ export default {
|
|
|
this.getTagList('material_unit', (form) => {
|
|
|
console.log(form, 'form');
|
|
|
this.unitDetails.form = form;
|
|
|
- this.getUnitList('');
|
|
|
+ this.getUnitList(this.materialId);
|
|
|
});
|
|
|
break;
|
|
|
// 辅助属性
|
|
|
@@ -1284,16 +1284,16 @@ export default {
|
|
|
materialApi.unitDetails(materialId).then(res => {
|
|
|
console.log(res, '辅助计量单位基本信息');
|
|
|
if (res.code == 200) {
|
|
|
- this.unitDetails.value = res.data.data || [];
|
|
|
+ this.unitDetails.value = res.data.tableBody.rows || [];
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- //获取辅计量管理列表信息+表头字段
|
|
|
- getUnitList() {
|
|
|
- materialApi.unitList().then(res => {
|
|
|
+ //获取辅计量管理列表信息
|
|
|
+ getUnitList(materialId) {
|
|
|
+ materialApi.unitList({ materialId }).then(res => {
|
|
|
console.log(res, '辅计量管理列表信息');
|
|
|
if (res.code == 200) {
|
|
|
- this.unitDetails.value = res.data.data || [];
|
|
|
+ this.unitDetails.value = res.data.tableBody.rows || [];
|
|
|
}
|
|
|
})
|
|
|
},
|
002390