|
@@ -8,7 +8,7 @@
|
|
<el-form-item label="" prop="deptId">
|
|
<el-form-item label="" prop="deptId">
|
|
<el-select v-model="queryParams.deptId"
|
|
<el-select v-model="queryParams.deptId"
|
|
placeholder="请选择学院"
|
|
placeholder="请选择学院"
|
|
- style="width: 140px">
|
|
|
|
|
|
+ style="width: 120px">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in deptOptions"
|
|
v-for="item in deptOptions"
|
|
:key="item.deptId"
|
|
:key="item.deptId"
|
|
@@ -29,7 +29,7 @@
|
|
<el-form-item label="" prop="chemicalLevel">
|
|
<el-form-item label="" prop="chemicalLevel">
|
|
<el-select v-model="queryParams.chemicalLevel"
|
|
<el-select v-model="queryParams.chemicalLevel"
|
|
placeholder="请选择级别"
|
|
placeholder="请选择级别"
|
|
- style="width: 120px">
|
|
|
|
|
|
+ style="width: 110px">
|
|
<el-option
|
|
<el-option
|
|
v-for="dict in levelList"
|
|
v-for="dict in levelList"
|
|
:key="dict.value"
|
|
:key="dict.value"
|
|
@@ -39,7 +39,7 @@
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="" prop="chemicalCategory">
|
|
<el-form-item label="" prop="chemicalCategory">
|
|
- <el-select v-model="queryParams.chemicalCategory" clearable placeholder="请选择类别" style="width: 120px">
|
|
|
|
|
|
+ <el-select v-model="queryParams.chemicalCategory" clearable placeholder="请选择类别" style="width: 110px">
|
|
<el-option
|
|
<el-option
|
|
v-for="dict in optionListA"
|
|
v-for="dict in optionListA"
|
|
:key="dict.value"
|
|
:key="dict.value"
|
|
@@ -65,17 +65,22 @@
|
|
<el-input
|
|
<el-input
|
|
maxLength="30"
|
|
maxLength="30"
|
|
v-model="queryParams.searchValue"
|
|
v-model="queryParams.searchValue"
|
|
- placeholder="化学品名/CAS/编码/实验室/房间号..."
|
|
|
|
- style="width: 260px"
|
|
|
|
|
|
+ placeholder="化学品名/CAS/编码/实验室/订单号..."
|
|
|
|
+ style="width: 240px"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
|
|
<p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
|
|
<p class="page-reset-common-style-button" @click="resetQuery">重置</p>
|
|
<p class="page-reset-common-style-button" @click="resetQuery">重置</p>
|
|
<p class="page-submit-common-style-button"
|
|
<p class="page-submit-common-style-button"
|
|
- style="float: right;"
|
|
|
|
|
|
+ style="float: right;width: 60px"
|
|
v-hasPermiRouter="['stock:wait:add']"
|
|
v-hasPermiRouter="['stock:wait:add']"
|
|
@click="tableButton(1)"
|
|
@click="tableButton(1)"
|
|
>添加</p>
|
|
>添加</p>
|
|
|
|
+ <p class="page-submit-common-style-button"
|
|
|
|
+ style="float: right;width: 60px;margin-right: 10px"
|
|
|
|
+ v-hasPermiRouter="['stock:wait:add']"
|
|
|
|
+ @click="tableButton(5)"
|
|
|
|
+ >同步</p>
|
|
<el-form-item style="float: right;">
|
|
<el-form-item style="float: right;">
|
|
<export-component :exportConfig="exportConfig" v-hasPermiRouter="['stock:wait:export']"></export-component>
|
|
<export-component :exportConfig="exportConfig" v-hasPermiRouter="['stock:wait:export']"></export-component>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -193,7 +198,7 @@
|
|
chemicalApplyDetail,
|
|
chemicalApplyDetail,
|
|
chemicalStockWaitDelete, chemicalStockWaitDetail,
|
|
chemicalStockWaitDelete, chemicalStockWaitDetail,
|
|
chemicalStockWaitList,
|
|
chemicalStockWaitList,
|
|
- chemicalStockWaitUpdateByExpire
|
|
|
|
|
|
+ chemicalStockWaitUpdateByExpire, chemicalStockWaitUpdateStockWait
|
|
} from '@/api/chemicalManage'
|
|
} from '@/api/chemicalManage'
|
|
export default {
|
|
export default {
|
|
name: 'index',
|
|
name: 'index',
|
|
@@ -352,6 +357,11 @@
|
|
self.getList();
|
|
self.getList();
|
|
});
|
|
});
|
|
}).catch(() => {});
|
|
}).catch(() => {});
|
|
|
|
+ }else if(type == 5){
|
|
|
|
+ //同步
|
|
|
|
+ chemicalStockWaitUpdateStockWait().then(response => {
|
|
|
|
+ self.msgSuccess(response.message)
|
|
|
|
+ });
|
|
}else if(type == 'out'){
|
|
}else if(type == 'out'){
|
|
//返回并刷新
|
|
//返回并刷新
|
|
this.$set(this,'pageType',1);
|
|
this.$set(this,'pageType',1);
|