|
|
@@ -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>
|
|
|
@@ -49,7 +49,7 @@
|
|
|
<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> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -58,7 +58,7 @@
|
|
|
<el-button-group>
|
|
|
<el-button size="small" @click="handleQueryForm">申请单查询</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
<!-- 导入导出 -->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -66,7 +66,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>
|
|
|
|
|
|
@@ -112,7 +112,7 @@
|
|
|
<!-- 附件管理 -->
|
|
|
<!-- <el-button-group>
|
|
|
<el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
|
|
|
- </el-button-group> -->
|
|
|
+ </el-button-group> -->
|
|
|
|
|
|
<!-- 切换 -->
|
|
|
<!-- <el-button-group>
|
|
|
@@ -124,7 +124,7 @@
|
|
|
@click="handleChangePage('next')" />
|
|
|
<el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
|
|
|
@click="handleChangePage('end')" />
|
|
|
- </el-button-group> -->
|
|
|
+ </el-button-group> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -205,8 +205,8 @@
|
|
|
@selection-change="handleMainChange">
|
|
|
<el-table-column type="selection" width="55" />
|
|
|
<el-table-column type="index" label="序号" width="55" align="center" />
|
|
|
- <el-table-column v-for="m in mainMsg.form" v-if="m.show" :label="m.name" align="center" :prop="m.prop"
|
|
|
- show-overflow-tooltip />
|
|
|
+ <el-table-column v-for="m in mainMsg.form" v-if="m.show" :label="m.name" align="center"
|
|
|
+ :prop="m.attribute == 'select' ? `${m.prop}Name` : m.prop" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
|
|
|
</div>
|
|
|
@@ -274,7 +274,7 @@
|
|
|
class="material-table">
|
|
|
<el-table-column type="index" label="序号" width="55" align="center" />
|
|
|
<el-table-column v-for="v in unitDetails.form" v-if="v.show" :label="v.name" align="center"
|
|
|
- :prop="v.prop" show-overflow-tooltip />
|
|
|
+ :prop="v.attribute == 'select' ? `${v.prop}Name` : v.prop" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
|
|
|
<!-- 辅助属性 -->
|
|
|
@@ -282,7 +282,7 @@
|
|
|
class="material-table">
|
|
|
<el-table-column type="index" label="序号" width="55" align="center" />
|
|
|
<el-table-column v-for="v in propertyDetail.form" v-if="v.show" :label="v.name" align="center"
|
|
|
- :prop="v.prop" show-overflow-tooltip />
|
|
|
+ :prop="v.attribute == 'select' ? `${v.prop}Name` : v.prop" show-overflow-tooltip />
|
|
|
</el-table>
|
|
|
|
|
|
</template>
|
|
|
@@ -410,8 +410,7 @@
|
|
|
<el-collapse-item title="物料基本信息" name="basic">
|
|
|
<el-form :inline="true" label-position="right" :model="basicData.value">
|
|
|
<!-- <el-form-item label="所属组织">
|
|
|
- <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
|
|
|
<el-form-item label="物料编码">
|
|
|
<el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -422,8 +421,7 @@
|
|
|
<el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="版本号">
|
|
|
- <el-input v-model="basicData.value.version" placeholder="版本号"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ <el-input v-model="basicData.value.version" placeholder="版本号"></el-input></el-form-item> -->
|
|
|
|
|
|
</el-form>
|
|
|
</el-collapse-item>
|
002390