fix:登录页添加版本号,库存筛选查询修正

This commit is contained in:
shijing 2025-07-15 13:24:04 +08:00
parent b067617e15
commit be0dc2fe73
2 changed files with 21 additions and 7 deletions

View File

@ -62,6 +62,8 @@
<el-button type="default" @click="faceLogin">刷脸登录</el-button> <el-button type="default" @click="faceLogin">刷脸登录</el-button>
</div> --> </div> -->
<!-- <div class="copyright">Copyright © 2024 {{ baseConfig.base_right }}</div> --> <!-- <div class="copyright">Copyright © 2024 {{ baseConfig.base_right }}</div> -->
<div class="version version_web">WEB版本{{ config_index.APP_VER }}</div>
<div class="version ">SERVER版本{{ baseConfig.sys_version }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -94,6 +96,7 @@
</template> </template>
<script> <script>
import config_index from "@/config"
import { Monitor } from '@element-plus/icons-vue' import { Monitor } from '@element-plus/icons-vue'
import passwordForm from './components/passwordForm' import passwordForm from './components/passwordForm'
import phoneForm from './components/phoneForm' import phoneForm from './components/phoneForm'
@ -107,6 +110,7 @@ export default {
}, },
data() { data() {
return { return {
config_index,
config: { config: {
lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG, lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG,
dark: this.$TOOL.data.get('APP_DARK') || false dark: this.$TOOL.data.get('APP_DARK') || false
@ -401,6 +405,16 @@ export default {
top: 20px; top: 20px;
right: 20px; right: 20px;
} }
.version {
position: absolute;
bottom: 15px;
right: 30px;
font-size: 14px;
color: rgb(36, 93, 116);
}
.version_web{
bottom: 40px;
}
.copyright { .copyright {
position: absolute; position: absolute;
bottom: 30px; bottom: 30px;

View File

@ -317,7 +317,7 @@ export default {
if(specsList.indexOf(ite.material_specification)>-1){}else{ if(specsList.indexOf(ite.material_specification)>-1){}else{
specsList.push(ite.material_specification); specsList.push(ite.material_specification);
let obj3 = {}; let obj3 = {};
obj3.text = ite.material_specificationv; obj3.text = ite.material_specification;
obj3.value = ite.material_specification; obj3.value = ite.material_specification;
that.specsFilters1.push(obj3); that.specsFilters1.push(obj3);
} }
@ -523,25 +523,25 @@ export default {
}, },
filterName1(value, row) { filterName1(value, row) {
return row.物料名 == value; return row.material_name == value;
}, },
filterSpecs1(value, row) { filterSpecs1(value, row) {
return row.规格 == value; return row.material_specification == value;
}, },
filterModel1(value, row) { filterModel1(value, row) {
return row.型号 == value; return row.material_model == value;
}, },
filterDept1(value, row) { filterDept1(value, row) {
return row.完成车间 == value; return row.完成车间 == value;
}, },
filterName11(value, row) { filterName11(value, row) {
return row.物料名 == value; return row.name == value;
}, },
filterSpecs11(value, row) { filterSpecs11(value, row) {
return row.规格 == value; return row.specification == value;
}, },
filterModel11(value, row) { filterModel11(value, row) {
return row.型号 == value; return row.model == value;
}, },
filterName2(value, row) { filterName2(value, row) {
return row.物料名 == value; return row.物料名 == value;