Browse Source

2024-05-09

master
zelian_wu 2 years ago
parent
commit
31ee4f263a
  1. 2
      src/api/sift/queryUserSetting.js
  2. 2
      src/assets/scss/global.scss
  3. 4
      src/views/main-content.vue
  4. 10
      src/views/modules/base/factoryInformation.vue

2
src/api/sift/queryUserSetting.js

@ -5,3 +5,5 @@ export const searchUserSettingRecording = (data) => createAPI(`/sift/recording`,
export const searchUserSettingRecordList = (data) => createAPI(`/sift/recordList`,'get',data) export const searchUserSettingRecordList = (data) => createAPI(`/sift/recordList`,'get',data)
export const saveOrUpdateBatch = (data) => createAPI(`/sift/saveOrUpdateBatch`,'post',data) export const saveOrUpdateBatch = (data) => createAPI(`/sift/saveOrUpdateBatch`,'post',data)
export const saveQueryHeaderDetail = (data) => createAPI(`/sift/saveRecord`,'post',data) export const saveQueryHeaderDetail = (data) => createAPI(`/sift/saveRecord`,'post',data)
export const removeQueryHeaderDetail = (data) => createAPI(`/sift/record/remove`,'post',data)
export const updateQueryHeaderDetail = (data) => createAPI(`/sift/record/update`,'post',data)

2
src/assets/scss/global.scss

@ -320,7 +320,7 @@ input.el-input__inner{
.el-input-number .el-input__inner { .el-input-number .el-input__inner {
text-align: right; text-align: right;
padding-right: 15px !important;
padding-right: 10px !important;
padding-left: 0 !important; padding-left: 0 !important;
} }

4
src/views/main-content.vue

@ -494,10 +494,10 @@
}, },
watch:{ watch:{
// //
$route:'flushSift'
// $route:'flushSift'
}, },
mounted() { mounted() {
this.flushSift()
// this.flushSift()
} }
} }
</script> </script>

10
src/views/modules/base/factoryInformation.vue

@ -1,6 +1,7 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;"> <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-button @click="filterVisible = true">搜索</el-button>
<el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.search }} <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ buttons.search }}
</el-button> </el-button>
<el-button @click="addModal()" type="primary" :disabled="authAdd" <el-button @click="addModal()" type="primary" :disabled="authAdd"
@ -163,6 +164,7 @@
</el-dialog> </el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<filter-search :visible.sync="filterVisible" @search="getSiteDataDemo"></filter-search>
</div> </div>
</template> </template>
@ -185,16 +187,19 @@ import {
} from "@/api/table.js" } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist' import Chooselist from '@/views/modules/common/Chooselist'
import {siteList} from "../../../api/base/site"; import {siteList} from "../../../api/base/site";
import FilterSearch from "../../common/filterSearch.vue";
var functionId = '100001002'; var functionId = '100001002';
export default { export default {
name: "factoryInformation", name: "factoryInformation",
components: { components: {
FilterSearch,
column, Chooselist column, Chooselist
}, },
data() { data() {
return { return {
filterVisible:false,
rowSite: '', rowSite: '',
accessSiteVisible: false, accessSiteVisible: false,
accessSiteList: [], accessSiteList: [],
@ -972,7 +977,7 @@ export default {
}).catch((error)=>{ }).catch((error)=>{
this.$message.error(error) this.$message.error(error)
}) })
}
},
}, },
created() { created() {
this.getMultiLanguageList()// this.getMultiLanguageList()//
@ -981,9 +986,6 @@ export default {
this.getButtonAuthData(); this.getButtonAuthData();
this.getTableUserColumn() this.getTableUserColumn()
}, },
activated() {
this.$store.commit("sift/commitSearchFunction",this.getSiteDataDemo)
}
} }
</script> </script>

Loading…
Cancel
Save