Merge remote-tracking branch 'origin/master'

zss

2023-12-20 abcfdfe98929ce0399d5d0ac8fd7b1b0b3e56f20

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	vue.config.js

 src/views/technology/operation/index.vue

@@ -10,7 +10,10 @@
        :ajaxFun="ajaxFun"
        ref="operationTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.technology_operation_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -220,13 +223,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -271,6 +268,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_operation_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'operationForm',
        params: { id: row == null ? null : row.id }
@@ -278,6 +279,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_operation_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.operationNo, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/technology/routing/routing-form.vue

@@ -659,7 +659,8 @@
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
      templateDefaultObj: { dataType: '生产要求' },
      // templateDefaultObj: { dataType: '生产要求' },
      templateDefaultObj: {},
      paramSelArr: [],
      paramSelCol: 'code',
      operationIndex: null,

 src/views/technology/structure/index.vue

@@ -13,13 +13,13 @@
        ref="structureTable"
      >
        <template #toolbar>
          <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
            >ERP同步</el-button
          > -->
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.technology_structure_add">新增</el-button>
          <el-button type="primary" @click="copyStructure"
          v-if="permissions.technology_structure_copy">复制</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <!--<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>-->
      <el-dialog
        title="导入"
        :visible.sync="importStructureVisible"
@@ -230,22 +230,7 @@
            noShowTip: false
          }
        ],
        toolbar: [
          {
            text: '新增',
            // icon: 'el-icon-plus',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          {
            text: '复制',
            fun: this.copyStructure,
            disabled: false,
            permitArr: []
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -313,6 +298,7 @@
    this.getData()
  },
  created() {
    this.uploadInfo.isShow = this.permissions.technology_structure_upload
    this.table.column.find((e) => e.label === '已同步至ERP').isTrue = false
    this.getBomTypeDbOptions()
  },
@@ -332,14 +318,21 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_structure_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'singleStructureForm',
        params: { id: row == null ? null : row.id }
      })
      // this.$router.push({name:"structureForm",query:{id:row==null?null:row.id}})
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_structure_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除ID为' + row.id, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 vue.config.js

@@ -7,7 +7,7 @@
// const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'