|
|
@@ -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>
|
|
|
|
|
|
@@ -433,7 +433,7 @@
|
|
|
:placeholder="mt.name">
|
|
|
<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)"
|
|
|
@@ -523,7 +523,7 @@
|
|
|
</el-select>
|
|
|
|
|
|
<!-- 字典-下拉 -->
|
|
|
- <el-select v-if="f.disctId" v-model="otherDeatils.value[`${f.prop}Name`]" :placeholder="f.name"
|
|
|
+ <el-select v-if="f.dictId" v-model="otherDeatils.value[`${f.prop}Name`]" :placeholder="f.name"
|
|
|
:key="otherDeatils.value[f.prop]" :disabled="!(otherDeatils.isEdit && f.edit)">
|
|
|
<el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
|
|
|
:value="d.dictValue">
|
|
|
@@ -1709,18 +1709,23 @@ export default {
|
|
|
// 确认弹窗操作
|
|
|
handleComfirmOption() {
|
|
|
console.log('确认弹窗操作');
|
|
|
+
|
|
|
this.optionDialog.show = false;
|
|
|
- this.updateButtonGroup = false;
|
|
|
- this.handleRest();
|
|
|
+
|
|
|
+ if (this.updateButtonGroup) {
|
|
|
+ this.updateButtonGroup = false;
|
|
|
+ this.handleRest();
|
|
|
|
|
|
- //需要禁止点击其他标签
|
|
|
- this.detailsTabs = this.detailsTabs.map(item => {
|
|
|
- item['disabled'] = false;
|
|
|
- return item;
|
|
|
- })
|
|
|
+ //需要禁止点击其他标签
|
|
|
+ this.detailsTabs = this.detailsTabs.map(item => {
|
|
|
+ item['disabled'] = false;
|
|
|
+ return item;
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
if (this.otherDeatils.isEdit) {
|
|
|
this.otherDeatils.isEdit = false;
|
|
|
+ this.handleOtherRefresh();
|
|
|
}
|
|
|
},
|
|
|
// 参照弹窗过滤
|
002390