modified: src/page/index/sidebar/index.vue modified: src/views/plan/p...

zouyu

2023-12-26 a0c0c57709d1f2f82f536a02b113f65d7b338209

	modified:   src/page/index/sidebar/index.vue
	modified:   src/views/plan/productionschedul/index.vue
	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

 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(){

 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=>{

 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>