Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-27 b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60

 src/views/quality/Packaging_ledger/index.vue

@@ -33,6 +33,7 @@
                    </el-col>
                    <el-col :span="2">
                    <el-button
                        v-if="permissions.quality_packaging_ledger_info_save"
                        style="float: right; padding: 3px 0"
                        type="text"
                        @click="addpreserve"
@@ -41,7 +42,7 @@
                    </el-col>
                    <el-col :span="2">
                    <el-button
                        v-if="!isCheck"
                        v-if="!isCheck && permissions.quality_packaging_ledger_info_add"
                        style="float: right; padding: 3px 0"
                        type="text"
                        @click="relateOperationParam()"
@@ -110,6 +111,7 @@
                width="80"
              ></el-table-column>
              <el-table-column
                v-if="permissions.quality_packaging_ledger_info_operate"
                fixed="right"
                label="操作"
                align="center"
@@ -171,6 +173,7 @@
import packfromadd from './pack-fromadd.vue'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
import { mapGetters } from 'vuex'
export default {
    data(){
        return {
@@ -270,33 +273,8 @@
                    searchInfoType: 'datetimerange',
                },
                ],
                toolbar: [
                    {
                      text: '新增',
                      type: 'primary',
                      fun: this.addOrUpdateHandle
                    },
                    {
                      text: '标签打印',
                      type: 'primary',
                      fun: this.printLabel
                    },
                ],
                operator: [
                    {
                      text: '检验',
                      icon: 'el-icon-position',
                      type: 'text',
                      size: 'small',
                      fun: this.check
                    },{
                      text: '删除',
                      icon: 'el-icon-delete',
                      type: 'text',
                      size: 'small',
                      fun: this.deleteHandle
                    }
                  ],
                toolbar: [],
                operator: null,
                  operatorConfig: {
                    fixed: 'right',
                    label: '操作',
@@ -312,6 +290,45 @@
      packfromadd,
      vueQr
    },
    created(){
      if(this.permissions.quality_packaging_ledger_add){
          this.table.toolbar.push({
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          })
      }
      if(this.permissions.quality_packaging_ledger_labelprint){
          this.table.toolbar.push({
            text: '标签打印',
            type: 'primary',
            fun: this.printLabel
          })
      }
      let arr = []
      if(this.permissions.quality_packaging_ledger_inspect){
        arr.push({
              text: '检验',
              icon: 'el-icon-position',
              type: 'text',
              size: 'small',
              fun: this.check
            })
      }
      if(this.permissions.quality_packaging_ledger_del){
        arr.push({
              text: '删除',
              icon: 'el-icon-delete',
              type: 'text',
              size: 'small',
              fun: this.deleteHandle
            })
      }
      this.table.operator = arr.length>0 ? arr : null
    },
    computed:{
      ...mapGetters(['permissions'])
    },
    watch: {
      diaPrintTab(newVal){
        if(!newVal){