modified: src/views/plan/customerorder/index.vue modified: src/views/...

zouyu

2023-12-20 61a529b98c0994b5e78804a6e95df11f49764a91

	modified:   src/views/plan/customerorder/index.vue
	modified:   src/views/technology/completeproductstructure/index.vue
	modified:   src/views/technology/document/index.vue
	modified:   src/views/technology/routing/index.vue
	modified:   src/views/technology/routing/routing-form.vue

 src/views/plan/customerorder/index.vue

@@ -414,6 +414,7 @@
            width: '100px',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',

 src/views/technology/completeproductstructure/index.vue

@@ -10,7 +10,21 @@
        :ajaxFun="ajaxFun"
        ref="completeProductStructureTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addByStructureHandle" 
          v-if="permissions.technology_completeproductstructure_bom">产品结构生成BOM</el-button>
          <el-button @click="() => {this.approveHandle('ACCEPT')}" 
          :disabled="uniqueStateArr.includes('01draft')"
          v-if="permissions.technology_completeproductstructure_accept">批准</el-button>
          <el-button @click="() => {this.approveHandle('REVOKE')}" 
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_completeproductstructure_revoke">撤回</el-button>
          <el-button @click="() => {this.approveHandle('CANCEL')}"
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_completeproductstructure_cancel">拒绝</el-button>
          <el-button @click="() => {this.deleteAll()}" type="primary" 
          v-if="permissions.technology_completeproductstructure_batch_delete">批量删除</el-button>
        </template>
      </ttable>
    </basic-container>
  </div>
@@ -214,54 +228,7 @@
            searchInfoType: 'datetimerange',
          },
        ],
        toolbar: [
          // {
          //   text: '新增',
          //   type: 'primary',
          //   fun: this.addOrUpdateHandle,
          //   disabled: false,
          //   permitArr: []
          // },
          {
            type: 'primary',
            text: '产品结构生成BOM',
            fun: this.addByStructureHandle,
            disabled: false,
            permitArr: [],
          },
          {
            text: '批准',
            fun: () => {
              this.approveHandle('ACCEPT')
            },
            disabled: false,
            permitArr: ['01draft'],
          },
          {
            text: '撤回',
            fun: () => {
              this.approveHandle('REVOKE')
            },
            disabled: false,
            permitArr: ['02accepted'],
          },
          {
            text: '拒绝',
            fun: () => {
              this.approveHandle('CANCEL')
            },
            disabled: false,
            permitArr: ['02accepted'],
          },
          {
            text: '删除',
            fun: () => {
              this.deleteAll()
            },
            disabled: false,
            permitArr: [],
          },
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -291,6 +258,7 @@
          label: '已取消',
        },
      ],
      uniqueStateArr: [],
      bomTypeDbOptions: [],
    }
  },
@@ -333,6 +301,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_completeproductstructure_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'completeProductStructure',
        params: { id: row == null ? null : row.id },
@@ -341,8 +313,6 @@
    // 按产品结构生成BOM
    addByStructureHandle() {
      addByStructure().then((res) => {
        // let result = Array.from(new Set(res.data.data))
        // this.$message.success(result.join(','))
        console.log(res.data.data);
        let mes="";
        res.data.data.forEach(item=>{
@@ -355,13 +325,13 @@
        })
        this.getData()
      })
      // this.$message({
      //   message: '已在后台生成BOM，请执行结束后刷新页面',
      //   type: 'success',
      // })
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_completeproductstructure_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.number, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -453,21 +423,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

 src/views/technology/document/index.vue

@@ -14,6 +14,20 @@
          <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
            >ERP同步</el-button
          > -->
          <el-button v-if="permissions.technology_document_add"
          type="primary" @click="addOrUpdateHandle">新增</el-button>

          <el-button @click="() => {this.changeState('accept')}" 
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_accept">批准</el-button>

          <el-button @click="() => {this.changeState('reject')}"
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_reject">拒绝</el-button>

          <el-button @click="() => {this.changeState('cancel')}" 
          :disabled="uniqueStateArr.includes(['01draft', '03accepted', '04reject'])"
          v-if="permissions.technology_document_cancel">撤销</el-button>
          <el-button
            type="primary"
            @click="deleteBatch"
@@ -88,6 +102,7 @@
  data() {
    return {
      ids: [],
      uniqueStateArr: [],
      ajaxFun: fetchList,
      multipleSelection: [],
      isShowQuery: false,
@@ -323,43 +338,12 @@
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          // {
          //   text: '复制',
          //   fun: this.copyDocument,
          //   disabled: false,
          //   permitArr: []
          // },
          {
            text: '批准',
            fun: () => {
              this.changeState('accept')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          },
          {
            text: '拒绝',
            fun: () => {
              this.changeState('reject')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          },
          {
            text: '撤销',
            fun: () => {
              this.changeState('cancel')
            },
            disabled: false,
            permitArr: ['01draft', '03accepted', '04reject']
          }
          /*,
          {
            text: '海缆OA',
@@ -523,6 +507,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_document_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'documentForm',
        query: { id: row == null ? null : row.id }
@@ -530,6 +518,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_document_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工艺文件编号：' + row.number + '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -585,21 +577,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

 src/views/technology/routing/index.vue

@@ -13,20 +13,21 @@
        ref="routingTable"
      >
        <template #toolbar>
          <el-button
            v-if="permissions.technology_routing_ifssync"
            type="primary"
            :loading="ifsSynsLoading"
            @click="syncIfs"
            >IFS同步</el-button
          >
          <el-button
            v-if="permissions.technology_routing_advancecalc"
            type="primary"
            :loading="preCalcLoading"
            @click="calcTech"
            >提前计算</el-button
          >
          <el-button v-if="permissions.technology_routing_add"
          type="primary" @click="addOrUpdateHandle">新增</el-button>
          <el-button @click="() => {this.approveHandle('ACCEPT')}" 
          :disabled="uniqueStateArr.includes('01draft')"
          v-if="permissions.technology_routing_accept">批准</el-button>
          <el-button @click="() => {this.approveHandle('REVOKE')}" 
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_revoke">撤回</el-button>
          <el-button @click="() => {this.approveHandle('CANCEL')}"
          :disabled="uniqueStateArr.includes('02accepted')"
          v-if="permissions.technology_routing_cancel">拒绝</el-button>
          <el-button @click="copyRouting"
          v-if="permissions.technology_routing_cancel">复制</el-button>
          <el-button @click="() => {this.deleteAll()}" type="primary" 
          v-if="permissions.technology_routing_batch_del">批量删除</el-button>
        </template>
      </ttable>
      <el-dialog title="导入" :visible.sync="importRoutingVisible" width="50%">
@@ -114,7 +115,6 @@
import {
  fetchList,
  delObj,
  changeState,
  changeStateBatch,
  exportRoutingTemplate,
  routingIfsSync,
@@ -132,6 +132,7 @@
  data() {
    return {
      ids: [],
      uniqueStateArr: [],
      ajaxFun: fetchList,
      multipleSelection: [],
      isShowQuery: false,
@@ -356,53 +357,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          {
            text: '批准',
            fun: () => {
              this.approveHandle('ACCEPT')
            },
            disabled: false,
            permitArr: ['01draft']
          },
          {
            text: '撤回',
            fun: () => {
              this.approveHandle('REVOKE')
            },
            disabled: false,
            permitArr: ['02accepted']
          },
          {
            text: '拒绝',
            fun: () => {
              this.approveHandle('CANCEL')
            },
            disabled: false,
            permitArr: ['02accepted']
          },
          {
            text: '复制',
            fun: this.copyRouting,
            disabled: false,
            permitArr: []
          },
          {
            text: '删除',
            fun: () => {
              this.deleteAll()
            },
            disabled: false,
            permitArr: []
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -508,6 +463,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_routing_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'routingForm',
        query: { id: row == null ? null : row.id }
@@ -515,6 +474,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_routing_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工艺编号：' + row.routingNo + '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -613,21 +576,22 @@
          uniqueStateArr.push(stateArr[i])
        }
      }
      this.uniqueStateArr = uniqueStateArr
      // 循环表头按钮，判断每个按钮的permitArr是否完全包含选中状态，若完全包含，则按钮亮，否则按钮灰
      var toolbar = this.table.toolbar
      for (var j = 0; j < toolbar.length; j++) {
        if (
          uniqueStateArr.every((val) =>
            toolbar[j].permitArr.length <= 0
              ? true
              : toolbar[j].permitArr.includes(val)
          )
        ) {
          toolbar[j].disabled = false
        } else {
          toolbar[j].disabled = true
        }
      }
      // var toolbar = this.table.toolbar
      // for (var j = 0; j < toolbar.length; j++) {
      //   if (
      //     uniqueStateArr.every((val) =>
      //       toolbar[j].permitArr.length <= 0
      //         ? true
      //         : toolbar[j].permitArr.includes(val)
      //     )
      //   ) {
      //     toolbar[j].disabled = false
      //   } else {
      //     toolbar[j].disabled = true
      //   }
      // }
      // 将选中记录赋值给multipleSelection
      this.multipleSelection = val
    },

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

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