diff --git a/src/api/sift/queryUserSetting.js b/src/api/sift/queryUserSetting.js index c92879c..ded10df 100644 --- a/src/api/sift/queryUserSetting.js +++ b/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 saveOrUpdateBatch = (data) => createAPI(`/sift/saveOrUpdateBatch`,'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) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 92e2636..7b3a243 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -320,7 +320,7 @@ input.el-input__inner{ .el-input-number .el-input__inner { text-align: right; - padding-right: 15px !important; + padding-right: 10px !important; padding-left: 0 !important; } diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 9565f72..9e985f9 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -494,10 +494,10 @@ }, watch:{ // 监听路由变化调用筛选查询 - $route:'flushSift' + // $route:'flushSift' }, mounted() { - this.flushSift() + // this.flushSift() } } diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue index 659e4c1..7e197a5 100644 --- a/src/views/modules/base/factoryInformation.vue +++ b/src/views/modules/base/factoryInformation.vue @@ -1,6 +1,7 @@ @@ -185,16 +187,19 @@ import { } from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist' import {siteList} from "../../../api/base/site"; +import FilterSearch from "../../common/filterSearch.vue"; var functionId = '100001002'; export default { name: "factoryInformation", components: { + FilterSearch, column, Chooselist }, data() { return { + filterVisible:false, rowSite: '', accessSiteVisible: false, accessSiteList: [], @@ -972,7 +977,7 @@ export default { }).catch((error)=>{ this.$message.error(error) }) - } + }, }, created() { this.getMultiLanguageList()//刷新按钮 @@ -981,9 +986,6 @@ export default { this.getButtonAuthData(); this.getTableUserColumn() }, - activated() { - this.$store.commit("sift/commitSearchFunction",this.getSiteDataDemo) - } }