From a0c0c57709d1f2f82f536a02b113f65d7b338209 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 14:31:16 +0800
Subject: [PATCH] modified: src/page/index/sidebar/index.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue
---
src/views/plan/productionschedul/index.vue | 6 +++---
src/views/quality/rawMaterial/rawMaterial-form.vue | 8 ++++----
src/page/index/sidebar/index.vue | 14 ++++++++++++++
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index 35dc685..de41a71 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -18,13 +18,27 @@
name: 'Sidebar',
data(){
return {
+ collapse: false
}
},
inject: ["Index"],
components: { sidebarItem, logo },
created() {
this.Index.openMenu(this.menuId);
+ // console.log(window.innerWidth);
+ // if(window.innerWidth <= 768){
+ // this.collapse = true
+ // this.$store.commit('SET_COLLAPSE')
+ // }
},
+ // watch:{
+ // 'window.innerWidth':{
+ // handler(newVal){
+ // console.log(newVal);
+ // },
+ // deep: true
+ // }
+ // },
computed: {
...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),
filterMenu: function(){
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 4466bf9..9117ea8 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -8,7 +8,7 @@
<div>
<span style="position: relative;top:40px;color:#E84738">鏈畬鎴�</span>
<span style="position: relative;top:30px;left:61%;z-index: 11">
- <el-button @click="tagFinished" size="mini" round type="primary">鏍囪宸插畬鎴�</el-button>
+ <el-button @click="tagFinished" size="mini" round type="success">鏍囪宸插畬鎴�</el-button>
<el-button size="mini" round type="primary"
v-if="permissions.plan_productionschedul_edit_line"
@click="openEditDialog">缂栬緫鏃堕棿绾�</el-button>
@@ -512,7 +512,7 @@
methods: {
tagFinished(){
if(this.multipleSelection.length < 1){
- this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let ids = this.multipleSelection.map(ele=>{
@@ -550,7 +550,7 @@
},
openEditDialog(){
if(this.multipleSelection.length<1){
- this.$message.error("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
+ this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�")
return
}
let mIds = this.multipleSelection.map(ele=>{
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index b9aa4b5..5a05f43 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -115,14 +115,14 @@
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :xs="12" :lg="18"></el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="12" :lg="18"></el-col>
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
</el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
</el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-col :sm="4" :lg="2" style="text-align: right;">
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
--
Gitblit v1.9.3