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

zouyu

2023-12-12 057342138feb3dfd78351930df66ec6bb04990e1

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

 src/views/basic/division/index.vue

@@ -37,7 +37,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/division/upload'
      },
      prelang: 'operation',

 src/views/basic/location/index.vue

@@ -44,7 +44,7 @@
      mulLocation: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/location/upload'
      },
      prelang: 'operation',

 src/views/basic/param/index.vue

@@ -36,7 +36,7 @@
      isShowQuery: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/param/upload'
      },
      prelang: 'operation',

 src/views/basic/part/index.vue

@@ -93,7 +93,8 @@
        multiSelect: true, //
        seqNo: true,
        isShowHide: true, // 是否显示显影按钮
        isSearch: false, // 高级查询按钮
        isSearch: false, // 高级查询按钮,
        isRefresh: true, // 是否显示刷新按钮
        defaultOrderBy: { column: 'id', direction: 'desc' }
      },
      table: {
@@ -190,7 +191,7 @@
            searchInfoType: 'text'
          },
          // 一级分类
         /*  {
           {
            minWidth: '120',
            prop: 'assortment',
            label: '一级分类',
@@ -227,7 +228,7 @@
            optList: () => {
              return this.getThreeLevelClassification()
            }
          }, */
          }, 
          // 规格
          {
            minWidth: '140',
@@ -448,14 +449,16 @@
  created() {
    this.table.column.find((e) => e.label === 'IFS启用批次管理').isTrue = false
    this.table.column.find((e) => e.label === '计划方法').isTrue = false
    this.getUnitType('unit')
    this.getMaterialType('material_type')
    this.getCategoryType('category')
    this.getAssortmentType('assortment')
    this.getPlanningMethodType('planning_method_type')
    this.getThreeLevelClassificationType('three_classification_type')
    this.getMaterialAttributeType()
    this.getExaminerDict('examiner_type')
  },
  mounted(){
    this.getUnitType('unit')
    this.getMaterialType('material_type')
    this.getMaterialAttributeType()
  },
  computed: {
    ...mapGetters(['permissions'])
@@ -501,7 +504,9 @@
      })
    },
    getMaterialType(type) {
      console.log(type);
      remote(type).then((response) => {
        console.log("类型",response);
        const code = response.data.code
        if (code === 0) {
          const _data = response.data.data

 src/views/basic/warehouse/index.vue

@@ -39,7 +39,7 @@
      isShowQuery: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/warehouse/uploadExcel'
      },
      prelang: 'operation',

 src/views/basic/workstation/index.vue

@@ -37,7 +37,7 @@
      innerVisible: false,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/workstation/upload'
      },
      prelang: 'workstation',

 src/views/common/ztt-table.vue

@@ -1576,10 +1576,18 @@
      if (response.code != '0') {
        this.$message.warning(response.msg)
      } else {
      if(response.data!=""&&response.data!=[]){
        this.$message({
          message: response.data,
          type: 'success'
        })
      }else{
        this.$message({
          message: '上传成功',
          type: 'success'
        })
      }
        this.importDialogVisible=false
        this.getDataList()
      }
      this.$refs.uploadScan.clearFiles()

 src/views/quality/finishedProductInspection/index.vue

@@ -192,12 +192,12 @@
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    }, */
                    }, 
                    {
                        text: '导出',
                        type: 'primary',
                        fun: this.exportExcel
                    }
                    }*/
                    ],
                    operator: [{
                        text: '打印',

 src/views/quality/processInspect/index.vue

@@ -160,10 +160,10 @@
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    {
                        text: '导出',
                        fun: this.exportExcel
                    }
                    // {
                    //     text: '导出',
                    //     fun: this.exportExcel
                    // }
                    ],
                    operator: [{
                        text: '作废',

 src/views/quality/processconfiguration/index.vue

@@ -266,11 +266,11 @@
        
        ],
        toolbar: [
          {
            text: '导出',
            type: 'primary',
            fun: this.handleExport
          },
          // {
          //   text: '导出',
          //   type: 'primary',
          //   fun: this.handleExport
          // },
        ],
        operator: [
          // {

 src/views/quality/rawMaterial/index.vue

@@ -27,7 +27,7 @@
            @queryParam="getQueryParam($event)"
            ref="rawMaterialTable">
            <template #toolbar>
                <el-button @click="exportRawMaterial" type="primary" >导出</el-button>
                <!-- <el-button @click="exportRawMaterial" type="primary" >导出</el-button> -->
            </template>
            </ttable>
        </basic-container>